Commit Graph

901 Commits (47c930d7f4549949e1eb9a4851a8000fe130d7db)

Author SHA1 Message Date
Quincy Larson 649cfb72f8 make sync data from GitHub button's text more clear 2016-01-10 18:20:13 -08:00
Quincy Larson 9b4b6a241c fix typo 2016-01-10 19:41:50 -06:00
Logan Tegman 63ee1139da Merge pull request #5960 from FreeCodeCamp/feature/hikes
Add toasts to react app
2016-01-10 14:40:43 -08:00
Berkeley Martinez 2962ee52a0 Remove old debug 2016-01-09 23:23:04 -08:00
Berkeley Martinez e51127ffc7 feature completed challenge can also return json 2016-01-09 20:08:01 -08:00
Robert Richey 0166e9db8c Update news search field placeholder text
Changed placeholder text from 'Search our links' to 'search term or @username'. Tested locally.
2016-01-09 14:13:57 -07:00
Harsha 2b64a97125 fixes no url supplied on successful submission 2016-01-08 14:20:32 -05:00
Berkeley Martinez 9a9421e712 Fix for Vimeo API change 2016-01-07 22:40:51 -08:00
Berkeley Martinez ea574d721e Make document titles work 2016-01-04 14:27:22 -08:00
Berkeley Martinez 22cb610279 Make structure changes to hikes 2016-01-04 14:27:22 -08:00
Berkeley Martinez 3028c891d7 Fix hikes order 2016-01-04 14:27:22 -08:00
Berkeley Martinez cec243b032 [add] Upgrade ThunderCats react 2016-01-04 14:27:22 -08:00
Quincy Larson 3743b8ddf6 update certificate error messages 2016-01-04 02:01:38 -06:00
Dieter Daems dba9654a09 Fix linting errors 2016-01-03 05:48:23 +01:00
SaintPeter 9a18344dad Fix display of Checkpoints
Tested Locally\n\nFixes 5782
2016-01-02 17:43:48 -08:00
Waqas Ahmed abd0edf4b8 Show status on individual completed courseware 2016-01-03 01:07:51 +04:00
SaintPeter b32afaea1b Fix Merge Issue 2016-01-01 21:10:08 -08:00
Rex Schrader 425c027414 Merge pull request #5696 from FreeCodeCamp/fix/add-release-date-to-ziplines
make challenges new and extend to 60 days
2015-12-31 22:37:16 -08:00
Quincy Larson 035b6027de make challenges new and extend to 60 days 2016-01-01 00:34:05 -06:00
Quincy Larson d533e027a9 add hackclub 2015-12-31 16:11:10 -06:00
Logan Tegman 7c93b86321 Merge pull request #5573 from BKinahan/fix/guitar-solo-capitalization
Lowercase 'Solo' in 'Face-melting guitar Solo'
2015-12-30 11:48:53 -08:00
BKinahan c10a086bb6 Lowercase 'Solo' in 'Face-melting guitar Solo'
Changed the case of Solo in the message 'Face-melting guitar Solo' because, unless there's an extremely subtle Star Wars reference I'm missing, solo isn't a proper noun here.
2015-12-30 19:46:04 +00: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
Berkeley Martinez 6e7cadb2e7 Load random commit if none specified 2015-12-29 17:40:20 -08:00
Berkeley Martinez 84d4611209 Merge pull request #5419 from evaristoc/ga/show-completion-event-mod
ga completion event change
2015-12-29 12:38:32 -08:00
Quincy Larson 6403bd4e6a Merge pull request #5526 from FreeCodeCamp/fix/commit-signin-redirect
Fix commit redirect for non signed user.
2015-12-29 14:04:59 -06:00
Berkeley Martinez 2a48f42313 Fix user redirect on email account creation 2015-12-29 11:57:12 -08:00
Berkeley Martinez d745e3a254 Add ability to change message type in middleware util 2015-12-29 11:43:06 -08:00
Berkeley Martinez 445008665c Remove autoReconnect: it is true by default 2015-12-29 11:18:55 -08:00
Berkeley Martinez 8c3e14cd8e Fix commit redirect for non signed user.
Now users will be directed to sign in page and on sign in
will have pledge completed
2015-12-29 10:57:35 -08:00
Quincy Larson 80bb80b23a minor updates to copy 2015-12-28 16:28:53 -06:00
SaintPeter 758a22bb0d Add table tag to exception list 2015-12-28 09:39:04 -08:00
SaintPeter ec01155c0d Change display for blockquote and h4 lines 2015-12-28 09:38:46 -08:00
evaristoc c681c2e858 ga completion event modif 2015-12-23 23:31:48 +01:00
Mrugesh Mohapatra 7b36111f88 fix labs page button to centered 2015-12-20 00:49:22 +05:30
Berkeley Martinez 83e43dbbff Merge pull request #5134 from LenaBarinova/fix/streak-still-seems-to-be-broken
Current and Longest streak calculation fixed
2015-12-18 21:00:47 -08:00
Quincy Larson 8e485a893c fix minor style issue on challenge map 2015-12-17 13:36:34 -06:00
Quincy Larson 4ae944962c hotfix to make reddit ad not disrupt map 2015-12-17 13:19:40 -06:00
Quincy Larson 6e85de9efe improve copy on some buttons and fix challenge map css issues 2015-12-17 01:28:40 -06:00
JelenaBarinova 6c7d2685fd Current and Longest streak calculation fixed
Minor refactoring and unit tests added

After CR: user-stats file moved to util folder, export keywork added to exported functions, new line added at the end of gulp file

User-stats-test file moved to replicate user-stats path in test folder
2015-12-15 18:33:04 -05:00
Akira Laine 2d1192f362 fixed "greenfield" typo - closes #5296 2015-12-15 20:28:31 +11:00
Berkeley Martinez 0fca3bad7f Filter out coming soon from challenge blocks 2015-12-14 13:19:30 -08:00
Berkeley Martinez 355c8214e6 Filter out coming soon challenges from returnNextChallenge 2015-12-14 13:19:30 -08:00
Berkeley Martinez 2d559efdee Fix for block order 2015-12-14 13:19:30 -08:00
Berkeley Martinez 38d71abda6 Fix block stream not being set correctly 2015-12-14 13:19:30 -08:00
Berkeley Martinez 107f42e8f4 Change verify cert to back end 2015-12-14 13:19:30 -08:00
Quincy Larson c4064d4e99 minor fixes to challenge map 2015-12-14 13:19:30 -08:00
Quincy Larson 65b7edca0b hardcode the full stack and interview prep sections 2015-12-14 13:19:30 -08:00
Berkeley Martinez 6db0252ab1 Fix map indenting 2015-12-14 13:19:30 -08:00
Berkeley Martinez 2aa611047f Change full stack to back end 2015-12-14 13:19:30 -08:00
Quincy Larson a553cbbb2b add interviewing and nonprofit projects to map 2015-12-14 13:19:30 -08:00
Berkeley Martinez 0c4a780f54 Add logic to allow coming soon challenge to be seen and not used 2015-12-14 13:19:30 -08:00
Berkeley Martinez fe8fe0ff0d Fix lint error 2015-12-14 13:19:30 -08:00
Berkeley Martinez 5c2bdd974a Add isComingSoon flag 2015-12-14 13:19:30 -08:00
Berkeley Martinez 9848aa8eab Remove console.log 2015-12-14 13:19:30 -08:00
Berkeley Martinez f7f587194d Add superblock ordering 2015-12-14 13:19:30 -08:00
Berkeley Martinez c87737a0c5 Remove 800 hour thingy 2015-12-14 13:19:30 -08:00
Berkeley Martinez c736a5c00f Use regex to hide hikes
Capitalize super block
2015-12-14 13:19:30 -08:00
Berkeley Martinez 8175fbb297 Remove console.log 2015-12-14 13:19:30 -08:00
Berkeley Martinez 8037ff9038 Remove hikes from map view 2015-12-14 13:19:30 -08:00
Berkeley Martinez ab043d1c6d Change map logic and view 2015-12-14 13:19:30 -08:00
Berkeley Martinez 75821c4db3 Change hikes order 2015-12-14 13:19:30 -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
Berkeley Martinez a8a73abea0 More changes to commit copy 2015-12-11 16:44:14 -08:00
Logan Tegman 74d5c0bf00 Merge pull request #5127 from Zenith-One/fix/forgot-password-error-message
Fix/forgot password error message
2015-12-10 15:13:33 -08:00
Craig Burton 275e3ad9ea Fixed error message displayed when an error occurs while requesting a password reset 2015-12-10 09:21:21 -05:00
Quincy Larson 60789e0386 Merge branch 'fix/commit-directory' of https://github.com/freecodecamp/freecodecamp into fix/commit-directory
Conflicts:
	server/views/commit/index.jade
2015-12-10 00:02:22 -06:00
Quincy Larson 473a77e0a2 update copy and improve look of commit and its directory 2015-12-10 00:01:09 -06:00
Harsha a443c2bd37 Go to next step is enabled after user finishes step challenge 2015-12-09 20:25:43 -05: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
Logan Tegman 33b1ba08f1 Merge pull request #5090 from FreeCodeCamp/fix/bonfire-not-saving
Fix remove bonfire save endpoint
2015-12-09 14:20:10 -08:00
Berkeley Martinez 1464adc350 Add new cert goals to backend 2015-12-09 14:19:37 -08:00
Quincy Larson 3b320c8852 improve look of commit views 2015-12-09 15:39:36 -06:00
Quincy Larson 5d1ab89a1a Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-12-09 15:01:17 -06:00
Quincy Larson 8c06293df3 update json for commit 2015-12-09 14:59:56 -06:00
Quincy Larson 66431753b3 Merge branch 'add/commitnonprofit' of https://github.com/CodeNonprofit/FreeCodeCamp into CodeNonprofit-add/commitnonprofit 2015-12-09 14:14:21 -06:00
Quincy Larson 747dbfe750 update landing icons 2015-12-09 14:13:18 -06:00
Michael D. Johnson aea2eaf2e7 Added 3 new nonprofits to Commit 2015-12-09 14:27:02 -05:00
Berkeley Martinez 0f75aa3b88 Add freecatphotoapp to csp 2015-12-09 11:02:06 -08:00
Berkeley Martinez 9822cc67f9 Reduce header size
This is needed to move to cloudFlare
2015-12-09 10:56:40 -08:00
Berkeley Martinez f709ee30ee Fix for completedDate missing 2015-12-08 16:17:45 -08:00
Berkeley Martinez 579c569d15 Fix remove bonfire save endpoint
fix completedChallenge saving solution
remove unnecessary code.
2015-12-08 16:17:45 -08:00
Berkeley Martinez 9774638d43 Fix waypoints are not bonfires 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
Rex Schrader da491ed374 Merge pull request #5088 from LenaBarinova/fix/free-code-camp-map
Challenge numbering in Map fixed to work properly on IE.
2015-12-08 15:47:42 -08:00
Harsha d3f1829931 step challenge button block in mobile version fixed 2015-12-08 17:45:30 -05:00
Quincy Larson 025a1269eb remove additional gist button 2015-12-08 14:34:05 -06:00
JelenaBarinova 96375bb643 Challenge numbering in Map fixed to work properly on IE. 2015-12-08 11:46:35 -08:00
Berkeley Martinez 5270f0e42e Make tag replacement more robust
Some challenges are incorrectly saved with no solutions
2015-12-08 11:30:47 -08:00
Quincy Larson 9409945ee7 Merge branch 'staging' into update-ziplines
Conflicts:
	client/commonFramework/bindings.js
2015-12-08 01:17:03 -06: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 3462ba791e Fix camper news submit 2015-12-04 19:23:06 -08:00
Berkeley Martinez 85510a2fd8 Remove directives from views 2015-12-04 18:24:09 -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
Harsha 5b376e106c Fixes previous step issue in one-step-challenges 2015-11-30 23:29:07 -05:00
Berkeley Martinez 04db6744b9 Fix code output logic
Fix codemirror url paths
2015-11-29 16:28:32 -08:00
Berkeley Martinez 9532a80f26 Correct typos 2015-11-29 16:28:32 -08:00
Berkeley Martinez e8d9e31a47 Fix bad ctrl enter logic 2015-11-29 16:28:32 -08:00