Commit Graph

3691 Commits

Author SHA1 Message Date
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
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
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
Quincy Larson
88286d366f fix a bunch of github issues regarding waypoints 2015-06-19 18:31:21 -07:00
Andrew Cay
437a564e34 Changed dependency on challenge_key to function 2015-06-19 18:22:57 -07:00
Andrew Cay
11305c152b Update coursewaresJSFramework_0.0.6.js 2015-06-19 18:02:49 -07:00
Quincy Larson
fe1b3f4d2a fix broken test from recent pull request 2015-06-19 17:53:59 -07:00
Andrew Cay
60354d24e6 Auto Save, Removed Stamps +more
Removed stamps so code stays stored until code has been reset. 
--> Added a feature which returns if the storage has been saved since last edit. *codeStorage.hasSaved()* 
--> Changed "localBonfire" to *codeStorage*
2015-06-19 17:47:21 -07:00
Quincy Larson
cd63977687 Merge branch 'master' into staging
Conflicts:
	seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
Quincy Larson
9509c5eb2f Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-06-19 17:37:03 -07:00
Quincy Larson
5a0d38eb5e Merge pull request #984 from rcw271828/staging
Fixed typo in field-guides.json
2015-06-19 17:36:19 -07:00
Quincy Larson
65d283ed13 Merge pull request #970 from SaintPeter/SaintPeter-patch-1
Improve 'Convert HTML Entities' Bonfire
2015-06-19 17:35:14 -07:00
Quincy Larson
93ed1cfb1f Merge pull request #961 from LumenTeun/lumenteun-942
More test cases for 'Seek and Destroy'
2015-06-19 17:32:31 -07:00
Quincy Larson
5f7443c91e Merge pull request #960 from 1hella/1hella-959
1hella 959
2015-06-19 17:31:14 -07:00
Quincy Larson
25f4d4c30e Merge pull request #958 from LumenTeun/lumenteun-941
'No repeats please' test fix.
2015-06-19 17:29:25 -07:00
Quincy Larson
ccc29b7fcb improve upon @lemonyandrew pull request 2015-06-19 17:26:04 -07:00
Quincy Larson
6078b54393 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-19 16:18:56 -07:00