gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
16,364 Commits 9 Branches 0 Tags
f5590c1d0b5d44dbaa09c0cf0fd75d911d4955c6
Commit Graph

16364 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quincy Larson
c3826c39dd Merge pull request #1074 from SaintPeter/staging 
Add video link to Symmetric Differences Bonfire
 2015-06-28 15:20:06 -07:00
Quincy Larson
68dfa51719 Merge pull request #1074 from SaintPeter/staging 
Add video link to Symmetric Differences Bonfire
 2015-06-28 15:20:06 -07:00
JonSonesen
d4ea05c3fe fixes issue #1148 2015-06-28 15:03:52 -07:00
JonSonesen
bdb170b0df fixes issue #1148 2015-06-28 15:03:52 -07:00
Quincy Larson
8970ef5877 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-27 19:43:13 -07:00
Quincy Larson
0350980c3a Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-27 19:43:13 -07:00
Quincy Larson
cd29353ac0 add some additional jquery challenges 2015-06-27 19:42:25 -07:00
Quincy Larson
05cfe86cd0 add some additional jquery challenges 2015-06-27 19:42:25 -07:00
Quincy Larson
80e995e98f update field guide cities 2015-06-27 15:29:39 -07:00
Quincy Larson
481eb68baf update the cities on the field guide 2015-06-27 15:28:37 -07:00
Quincy Larson
7ee4b22a57 update the cities on the field guide 2015-06-27 15:28:37 -07:00
Quincy Larson
a1055b0e52 clean up future jquery challenges 2015-06-27 11:56:31 -07:00
Quincy Larson
75c77cdb6f clean up future jquery challenges 2015-06-27 11:56:31 -07:00
Berkeley Martinez
4db1f441fe bump loopback passport 2015-06-26 18:11:44 -07:00
greasan
6a0996b1e0 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-26 19:22:13 +02:00
greasan
20fde8a8ab Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-26 19:22:13 +02:00
Berkeley Martinez
f6c5e35f66 fix buffer return from database query 2015-06-26 01:51:27 -07:00
Berkeley Martinez
66e4138b36 fix buffer return from database query 2015-06-26 01:51:27 -07:00
Berkeley Martinez
afe0560042 fix should be bufferWithCount 2015-06-26 01:48:21 -07:00
Berkeley Martinez
e53419bb59 fix should be bufferWithCount 2015-06-26 01:48:21 -07:00
Quincy Larson
3bac247627 remove stack trace from production 2015-06-26 01:30:51 -07:00
Quincy Larson
7e2d5c91e2 minor ui improvements 2015-06-26 01:28:02 -07:00
Quincy Larson
b287c14ddd Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
 2015-06-26 01:08:40 -07:00
Quincy Larson
378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
 2015-06-26 01:08:40 -07:00
Berkeley Martinez
8570f9b5e7 fix story upvote should happen at end of stream 2015-06-26 00:35:13 -07:00
Berkeley Martinez
9818186afc fix should redirect to /news when no story is found 2015-06-26 00:16:18 -07:00
Berkeley Martinez
310bf7f6fb fix navbar should point to /news not /stories 2015-06-25 23:43:02 -07:00
Berkeley Martinez
549434bdbf fix should be /news for show views 2015-06-25 23:39:38 -07:00
Quincy Larson
30c46a43eb update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Quincy Larson
6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Berkeley Martinez
82c96ec0ba bump main.js version 2015-06-25 23:20:16 -07:00
Berkeley Martinez
9c2768591d fix check for user existence 2015-06-25 23:01:04 -07:00
Berkeley Martinez
ef919b7ed3 add comments migration to loopback script 2015-06-25 21:47:25 -07:00
Berkeley Martinez
2422663f34 add comments migration to loopback script 2015-06-25 21:47:25 -07:00
Quincy Larson
e9450b9321 start building sponsor views 2015-06-25 15:15:41 -07:00
Berkeley Martinez
13590a1331 refactor rxify stories 
fixes many bugs
 2015-06-25 15:03:46 -07:00
Natasha Haggard
e24144edaa Issue 923 - Grammatical error 
"Your pair will have their own cursor, and will be able to type text on his or her and keyboard."

Removed the "and" after "his or her".

This closes #923
 2015-06-24 22:40:10 -05:00
Natasha Haggard
6c9cb28fdc Issue 923 - Grammatical error 
"Your pair will have their own cursor, and will be able to type text on his or her and keyboard."

Removed the "and" after "his or her".

This closes #923
 2015-06-24 22:40:10 -05:00
Natasha Haggard
45787cebbd Issue 1059 - Wording issue on instructions 
Second issue to solve states "Each of your Bootstrap buttons should be wrapped within its own a div element with the class "col-xs-4". Removed the word "a" to read "wrapped within its own div".

This closes #1059
 2015-06-24 21:52:10 -05:00
Natasha Haggard
42eba3becc Issue 1059 - Wording issue on instructions 
Second issue to solve states "Each of your Bootstrap buttons should be wrapped within its own a div element with the class "col-xs-4". Removed the word "a" to read "wrapped within its own div".

This closes #1059
 2015-06-24 21:52:10 -05:00
Berkeley Martinez
16edbe765a Merge pull request #1073 from NatashaHaggard/NatashaHaggard-1036 
Issue 1036 - Fixed minor grammatical mistake
 2015-06-24 10:43:12 -07:00
Berkeley Martinez
95b0884df5 Merge pull request #1073 from NatashaHaggard/NatashaHaggard-1036 
Issue 1036 - Fixed minor grammatical mistake
 2015-06-24 10:43:12 -07:00
Berkeley Martinez
08c649f3f7 Merge pull request #1093 from LumenTeun/typeerror 
Fixes misspelling that caused 'undefined is not function' error
 2015-06-24 10:34:31 -07:00
Berkeley Martinez
39f46b380d Merge pull request #1102 from NatashaHaggard/patch-2 
Issue 1080
 2015-06-24 10:32:58 -07:00
Berkeley Martinez
c3d9598d18 Merge pull request #1102 from NatashaHaggard/patch-2 
Issue 1080
 2015-06-24 10:32:58 -07:00
LumenTeun
13a8a728e2 'Slack' to 'Gitter or Slack' 2015-06-24 10:29:52 -07:00
LumenTeun
c8c03aae10 'Slack' to 'Gitter or Slack' 2015-06-24 10:29:52 -07:00
LumenTeun
6b423dfcb1 'Slack' to 'Gitter' 2015-06-24 10:29:52 -07:00
LumenTeun
95f47de9f0 'Slack' to 'Gitter' 2015-06-24 10:29:52 -07:00
Berkeley Martinez
8c5cf3ae68 Merge pull request #1101 from NatashaHaggard/patch-1 
Issue 1094 - Field Guide Error
 2015-06-24 10:23:27 -07:00