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
Quincy Larson
3a0ab673f3
Update Gitter badge path
2015-06-23 21:55:24 -07:00
Quincy Larson
926151ff8b
Add Gitter badge and use map art instead of logo
2015-06-23 21:54:00 -07:00
Natasha Haggard
bd0a517144
Issue 1080
...
Changed "Twitter Bootstrap" to "Bootstrap". It used to be it's name but it's not any more. It's in their brand guidelines to not refer to it as Twitter Bootstrap any more: http://getbootstrap.com/about/#name
2015-06-23 22:55:52 -05:00
Natasha Haggard
1e84751a0f
Issue 1094 - Field Guide Error
...
"Contact Jason Ruekert - he's @jsonify in Slack."
Since freecodecamp is now using Gitter again, changed it to say "Contact Jason Ruekert - he's @jsonify in Gitter."
2015-06-23 22:46:28 -05:00
Berkeley Martinez
0b1e9ba279
fix mismatch property in challenge controller
2015-06-23 16:45:35 -07:00
Berkeley Martinez
31eb81bf2f
fix many queries in story
2015-06-23 16:28:16 -07:00
Berkeley Martinez
fb04a022ae
refactor rxify fieldguides
2015-06-23 16:22:07 -07:00
Quincy Larson
fb1897073c
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
2015-06-23 11:42:41 -07:00
Quincy Larson
135047027a
add new field guides and challenges
2015-06-23 11:42:27 -07:00
LumenTeun
51faa9e80f
Fixes misspelling that caused 'undefined is not function' error
2015-06-23 20:15:09 +02:00
Quincy Larson
738afa817c
update challenge copy
2015-06-23 08:10:20 -07:00
Rex Schrader
99459feb5e
Add Symmetric Difference link to bonfire
2015-06-22 21:49:44 -07:00
Rex Schrader
1cdd0eee6d
Add video link for Symmetric Difference
2015-06-22 21:46:09 -07:00
Rex Schrader
02b67edfe8
Merge pull request #3 from FreeCodeCamp/staging
...
Pull up to date
2015-06-22 21:43:52 -07:00
Natasha Haggard
e3aee8f421
Issue 1036 - Fixed minor grammatical mistake
...
Fixed minor grammatical mistake - changed "Your app should have an text field input element" to "Your app should have a text field input element"
2015-06-22 22:13:21 -05:00
Nathan
71223de101
Merge pull request #1071 from StevenXL/stevenxl-1070
...
Change links to Gitter channel.
2015-06-22 22:31:30 -04:00
Berkeley Martinez
1dda8e2f87
refactor Rxify nonprofits router
2015-06-22 19:23:07 -07:00
Berkeley Martinez
b383da47bb
fix uncompletedBonfires should default to empty array
2015-06-22 19:18:15 -07:00
Steven Leiva
663d559fb4
Change links to Gitter channel.
2015-06-22 22:08:58 -04:00
Berkeley Martinez
d624cf3640
factor out (un)dasherize into utils
2015-06-22 17:24:55 -07:00
Berkeley Martinez
10a5c3c928
fix send 200 to non users on post to challenges
...
fix remove random 'yo' debug
2015-06-22 16:43:31 -07:00
terakilobyte
7aff6dd285
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
2015-06-22 10:31:24 -04:00
terakilobyte
7004e81b4a
Fixes #1053
...
This changes the link to point to Free Code Camp's "Lets Pair" room on gitter and opens the link in a new tab/window depending on user browser preference.
2015-06-22 10:30:26 -04:00
Berkeley Martinez
91cc320cb2
Merge pull request #1041 from SaintPeter/patch-3
...
Fix missing semicolon in Symmetric Differences test
2015-06-22 06:59:19 -07:00
Berkeley Martinez
d6ea2d931c
Merge pull request #1043 from brandenbyers/issue-192
...
Change eqls to equal
2015-06-22 06:52:57 -07:00
Quincy Larson
6972f64697
fix minor issue with controller
2015-06-21 22:46:37 -07:00