Commit Graph

4528 Commits (0367a19ffcb5b34548c265040faed737ca65fb2c)

Author SHA1 Message Date
Berkeley Martinez 0367a19ffc add bower_components to pathsOfNOReturnTo 2015-08-18 16:00:27 -07:00
Berkeley Martinez f59d029336 fix check if url sent with story 2015-08-18 15:56:23 -07:00
Berkeley Martinez 478ed3c522 fix should toString userId's 2015-08-18 15:23:26 -07:00
Quincy Larson 9dcf284825 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-18 15:21:38 -07:00
Quincy Larson b4ae49f915 add challenge type to beginning of challenge in map 2015-08-18 15:21:26 -07:00
Quincy Larson b667a776ea add bonfires back in but now they are only visible to their creators 2015-08-18 14:53:18 -07:00
Berkeley Martinez b2f4e520cb fix account link failure now flashes 2015-08-18 14:48:52 -07:00
Berkeley Martinez d9d44ae509 fix redirect link failures to /account 2015-08-18 14:48:52 -07:00
benmcmahon100 366b9e98a7 Merge remote-tracking branch 'origin/staging' into staging 2015-08-18 19:32:04 +01:00
Quincy Larson 0d0528a743 fix LinkedIn link in footer 2015-08-18 11:22:59 -07:00
benmcmahon100 6de1f49a1f Temp fix for buttons on modals and bonfires exec on load 2015-08-18 19:21:34 +01:00
Quincy Larson fef03910f0 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-18 10:57:53 -07:00
Quincy Larson 8fe8bd8692 add beginnings of react and d3 challenges 2015-08-18 10:57:38 -07:00
Berkeley Martinez 456bf20b05 fix should hard code domain for password reset 2015-08-18 01:40:26 -07:00
Berkeley Martinez 1d3f7331fb email reset use port in dev 2015-08-18 01:32:38 -07:00
Berkeley Martinez 112972cfdd fix enables email login 2015-08-18 01:32:37 -07:00
Quincy Larson 85b736b64d fix 1705 2015-08-18 01:07:09 -07:00
Quincy Larson 27758a7418 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-17 23:44:53 -07:00
Quincy Larson c8c42b19b3 closes #1739 2015-08-17 23:44:43 -07:00
Berkeley Martinez 495aac8233 remove part of note about email signin 2015-08-17 19:21:57 -07:00
benmcmahon100 50e5ec939a Merge pull request #1961 from abhisekp/patch-3
Problem Instruction clarrification
2015-08-17 23:51:07 +01:00
Abhisek Pattnaik 2b080ec2b7 Problem Instruction clarrification
Replaced with correct instruction to the problem.
2015-08-18 04:17:24 +05:30
benmcmahon100 45ad2a7c20 Merge remote-tracking branch 'origin/staging' into staging 2015-08-17 22:57:36 +01:00
benmcmahon100 7c80d64d08 Fix #1942 2015-08-17 22:57:25 +01:00
benmcmahon100 9c5d81f96b Merge pull request #1930 from AryanJ-NYC/AryanJ-NYC-1926
Fixed #1926
2015-08-17 21:45:09 +01:00
Aryan Jabbari 4d56972e21 Fixed #1926 2015-08-17 16:42:20 -04:00
benmcmahon100 8b4b197132 Merge pull request #1918 from AryanJ-NYC/AryanJ-NYC-1878
Fixes #1878
2015-08-17 21:35:22 +01:00
Aryan Jabbari 0cab1ebfe5 Moved closing code to line 961 2015-08-17 16:34:45 -04:00
Aryan Jabbari 8722a0a294 Fixes #1878 2015-08-17 16:19:02 -04:00
benmcmahon100 7c360285aa Spaced out code a bit more on the shift challenge 2015-08-17 21:12:19 +01:00
benmcmahon100 0bbb5cf122 fixed the moved some comments in a seed that were causing confusion 2015-08-17 21:11:01 +01:00
benmcmahon100 f0f75eeae5 fixed the tests on a challenge 2015-08-17 21:09:40 +01:00
benmcmahon100 db4170eed7 Merge pull request #1769 from djordjelacmanovic/djordjelacmanovic-1005
fixed #1005
2015-08-17 20:25:16 +01:00
benmcmahon100 cebe1bfdcb Merge pull request #1853 from AryanJ-NYC/AryanJ-NYC-1849
Fixed #1849
2015-08-17 20:25:02 +01:00
benmcmahon100 bd9b48105b Merge pull request #1873 from patlanders/staging
Typo fix: change "opps!" to "Oops!" in error-handlers.js
2015-08-17 20:24:41 +01:00
benmcmahon100 9727f3e520 Merge pull request #1812 from AryanJ-NYC/AryanJ-NYC-1807
Fixes #1807
2015-08-17 20:22:55 +01:00
benmcmahon100 f0fd811faf Merge pull request #1818 from michael-krebs/michael-krebs-935
fix #935
2015-08-17 20:22:44 +01:00
benmcmahon100 7f4aa5487f Fix #1895 2015-08-17 20:16:11 +01:00
benmcmahon100 b35c77deb7 Fix #1871 2015-08-17 20:11:04 +01:00
benmcmahon100 93a7fa1c34 Fix #1870 #1874 and there was another issue but i cant find it related to the arithmetic on decimals challenge 2015-08-17 20:08:21 +01:00
patlanders 973c9e67c2 Change "opps!" to "Oops!" in error-handlers.js 2015-08-17 13:20:15 -04:00
Quincy Larson bfabe09dad Fix case insensitivity to colors 2015-08-17 10:18:28 -07:00
benmcmahon100 8cc84c9567 Merge remote-tracking branch 'origin/staging' into staging 2015-08-17 15:43:45 +01:00
benmcmahon100 1bdb40bcaf The FCC editor will now catch un-closed comments! This can be extended to catch quotes as well if needed. Fix #1839 2015-08-17 15:43:36 +01:00
benmcmahon100 4abddbbfe0 Merge pull request #1814 from AryanJ-NYC/AryanJ-NYC-1806
Fixed issue #1806
2015-08-17 15:18:34 +01:00
benmcmahon100 4b2a53f974 Merge pull request #1857 from AryanJ-NYC/AryanJ-NYC-1856
Fixes #1856
2015-08-17 14:53:40 +01:00
Aryan Jabbari 6cf25e6a35 Fixes #1856 2015-08-17 09:52:34 -04:00
benmcmahon100 4b05626ce3 fix #1847 2015-08-17 14:34:19 +01:00
benmcmahon100 a11064ba74 Small CSS hack to fix a display glitch 2015-08-17 14:30:57 +01:00
benmcmahon100 d601240b98 Merge remote-tracking branch 'origin/staging' into staging 2015-08-17 14:28:54 +01:00