Commit Graph

806 Commits

Author SHA1 Message Date
Quincy Larson
7e9d65675a Merge branch 'master' into remove-angular
Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-12-04 18:49:38 -06:00
Harsha
5b376e106c Fixes previous step issue in one-step-challenges 2015-11-30 23:29:07 -05:00
Berkeley Martinez
04db6744b9 Fix code output logic
Fix codemirror url paths
2015-11-29 16:28:32 -08:00
Berkeley Martinez
9532a80f26 Correct typos 2015-11-29 16:28:32 -08:00
Berkeley Martinez
e8d9e31a47 Fix bad ctrl enter logic 2015-11-29 16:28:32 -08:00
Berkeley Martinez
4bdf1b2854 Add gulp build of commonFramework 2015-11-29 16:27:14 -08:00
Berkeley Martinez
29f90505b7 More refactoring 2015-11-29 16:27:14 -08:00
Berkeley Martinez
748f7ab93f Progress towards refactoring 2015-11-29 16:21:04 -08:00
Berkeley Martinez
87fa38182e bundle vendor files 2015-11-29 16:20:17 -08:00
Quincy Larson
d4fde2a98a create the fastest site on the internet 2015-11-25 10:23:35 -06:00
roelver
44f581c13b Keep submitted url - closes #4319 2015-11-23 16:02:07 +01:00
Berkeley Martinez
f8d68bcfa2 Hotfix revert heat-map offset 2015-11-20 11:24:02 -08:00
Berkeley Martinez
37f91d0bd7 Merge pull request #4581 from QuincyLarson/fix/links-view
Improve look of links page
2015-11-19 23:38:42 -08:00
Berkeley Martinez
022ed56af9 Merge pull request #4578 from FreeCodeCamp/feature/reddit-ad
Add reddit notice to map view
2015-11-19 23:36:53 -08:00
Quincy Larson
66d384c4c9 Improve look of links page 2015-11-20 01:25:49 -06:00
Quincy Larson
f8b8580e8b add reddit ad to map 2015-11-20 00:55:37 -06:00
Berkeley Martinez
6f62868f44 Change order of links on links 2015-11-19 22:46:36 -08:00
Quincy Larson
9d08c1702e update navbar, remove footer, create links page 2015-11-19 22:46:36 -08:00
Berkeley Martinez
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
Berkeley Martinez
3b63e406ed Fix jobs order should be descend by post date 2015-11-19 17:31:00 -08:00
SaintPeter
86e4165c4c Step Challenge - Prev from end, x/y step display 2015-11-16 21:57:35 -08:00
Arsen Melikyan
b88caa80be fix rss feed content type 2015-11-15 11:39:30 +04:00
Quincy Larson
debfb07ab8 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-11-13 17:15:23 -08:00
Quincy Larson
0695860434 improve styling of completed challenges table 2015-11-13 17:08:51 -08:00
Berkeley Martinez
ddd85d507b Merge pull request #4400 from FreeCodeCamp/fix/update-labs
Update labs and improve jobs
2015-11-13 13:02:09 -08:00
Rex Schrader
3b5b9dfcdc Merge pull request #4242 from bugron/feature/rss-feed-for-camper-news
Adds RSS feed for Camper News
2015-11-13 11:28:41 -08:00
Quincy Larson
61ffb55a3d Merge branch 'staging' into fix/update-labs
Conflicts:
	common/app/routes/Jobs/components/Jobs.jsx
2015-11-12 16:38:30 -08:00
Quincy Larson
ffbac22511 update labs 2015-11-12 16:35:37 -08:00
Arsen Melikyan
e2a4f5468d adds rss feed for camper news 2015-11-11 22:27:48 +04:00
Matthias Kern
f14009833c add a mobile portfolio view. 2015-11-11 17:25:06 +02:00
Berkeley Martinez
1b512330af Merge pull request #4277 from ltegman/fix/unauthenticated-next-challenge-button-4262
Fix The Next Challenge link not working for unauthenticated users.
2015-11-10 17:39:15 -08:00
Logan Tegman
c65be452b5 Fix The Next Challenge link not working for unauthenticated users.
Closes #4262
2015-11-10 16:42:05 -08:00
Rex Schrader
4751ea5e1e Merge pull request #4279 from FreeCodeCamp/feature/challenge-dev-mode
Feature in dev mode always pull from disk
2015-11-10 10:19:10 -08:00
Berkeley Martinez
42ab1d70fd Remove unnecessary unary operator 2015-11-10 09:59:49 -08:00
Berkeley Martinez
7d43ddab0b Merge branch 'fix-cal-heatmap' of https://github.com/terakilobyte/freecodecamp into terakilobyte-fix-cal-heatmap 2015-11-10 09:30:57 -08:00
Berkeley Martinez
1619a09da2 Add helpful error message if no filename 2015-11-09 22:37:16 -08:00
Berkeley Martinez
d095fd5d90 Feature in dev mode always pull from disk 2015-11-09 17:27:56 -08:00
Berkeley Martinez
8fe3a075bf Hotfix fix basejump-zipline completion 2015-11-08 20:05:12 -08:00
terakilobyte
969204e2c8 Removes debugging statements 2015-11-07 16:40:36 -05:00
terakilobyte
d6cea74447 Offsets user displayed time to server timezone(EST) for the heatmap 2015-11-07 13:26:58 -08:00
Logan Tegman
2667b574bf Fixes small bugs
+ With MDNLinks and bonfireExecute being run on step challenges.
+ Return when common isn't loaded in reBindModals instead of throwing.
2015-11-07 13:00:44 -08:00
Berkeley Martinez
328e75812a Fix lint issues with gist saving 2015-11-06 17:48:17 -08:00
Berkeley Martinez
5dbfbfcf57 Add head/tail to challenge spec.
Lint EVERYTHING!
2015-11-06 17:32:01 -08:00
Logan Tegman
5b4eafe751 Merge pull request #3995 from bugron/feature/save-bonfire-solution-as-github-gist
Save bonfire's solution as a GitHub gist
2015-11-06 17:21:01 -08:00
Aniruddh Agarwal
81c74f4209 Merge pull request #4136 from FreeCodeCamp/greenkeeper-update-all
Update all dependencies 🌴
2015-11-06 10:53:26 +08:00
Berkeley Martinez
00fcdc9bc1 Fix news username query should be case insensitive 2015-11-05 17:06:13 -08:00
Berkeley Martinez
325e121d4e Merge branch 'feature/find-posted-news-by-username' of https://github.com/bugron/FreeCodeCamp into bugron-feature/find-posted-news-by-username 2015-11-05 16:46:29 -08:00
Berkeley Martinez
085fc2fe72 Fix loopback explorer issue 2015-11-05 16:41:19 -08:00
Berkeley Martinez
c7d6426728 Merge pull request #4200 from FreeCodeCamp/fix/update-landing
Fix landing and nonprofits page
2015-11-05 16:14:11 -08:00
Quincy Larson
5430ccc3be fix landing and nonprofit 2015-11-05 13:38:09 -08:00