Commit Graph

3705 Commits

Author SHA1 Message Date
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
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
Berkeley Martinez
5bde1839f3 add read authority to all for stories and comments 2015-06-24 07:25:56 -07:00
Berkeley Martinez
c0c15cf875 fix define story 2015-06-24 07:16:09 -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
LumenTeun
51faa9e80f Fixes misspelling that caused 'undefined is not function' error 2015-06-23 20:15:09 +02: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
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
Quincy Larson
a428404600 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-21 21:01:26 -07:00
Berkeley Martinez
7df91e6310 add total time to start to logs during waitFordb 2015-06-21 19:11:42 -07:00
Berkeley Martinez
5e8ed616d5 add wait for db in development before listening for connections 2015-06-21 18:37:29 -07:00
Berkeley Martinez
4804d868c4 wrap server.listen in if module
prevents server from starting durring testing/scripting
2015-06-21 18:10:17 -07:00
Quincy Larson
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
Berkeley Martinez
629262dd0d fix /chat should go to gitterim 2015-06-20 23:15:10 -07:00
Berkeley Martinez
8f445b58f2 fix chat links go to Gitter Room 2015-06-20 23:11:33 -07:00
brandenbyers
5db883346e Change eqls to equal 2015-06-21 00:56:20 -05:00
Berkeley Martinez
742a49b70d fix mainjs resetEditor 2015-06-20 22:48:59 -07:00
Berkeley Martinez
0623ace259 fix sitemap query's
make rx mapping async
2015-06-20 21:21:36 -07:00
Berkeley Martinez
f17c442018 fix should be story not store 2015-06-20 20:54:39 -07:00
Berkeley Martinez
9fb3c0bff7 fix use secrets.db instead of process.env.MONGOHQ in datasource.local.js
this should eliminate timeout issue.
I'd bet my bottom dollar.
2015-06-20 20:43:36 -07:00
Berkeley Martinez
049233c0a1 fix add server/utils/rx to commit 2015-06-20 19:55:22 -07:00
Berkeley Martinez
03ea412b4a major challenges refactor
commented out resetEditor in main
remove heatmap timout
2015-06-20 19:55:07 -07:00
Berkeley Martinez
4d2b0844ae fix use regex to find challenges 2015-06-20 19:54:08 -07:00
Quincy Larson
e03d16e6a6 Merge pull request #1003 from Lemony-Andrew/patch-3
Auto Save, Removed Stamps +more, done
2015-06-20 18:43:31 -07:00
Quincy Larson
a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson
5212173c61 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-20 18:12:24 -07:00
Quincy Larson
dd3d445054 add new chat challenge 2015-06-20 18:12:12 -07:00
Berkeley Martinez
43ae70465b refactor returnIndividualBonfires 2015-06-20 11:43:12 -07:00
Berkeley Martinez
50a0ad3595 fix use gt not $gt
closes #1022
2015-06-20 00:36:28 -07:00
Quincy Larson
883a561d73 finishing touches on calculator 2015-06-19 21:24:04 -07:00