Commit Graph

6295 Commits

Author SHA1 Message Date
f8d68bcfa2 Hotfix revert heat-map offset 2015-11-20 11:24:02 -08:00
fe107a0147 hotfix limit eslint version 2015-11-20 11:17:25 -08:00
9651dc4185 Merge branch 'greenkeeper-babel-5.8.34' into staging 2015-11-20 11:14:25 -08:00
ea018bedda update babel-core 2015-11-20 11:13:48 -08:00
82dc1cf3b5 Merge pull request #4579 from ltegman/fix/update-react-bootstrap
Update to react-bootstrap 0.28.1 and widen react nav
2015-11-20 10:57:51 -08:00
37f91d0bd7 Merge pull request #4581 from QuincyLarson/fix/links-view
Improve look of links page
2015-11-19 23:38:42 -08:00
4c6872acbc Merge pull request #4580 from QuincyLarson/fix/less-optimistic-times
make times for waypoint challenges less optimistic
2015-11-19 23:37:07 -08:00
022ed56af9 Merge pull request #4578 from FreeCodeCamp/feature/reddit-ad
Add reddit notice to map view
2015-11-19 23:36:53 -08:00
927a058b90 make times for waypoint challenges less optimistic 2015-11-20 01:26:57 -06:00
66d384c4c9 Improve look of links page 2015-11-20 01:25:49 -06:00
3a9745974c Update to react-bootstrap 0.28.1 and widen react nav
+ Moved away from deprecated navbar components and props
+ Removed mixin from NavItem
+ Updated stylesheet so the `.container` react-bootstrap adds doesn't impact nav positioning
2015-11-19 23:09:30 -08:00
f8b8580e8b add reddit ad to map 2015-11-20 00:55:37 -06:00
dfa5acde60 Add learn button to navbar 2015-11-19 22:46:36 -08:00
6f62868f44 Change order of links on links 2015-11-19 22:46:36 -08:00
9d08c1702e update navbar, remove footer, create links page 2015-11-19 22:46:36 -08:00
854e937a20 Merge pull request #4450 from bugron/fix/feed-content-type
Set RSS feed correct content-type
2015-11-19 19:52:29 -08:00
9468b42de9 Merge pull request #4478 from vtamara/add/ES-translation-of-html5-and-css
Completes translation to spanish of HTML5 & CSS
2015-11-19 21:49:32 -06:00
f8d6a399ca Merge pull request #4489 from vtamara/add/ES-translation-of-jquery
Translation to spanish of jquery
2015-11-19 21:48:47 -06:00
0753a2de34 Merge pull request #4490 from justinian336/Add/ES-translation-of-Nodejs-Expressjs-Waypoint
Add ES translation of Nodejs Expressjs Waypoint
2015-11-19 21:47:42 -06:00
392d833692 Merge pull request #4491 from justinian336/Add/ES-translation-of-AngularJS-Waypoint
add ES translation of AngularJS Waypoints
2015-11-19 21:47:16 -06:00
7eafd83e6a Merge pull request #4492 from justinian336/Add/ES-translation-of-MongoDB-Waypoint
add ES translation of MongoDB Waypoint
2015-11-19 21:46:07 -06:00
6302e0b198 Merge pull request #4572 from FreeCodeCamp/fix/job-order
Fix jobs order should be descend by post date
2015-11-19 21:45:27 -06:00
dc453eb20a Thanks for corrections to @justinian633 2015-11-19 22:07:18 -05:00
7e1448248a Completes translation to spanish. 2015-11-19 21:38:18 -05:00
3b63e406ed Fix jobs order should be descend by post date 2015-11-19 17:31:00 -08:00
a60e0215d2 [HotFix] revert react-bootstrap version 2015-11-19 15:00:11 -08:00
d4b2df348e add ES translation of Front End and Full Stack Certificates 2015-11-19 10:25:21 +00:00
00dab2d1f1 Add ES translation of Basic and Intermediate Front End Projects 2015-11-19 06:14:56 +00:00
e0f3c18b47 Merge pull request #4553 from fraziern/feature/add-jquery-text-waypoint
Added new jQuery waypoint on modifying text/html
2015-11-18 21:25:06 -08:00
7d6469b9fb Added new jQuery waypoint on modifying text/html closes #4457 2015-11-18 23:55:11 -05:00
ace46ec9d4 Merge pull request #4530 from SaintPeter/change/move-slot-machines-to-beta
Move Slot Machine Challenges to Beta
2015-11-18 14:28:18 -08:00
15a7046285 Move Slot Machine Challenges to Beta 2015-11-18 12:03:22 -08:00
53a07724b9 Merge pull request #4521 from shadowfool/patch-1
Fix Convert JSON to HTML test to forEach
2015-11-18 10:17:52 -08:00
cc8e5a77dc Update json-apis-and-ajax.json
Proposed fix to solve issue #4516. Instructions say to use forEach instead of map.
2015-11-18 11:02:46 -05:00
f03dba1c5e Merge pull request #4504 from SaintPeter/fix/font-awesome-clarification
Clarify Font Awesome Instructions, Add Example
2015-11-17 20:12:24 -08:00
12d3914fcd Merge pull request #4507 from Cull-Methi/staging
Changed single quotes to double for consistency
2015-11-17 20:01:23 -08:00
7a1058f84f Changed single quotes to double for consistency
Though in JS there's no difference, all the prior exercises use double quotes, so using a pair of single quotes suddenly and without explanation could be confusing. If this isn't addressed in the 'basic javascript' portion (I haven't gotten there yet), it should be
2015-11-17 20:55:13 -05:00
854af434d3 Translation to spanish of jquery.json 2015-11-17 20:37:28 -05:00
2cac98a353 Clarify Font Awesome Instructions, Add Example
Clarify Font Awesome Instructions, Add Example
2015-11-17 14:19:37 -08:00
788befec36 Merge pull request #4467 from FreeCodeCamp/feature/step-challenge-prev-button
Step Challenge - Prev from end, x/y step display
2015-11-17 09:16:10 -08:00
9641958cb5 Merge pull request #4488 from Cull-Methi/staging
Clarified href dead link challenge description
2015-11-16 22:01:57 -08:00
86e4165c4c Step Challenge - Prev from end, x/y step display 2015-11-16 21:57:35 -08:00
98fca1f23a Add ES translation of Nodejs Expressjs Waypoint 2015-11-17 04:33:26 +00:00
24ffb1346c Updated a href dead link challenge to be more clear 2015-11-16 20:50:48 -05:00
e4468a44f5 Merge pull request #4479 from FreeCodeCamp/greenkeeper-react-bootstrap-0.28.1
Update react-bootstrap to version 0.28.1 🚀
2015-11-16 16:57:51 -08:00
bdf4b797ef chore(package): update react-bootstrap to version 0.28.1
http://greenkeeper.io/
2015-11-16 12:04:49 -08:00
ebd926ebc6 Merge pull request #4452 from justinian336/add/ES-translation-of-Git-Waypoint
Add/ES translation of git waypoint
2015-11-16 10:20:26 -08:00
c77174ae82 Merge pull request #4451 from justinian336/add/ES-translation-of-bonfires
add/ES-translation-of-bonfires
2015-11-16 10:20:07 -08:00
99a565e82e Merge pull request #4449 from vtamara/fix/spaord1
Reordering spanish descriptions to follow changes in english
2015-11-16 10:17:36 -08:00
064b9af287 Merge pull request #4316 from krantzinator/fix/basic-bonfire-solutions
Add Solution For Bonfire: Where Do I Belong
2015-11-16 10:00:06 -08:00