Commit Graph

344 Commits (1d624e4ed0e03b73d0f0804868cd9c6646801781)

Author SHA1 Message Date
Rex Schrader 214d48b07b Merge pull request #6201 from FreeCodeCamp/dark-green
Fixes most common complaints about map, color contrast
2016-01-15 23:54:07 -08:00
Arsen Melikyan 2570469aa8 Merge pull request #6042 from SaintPeter/change/challenge-verbiage-improvement
Improve Basic Javascript Flow, Change Code Block Color
2016-01-16 09:41:40 +04:00
Quincy Larson 2f992e3df9 improve accordion. It is not done but way better than before 2016-01-15 20:05:34 -08:00
Quincy Larson 932a0a975b improve the challenge accordion 2016-01-15 18:00:13 -08:00
Quincy Larson e02000bddd start adding accordion map 2016-01-15 17:19:39 -08:00
SaintPeter b94dc98108 Improve Basic Javascript Flow 2016-01-15 15:38:01 -08:00
Berkeley Martinez d7cba7c449 Fix rebase bugs 2016-01-15 05:04:44 -08:00
Quincy Larson 564d8c620f fix style issues throughout app 2016-01-15 04:52:47 -08:00
Quincy Larson c0a87a8fcf implement @bugron's UI suggestions 2016-01-15 04:51:11 -08:00
Berkeley Martinez 039f68b548 Finish up hikes 2016-01-15 04:51:11 -08:00
Berkeley Martinez b5d9ba1a4d Fix background on list items 2016-01-15 04:51:11 -08:00
Berkeley Martinez 9d3fd2274e Readd white space style to btn 2016-01-15 04:51:11 -08:00
Berkeley Martinez 47c930d7f4 Add new help rooms and logic 2016-01-15 04:51:11 -08:00
Quincy Larson 1e5f3dc61c refactor map view and make buttons and text bigger 2016-01-15 04:49:46 -08:00
Quincy Larson 3105dda128 fix seeding errors and remove meet-bonfire from certification requirements 2016-01-15 04:46:20 -08:00
Berkeley Martinez 95dfd2304e Use specific layout for map aside
Links in aside change parent location
2016-01-15 04:46:20 -08:00
Berkeley Martinez 98b54e9fc7 Load map aside as an iframe on every page 2016-01-15 04:46:20 -08:00
Berkeley Martinez 572026090e Add padding to map aside content 2016-01-15 04:46:20 -08:00
Berkeley Martinez 65cc50f2fa Use base color for btn:hover color 2016-01-15 04:36:15 -08:00
Berkeley Martinez 7187ae1841 Fix btn success color 2016-01-15 04:36:15 -08:00
Berkeley Martinez b4a63f799a Change buttons to ghost type 2016-01-15 04:36:15 -08:00
Quincy Larson cb6f026fd0 more redesign work on challenge views 2016-01-15 04:31:18 -08:00
Quincy Larson 4ee8cf0833 Revert "make navbar brown again"
This reverts commit 18224e14f7b9ee356450bae54959b770c5ec4c7c.
2016-01-15 04:27:51 -08:00
Quincy Larson a33d295231 make navbar brown again 2016-01-15 04:26:34 -08:00
Quincy Larson bcba082efc start simplifying views 2016-01-15 04:25:27 -08:00
Berkeley Martinez 0c54adfb07 Add map aside to challenges 2016-01-15 04:14:38 -08:00
Berkeley Martinez 8965790949 Use base color for btn:hover color 2016-01-15 04:14:38 -08:00
Berkeley Martinez b7c071bcfb Fix btn success color 2016-01-15 04:14:38 -08:00
Berkeley Martinez f75aea4a9d Fix social button colors 2016-01-15 04:14:38 -08:00
Berkeley Martinez 1661550c68 Change buttons to ghost type 2016-01-15 04:14:38 -08:00
Quincy Larson 8e71cdd4b8 start working on ghost-only buttons 2016-01-15 04:14:38 -08:00
Quincy Larson f410a94b54 Update 2016-01-15 04:10:16 -08:00
Quincy Larson 7f0be44f98 additional cleanup of nonprofit directory 2016-01-15 04:10:16 -08:00
Quincy Larson 7eefcb0705 more redesign work on challenge views 2016-01-15 04:10:16 -08:00
Quincy Larson 7e481833cd Revert "make navbar brown again"
This reverts commit 18224e14f7b9ee356450bae54959b770c5ec4c7c.
2016-01-15 04:09:57 -08:00
Quincy Larson 345b0a5513 make navbar brown again 2016-01-15 04:09:57 -08:00
Quincy Larson 4101a6c34a start simplifying views 2016-01-15 04:09:57 -08:00
Arsen Melikyan d502b35bac Prettify the code execution output 2016-01-13 13:17:30 +04:00
Berkeley Martinez 52fd15284a Add banning to camper news 2016-01-12 22:07:19 -08:00
Arsen Melikyan 7f3240ce5e Fixed error messages incorrect displaying 2016-01-13 07:29:27 +04:00
Arsen Melikyan f910463e0f Fix tests result output 2016-01-13 01:57:48 +04:00
Logan Tegman 4341a3eee2 Update babel to 6.0 2016-01-10 20:21:15 -08:00
Quincy Larson 4da8e5565c fix landing image padding issue 2016-01-10 18:20:13 -08:00
Berkeley Martinez 9acc946a4e Fix for no key issue
Now if location has no key, it is assumed that history hasn't updated
2016-01-09 18:38:15 -08:00
Berkeley Martinez 019a28a5cc Fix remove semi-colon guard
Users should be instructed to always use semi-colons
2016-01-09 18:16:10 -08:00
Berkeley Martinez 8e930fbe8a Add toasts to react app 2016-01-07 15:04:32 -08:00
Berkeley Martinez 4e5da23844 Add error handling
In the near future these will be handled by a toast.
2016-01-05 12:34:50 -08:00
Berkeley Martinez ea574d721e Make document titles work 2016-01-04 14:27:22 -08:00
Berkeley Martinez 80d36cc3cd Get router history working with flux 2016-01-04 14:27:22 -08:00
Berkeley Martinez acb05e3a71 Question now semi functional 2016-01-04 14:27:22 -08:00
Berkeley Martinez cec243b032 [add] Upgrade ThunderCats react 2016-01-04 14:27:22 -08:00
Akshay Arora 1ba950edd8 Fixed grammar and put a full stop.
In the preview there is no line break, thus full stop is necessary for readability.
2016-01-04 12:16:26 +05:30
Berkeley Martinez a762bd474b Merge pull request #5783 from SaintPeter/fix/head-tail-joins
Fix issues where bad user code hits the tail
2016-01-03 16:35:45 -08:00
Dieter Daems dba9654a09 Fix linting errors 2016-01-03 05:48:23 +01:00
SaintPeter 6d8fe315e6 Fix issues where bad user code hits the tail 2016-01-02 14:13:43 -08:00
Rex Schrader a4c75a90f6 Merge pull request #5378 from geoff616/fix/loop-disable-error-message
More descriptive error message for disabling loop protection
2016-01-02 09:47:46 -08:00
Geoff Wright 18901149d9 changing loop error message to close issue 5345 2016-01-02 10:53:26 -05:00
Dieter Daems f955674430 Fixes: Reset does not clear localstorage item
- Updates the addresbar URI
2016-01-02 02:05:38 +01:00
Berkeley Martinez 0c42368cae Merge pull request #5545 from FreeCodeCamp/new/basic-javascript-revamp
Basic Javascript Revamp
2015-12-30 08:58:41 -08:00
SaintPeter ec01155c0d Change display for blockquote and h4 lines 2015-12-28 09:38:46 -08:00
SaintPeter b8e7d2b403 New challenge specific CSS 2015-12-28 09:38:44 -08:00
evaristoc c681c2e858 ga completion event modif 2015-12-23 23:31:48 +01:00
Logan Tegman 2a5c382697 Merge pull request #5316 from josh3336/fix/mobile-map-list
Fixes issue with map line numbering breaking into differnet lines
2015-12-16 10:56:02 -08:00
joshua pagano 254a3511cc Fixes issue with map line numbering breaking into differnet lines
[Fixes #5309]
2015-12-15 22:53:55 -08:00
Berkeley Martinez 154ae0e489 Fix challenge ga time completion 2015-12-13 01:06:33 -08:00
Quincy Larson 6d911a70cd Merge pull request #5119 from FreeCodeCamp/fix/commit-directory
Add new cert goals to commit
2015-12-11 18:46:48 -06:00
Quincy Larson 473a77e0a2 update copy and improve look of commit and its directory 2015-12-10 00:01:09 -06:00
Logan Tegman 0dbf56e23a Merge pull request #5117 from FreeCodeCamp/landing-change
Update landing icons and copy to reflect React and D3
2015-12-09 14:38:50 -08:00
Quincy Larson 3b320c8852 improve look of commit views 2015-12-09 15:39:36 -06:00
Quincy Larson 747dbfe750 update landing icons 2015-12-09 14:13:18 -06:00
Berkeley Martinez 579c569d15 Fix remove bonfire save endpoint
fix completedChallenge saving solution
remove unnecessary code.
2015-12-08 16:17:45 -08:00
Rex Schrader 6b7a314205 Merge pull request #5076 from FreeCodeCamp/update-ziplines
Update ZIpline and Basejump code review instructions, remove gist export
2015-12-08 16:13:58 -08:00
JelenaBarinova 96375bb643 Challenge numbering in Map fixed to work properly on IE. 2015-12-08 11:46:35 -08:00
Quincy Larson 9409945ee7 Merge branch 'staging' into update-ziplines
Conflicts:
	client/commonFramework/bindings.js
2015-12-08 01:17:03 -06:00
Logan Tegman c23367f62b Merge pull request #5038 from bugron/fix/common-improvements
Some common code improvements
2015-12-07 06:48:47 -08:00
Quincy Larson 92928b552b update user stories and sharing instructions for basejumps and ziplines 2015-12-07 00:51:37 -06:00
Arsen Melikyan 029cd52e80 Some common code improvements 2015-12-06 13:26:02 +04:00
Berkeley Martinez 415a39ea17 Make code-uri more robust 2015-12-05 14:53:33 -08:00
Quincy Larson 615f553fd2 fix editor height 2015-12-04 21:47:30 -06:00
Berkeley Martinez 3462ba791e Fix camper news submit 2015-12-04 19:23:06 -08:00
Quincy Larson 676ef0e253 finish qa-ing removal of angular 2015-12-04 19:21:19 -06:00
Quincy Larson 7e9d65675a Merge branch 'master' into remove-angular
Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-12-04 18:49:38 -06:00
Berkeley Martinez 0b42712a1f Fix moving of query behind hash 2015-12-03 17:37:00 -08:00
Berkeley Martinez b7530253aa Also disable output and tests 2015-12-03 15:09:52 -08:00
Berkeley Martinez 81028fceac Add ability to disable user code on page load
Adding `run=disabled` to the uri will disable the
page from running user code.

This is useful for pages that have frozen to to infinite loops
or untrusted links that may be malicious
2015-12-03 14:57:19 -08:00
Berkeley Martinez ebfee3ed0a Load jquery from a script tag in iframe 2015-12-03 12:13:25 -08:00
Berkeley Martinez 096fba0de7 Add loop protection on keyup update 2015-12-02 14:56:06 -08:00
Berkeley Martinez 8ec4720345 Patch test text for non conforming tests 2015-12-02 13:04:50 -08:00
Berkeley Martinez b8d0d78f81 Add delays so firefox can catch up 2015-12-02 11:50:53 -08:00
Berkeley Martinez 0dfb317a38 Remove console.log 2015-12-02 11:50:53 -08:00
Berkeley Martinez 8cad219082 Patch assert messages without `message: ` format 2015-12-02 11:50:53 -08:00
Berkeley Martinez 636824aba3 Display infinite loops to user
Also exits early if infinite loop
2015-12-02 11:50:53 -08:00
Berkeley Martinez f904f91f97 Actually use loopProtect 2015-12-02 11:50:53 -08:00
Berkeley Martinez 3a299daa37 Add loop-protect
Remove webworkers
2015-12-02 11:50:52 -08:00
Berkeley Martinez 1235077354 Fix don't need to pull jquery from cdn anymore 2015-12-02 11:26:16 -08:00
Arsen Melikyan d81ad77955 Fix test message position 2015-12-01 22:53:05 +04:00
Logan Tegman 9fb63b954d Merge pull request #4851 from bugron/fix/gist-sharing
Fix gist sharing and some other issues
2015-12-01 09:21:11 -08:00
Logan Tegman cb56c34af4 Merge pull request #4852 from bugron/fix/codemirror-line-height
Fix CodeMirror class line-height property value
2015-12-01 09:06:51 -08:00
Berkeley Martinez 426526355c Fix initial load error 2015-12-01 08:01:51 -08:00
Berkeley Martinez aa0297c2f2 Fix editor.getValue not returning the correct code 2015-12-01 08:01:11 -08:00