Commit Graph

29599 Commits

Author SHA1 Message Date
7563b94509 Merge pull request #3557 from FreeCodeCamp/feature/make-completed-challenges-unique
feature make completedChallenges uniq
2015-10-01 22:28:57 -07:00
6c305dbc67 feature make completedChallenges uniq
now when users complete a challenge, it will instead update the
last save if it exists.
2015-10-01 22:19:26 -07:00
fefefed0f2 Merge pull request #3550 from FreeCodeCamp/merge-account-page
Merge account page
2015-10-01 21:12:23 -07:00
d0528ec768 fix re-encode uri during redirect 2015-10-01 21:11:15 -07:00
8a1a7f238d fix undefined username and remove old function
fix many bugs and undefined
fix linting errors
2015-10-01 21:03:28 -07:00
d8fd63fb87 Merge branch 'staging' into merge-account-page 2015-10-01 20:39:56 -07:00
28e9dce221 Merge pull request #3551 from FreeCodeCamp/feature/uri-storage
add uri code storage
2015-10-01 19:44:12 -07:00
89ed66636f Merge pull request #3376 from natac13/fix/slasher-flick-unclear-head-of-array
fix unclear description slasher flick
2015-10-02 05:20:28 +08:00
fa89ff3471 Merge pull request #3376 from natac13/fix/slasher-flick-unclear-head-of-array
fix unclear description slasher flick
2015-10-02 05:20:28 +08:00
72e0595ca6 add uri code storage 2015-09-30 22:32:31 -07:00
b197358056 make one page profile with bonfire solution urls 2015-09-30 21:04:16 -07:00
266a505cfb Merge pull request #3548 from FreeCodeCamp/converge-bonfires
refactor all Bonfire tests to use assert and have friendly messages
2015-09-30 19:47:20 -07:00
5de6837959 Merge pull request #3548 from FreeCodeCamp/converge-bonfires
refactor all Bonfire tests to use assert and have friendly messages
2015-09-30 19:47:20 -07:00
77892a05c0 Merge pull request #3546 from FreeCodeCamp/step
add step based challenge to framework
2015-09-30 19:38:01 -07:00
705ee7aec2 Merge pull request #3546 from FreeCodeCamp/step
add step based challenge to framework
2015-09-30 19:38:01 -07:00
6e9708d8d0 fix bad merge 2015-09-30 19:26:05 -07:00
c2af4f9b4c fix bad merge 2015-09-30 19:26:05 -07:00
e71d748e91 Merge branch 'staging' into converge-bonfires
Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json
2015-09-30 19:06:28 -07:00
dca179c2c5 Merge branch 'staging' into converge-bonfires
Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json
2015-09-30 19:06:28 -07:00
42d2587e5b finish QAing all bonfires 2015-09-30 19:04:26 -07:00
16c0c23b2c finish QAing all bonfires 2015-09-30 19:04:26 -07:00
eb7aaf4c64 fix exact change and QA all JS challenges 2015-09-30 18:33:32 -07:00
4fffabfe8f fix exact change and QA all JS challenges 2015-09-30 18:33:32 -07:00
ac90645d33 Added the skeleton for the fourth challenge. Challenge three needs some refinement in the testing system 2015-09-30 23:23:58 +01:00
1b13ad2601 Added the skeleton for the fourth challenge. Challenge three needs some refinement in the testing system 2015-09-30 23:23:58 +01:00
38f723665d Three complete. More to come 2015-09-30 23:01:56 +01:00
2d6c91b513 Three complete. More to come 2015-09-30 23:01:56 +01:00
7eb99cfe97 all but 4 bonfires work 2015-09-30 14:57:58 -07:00
1994e340d3 all but 4 bonfires work 2015-09-30 14:57:58 -07:00
c82744bb34 Merge pull request #3542 from MWGitHub/patch-1
Remove Unnecessary Left Over Semicolon
2015-09-30 23:51:23 +02:00
416a866ec0 add step based challenge to framework 2015-09-30 13:26:06 -07:00
43bca7e77f add step based challenge to framework 2015-09-30 13:26:06 -07:00
0b08459caa fix test so it does not match code not in the answer 2015-09-30 05:13:13 -04:00
90230ec907 fix test so it does not match code not in the answer 2015-09-30 05:13:13 -04:00
9b35bb01a8 finish QAing basic and intermediate bonfires 2015-09-30 01:33:07 -07:00
03675ef0a6 finish QAing basic and intermediate bonfires 2015-09-30 01:33:07 -07:00
44e43000c2 Remove Unnecessary Left Over Semicolon
Remove left over semicolon from function that was converted from an anonymous function at https://github.com/FreeCodeCamp/FreeCodeCamp/issues/3287
2015-09-30 02:40:21 -04:00
ab72094333 Remove Unnecessary Left Over Semicolon
Remove left over semicolon from function that was converted from an anonymous function at https://github.com/FreeCodeCamp/FreeCodeCamp/issues/3287
2015-09-30 02:40:21 -04:00
ab204c654e fix search results formatting for mobile and desktop camper news 2015-09-29 22:52:19 -07:00
242351e0e4 Merge pull request #3541 from FreeCodeCamp/fix/last-challenge-name
fix check for existance when getting last challenge
2015-09-29 22:37:57 -07:00
cdf8c6a54c fix check for existance when getting last challenge 2015-09-29 22:12:02 -07:00
afe8aed608 Merge pull request #3539 from QuincyLarson/pair-button
fix issues with get-started and remove pair button
2015-09-29 18:02:07 -07:00
ee9827ea58 fix issues with get-started and remove pair button 2015-09-29 17:59:16 -07:00
91f48e9c2a refactor messages on basic and advanced bonfires 2015-09-29 15:00:27 -07:00
cbc21ee03f refactor messages on basic and advanced bonfires 2015-09-29 15:00:27 -07:00
7d6866443b finish first take at upper-intermediate bonfires 2015-09-29 14:34:51 -07:00
838a80167e finish first take at upper-intermediate bonfires 2015-09-29 14:34:51 -07:00
9e415c9b78 finish first pass at intermediate bonfires 2015-09-29 14:18:43 -07:00
6657348722 finish first pass at intermediate bonfires 2015-09-29 14:18:43 -07:00
5dbdbbdc4d merge staging 2015-09-29 13:44:58 -07:00