3e24f21828
fix comment model defaults
2015-06-24 08:24:13 -07:00
62d2c40a87
Add read access to all models
2015-06-24 08:23:49 -07:00
82a4afe8ba
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-24 07:26:23 -07:00
5bde1839f3
add read authority to all for stories and comments
2015-06-24 07:25:56 -07:00
4871b58904
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-24 07:21:22 -07:00
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
c0c15cf875
fix define story
2015-06-24 07:16:09 -07:00
4d620c5796
comment out feature map modal and camper news notification
2015-06-24 07:06:40 -07:00
3a0ab673f3
Update Gitter badge path
2015-06-23 21:55:24 -07:00
926151ff8b
Add Gitter badge and use map art instead of logo
2015-06-23 21:54:00 -07:00
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
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
0b1e9ba279
fix mismatch property in challenge controller
2015-06-23 16:45:35 -07:00
31eb81bf2f
fix many queries in story
2015-06-23 16:28:16 -07:00
fb04a022ae
refactor rxify fieldguides
2015-06-23 16:22:07 -07:00
fb1897073c
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
2015-06-23 11:42:41 -07:00
135047027a
add new field guides and challenges
2015-06-23 11:42:27 -07:00
51faa9e80f
Fixes misspelling that caused 'undefined is not function' error
2015-06-23 20:15:09 +02:00
738afa817c
update challenge copy
2015-06-23 08:10:20 -07:00
99459feb5e
Add Symmetric Difference link to bonfire
2015-06-22 21:49:44 -07:00
1cdd0eee6d
Add video link for Symmetric Difference
2015-06-22 21:46:09 -07:00
02b67edfe8
Merge pull request #3 from FreeCodeCamp/staging
...
Pull up to date
2015-06-22 21:43:52 -07:00
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
71223de101
Merge pull request #1071 from StevenXL/stevenxl-1070
...
Change links to Gitter channel.
2015-06-22 22:31:30 -04:00
1dda8e2f87
refactor Rxify nonprofits router
2015-06-22 19:23:07 -07:00
b383da47bb
fix uncompletedBonfires should default to empty array
2015-06-22 19:18:15 -07:00
663d559fb4
Change links to Gitter channel.
2015-06-22 22:08:58 -04:00
d624cf3640
factor out (un)dasherize into utils
2015-06-22 17:24:55 -07:00
10a5c3c928
fix send 200 to non users on post to challenges
...
fix remove random 'yo' debug
2015-06-22 16:43:31 -07:00
7aff6dd285
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
2015-06-22 10:31:24 -04:00
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
91cc320cb2
Merge pull request #1041 from SaintPeter/patch-3
...
Fix missing semicolon in Symmetric Differences test
2015-06-22 06:59:19 -07:00
d6ea2d931c
Merge pull request #1043 from brandenbyers/issue-192
...
Change eqls to equal
2015-06-22 06:52:57 -07:00
6972f64697
fix minor issue with controller
2015-06-21 22:46:37 -07:00
a428404600
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-21 21:01:26 -07:00
7df91e6310
add total time to start to logs during waitFordb
2015-06-21 19:11:42 -07:00
5e8ed616d5
add wait for db in development before listening for connections
2015-06-21 18:37:29 -07:00
4804d868c4
wrap server.listen in if module
...
prevents server from starting durring testing/scripting
2015-06-21 18:10:17 -07:00
ce0731df5f
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
server/boot/randomAPIs.js
server/views/coursewares/showBonfire.jade
server/views/partials/navbar.jade
2015-06-21 15:53:16 -07:00
6950ebc346
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-21 12:25:45 +02:00
9f1b6c58a5
fix /chat should go to gitter
2015-06-20 23:17:09 -07:00
629262dd0d
fix /chat should go to gitterim
2015-06-20 23:15:10 -07:00
8f445b58f2
fix chat links go to Gitter Room
2015-06-20 23:11:33 -07:00
c2d3652272
fix navbar for gitter
2015-06-20 23:07:49 -07:00
1a502b1696
hotfix for production gitter change
2015-06-20 23:00:19 -07:00
5db883346e
Change eqls to equal
2015-06-21 00:56:20 -05:00
742a49b70d
fix mainjs resetEditor
2015-06-20 22:48:59 -07:00
c113c72082
Fix missing semicolon in Symmetric Differences test
...
The first test of Symmetric Differences is broken because it was missing a semicolon, making it impossible to pass.
2015-06-20 22:09:21 -07:00
0623ace259
fix sitemap query's
...
make rx mapping async
2015-06-20 21:21:36 -07:00
f17c442018
fix should be story not store
2015-06-20 20:54:39 -07:00
Berkeley Martinez
Quincy Larson
Natasha Haggard
LumenTeun
Rex Schrader
Nathan
Steven Leiva
greasan
brandenbyers