LumenTeun
33fa2d1939
'Font degrade'-test now check order of font-familiy. Fixes #1151
2015-06-30 02:52:21 +02:00
Quincy Larson
d9fe6dcef1
fix broken challenges and attempt to make streak more lenient.
2015-06-29 16:32:49 -07:00
Quincy Larson
cf167b3c11
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-28 18:03:21 -07:00
Quincy Larson
c4c1a44c48
make the Mobile Responsive Images challenge more robust fixes #998
2015-06-28 18:03:11 -07:00
Quincy Larson
2284a9fcd7
Merge pull request #1115 from NatashaHaggard/923
...
Issue 923 - Grammatical error
2015-06-28 15:24:52 -07:00
Quincy Larson
1fabe07bcd
Merge pull request #1124 from greasan/greasan-translateDE
...
First two sections translated into German
2015-06-28 15:22:58 -07:00
Quincy Larson
bdb2c2989f
Merge pull request #1114 from NatashaHaggard/1059
...
Issue 1059 - Wording issue on instructions
2015-06-28 15:22:10 -07:00
Quincy Larson
d857bbcc0b
Merge pull request #1149 from JonSonesen/jonathonsonesen-1148
...
fixes issue #1148
2015-06-28 15:21:11 -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
bdb170b0df
fixes issue #1148
2015-06-28 15:03:52 -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
05cfe86cd0
add some additional jquery challenges
2015-06-27 19:42:25 -07:00
Quincy Larson
7ee4b22a57
update the cities on the field guide
2015-06-27 15:28:37 -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
20fde8a8ab
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-26 19:22:13 +02:00
Berkeley Martinez
66e4138b36
fix buffer return from database query
2015-06-26 01:51:27 -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
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
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
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
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
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
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
c3d9598d18
Merge pull request #1102 from NatashaHaggard/patch-2
...
Issue 1080
2015-06-24 10:32:58 -07:00
LumenTeun
c8c03aae10
'Slack' to 'Gitter or Slack'
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
Quincy Larson
750a454298
update bootcamp json
2015-06-24 09:37:03 -07:00
Quincy Larson
c5a31baeda
remove resources.js controller
2015-06-24 09:30:35 -07:00
Berkeley Martinez
1f28f877cf
fix remove mongoose specific function
2015-06-24 08:25:34 -07:00
Berkeley Martinez
3e24f21828
fix comment model defaults
2015-06-24 08:24:13 -07:00
Berkeley Martinez
62d2c40a87
Add read access to all models
2015-06-24 08:23:49 -07:00
Quincy Larson
82a4afe8ba
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-24 07:26:23 -07:00
Berkeley Martinez
5bde1839f3
add read authority to all for stories and comments
2015-06-24 07:25:56 -07:00
Quincy Larson
4871b58904
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-24 07:21:22 -07:00
Quincy Larson
1df962bb07
Merge branch 'master' into staging
...
Conflicts:
controllers/resources.js
public/js/main_0.0.2.js
seed/challenges/advanced-bonfires.json
seed/challenges/basic-bonfires.json
seed/challenges/get-set-for-free-code-camp.json
server/views/partials/navbar.jade
2015-06-24 07:19:54 -07:00
Berkeley Martinez
c0c15cf875
fix define story
2015-06-24 07:16:09 -07:00
Quincy Larson
4d620c5796
comment out feature map modal and camper news notification
2015-06-24 07:06:40 -07:00