Commit Graph

844 Commits

Author SHA1 Message Date
noinkling
b1a5f517a2 Move time text out of icon element on map page 2015-10-17 18:40:49 +13:00
Berkeley Martinez
af654aebdc Hot fix for chat close button 2015-10-16 20:23:24 -07:00
Quincy Larson
4589b9ae39 add conditional buttons for mobile gitter 2015-10-16 16:45:38 -07:00
Berkeley Martinez
5b9c534bff Fix logic on zipline/basejumps 2015-10-16 16:30:44 -07:00
Berkeley Martinez
1b75d041c1 Fix logic on basejump/ziplines 2015-10-16 16:20:34 -07:00
Berkeley Martinez
12eeef2f41 Add chat room titles 2015-10-16 16:10:45 -07:00
Berkeley Martinez
35219cdce3 Add main chat window on nav bar chat click 2015-10-16 11:57:33 -07:00
Berkeley Martinez
a0182957e7 Add chat to challenges! 2015-10-16 10:37:35 -07:00
Berkeley Martinez
745f059eeb hotfix prevent server from starting twice 2015-10-14 23:49:32 -07:00
Quincy Larson
c552b6d05b Merge pull request #3748 from FreeCodeCamp/feature/add-ga-social-tracking
Add google analytics tracking
2015-10-14 21:57:44 -07:00
Quincy Larson
6955615690 Merge pull request #3746 from FreeCodeCamp/fix/morgan-reporting-order
Change order of information in morgan reporting
2015-10-14 21:49:03 -07:00
Quincy Larson
e8b39648e2 Merge pull request #3745 from FreeCodeCamp/fix/ssl-redirect-rev
Remove rev helper use in ssl redirect
2015-10-14 21:48:51 -07:00
Quincy Larson
cf45d2b01f update landing page and stories 2015-10-14 21:42:29 -07:00
Berkeley Martinez
7c0d801d63 Add google analytics tracking 2015-10-14 21:26:22 -07:00
Berkeley Martinez
aceb1dd9e6 Change order of information in morgan reporting 2015-10-14 20:51:38 -07:00
Berkeley Martinez
3ae7da38a3 Remove rev helper use in ssl redirect 2015-10-14 20:41:36 -07:00
Quincy Larson
99db9eaf33 Merge branch 'staging' into success-stories 2015-10-14 20:00:11 -07:00
Berkeley Martinez
3e828ba266 Merge pull request #3727 from QuincyLarson/estimates
Time estimates for each block of challenge (by popular request)
2015-10-13 15:49:39 -07:00
Berkeley Martinez
7424d85f09 Merge pull request #3728 from FreeCodeCamp/update-step-challenges
Update step challenges
2015-10-13 15:05:03 -07:00
Quincy Larson
2bbb3e98db Merge pull request #3716 from FreeCodeCamp/feature/jobs
Update loopback, ThunderCats and RxJS.
2015-10-13 14:43:56 -07:00
Quincy Larson
407bd16aaf make additional improvements and fixes to step challenges 2015-10-13 10:04:44 -07:00
Quincy Larson
8da93ddea9 add spacing and nowrap to ensure time stays on single line 2015-10-12 23:02:24 -07:00
Quincy Larson
f30239fb6c add time estimates to challenge blocks on map 2015-10-12 22:56:10 -07:00
Quincy Larson
3dee03d38b add more stories and clean up css 2015-10-12 01:22:11 -07:00
Berkeley Martinez
7b444b15dc Update loopback, ThunderCats and RxJS.
closes #2929
2015-10-11 17:35:46 -07:00
uwaseem
21c78f9f96 Removed an extra m from the word commit 2015-10-11 17:41:27 +08:00
Berkeley Martinez
749357933d Merge pull request #3669 from FreeCodeCamp/fix/challenge-sequence
Fix mis-sequence of challenges and fix some quick issues campers reported about challenges
2015-10-09 19:43:00 -07:00
Quincy Larson
c2da02bf8a improve copy on button 2015-10-09 19:33:15 -07:00
Berkeley Martinez
91df8cba6f Merge pull request #3666 from FreeCodeCamp/fix/commit
update look of commit
2015-10-08 17:26:07 -07:00
Berkeley Martinez
fcd7e096b2 Fix alt attribute 2015-10-08 17:25:47 -07:00
Quincy Larson
da29152783 Merge branch 'fix/commit' of https://github.com/freecodecamp/freecodecamp into fix/commit
Conflicts:
	server/views/commit/index.jade
2015-10-08 17:21:30 -07:00
Quincy Larson
6fafbdf441 improve stories view 2015-10-08 17:05:42 -07:00
Berkeley Martinez
e62375516b Add commit button functionality 2015-10-08 17:00:15 -07:00
Quincy Larson
66120a60b8 update look of commit 2015-10-08 16:29:43 -07:00
Quincy Larson
920d9ba403 Merge pull request #3655 from FreeCodeCamp/fix/remove-unused-endpoint
Remove unused jobs-form endpoint
2015-10-08 15:31:09 -07:00
Quincy Larson
ce57a13a88 Merge pull request #3657 from FreeCodeCamp/fix/harded-certs
Harden showCert against errors
2015-10-08 15:30:13 -07:00
Berkeley Martinez
0dc35f2b0a Fix show certs to anon user
closes #3648
2015-10-08 09:02:35 -07:00
Berkeley Martinez
ba88def035 Harden showCert against errors 2015-10-08 08:48:52 -07:00
Berkeley Martinez
76618efcd0 Remove unused jobs-form endpoint 2015-10-08 08:12:48 -07:00
Berkeley Martinez
1695a760ef Fix check for _id as well as id during certification 2015-10-07 16:30:51 -07:00
Berkeley Martinez
155f9359a1 Fix default dollar amount incorrectly set 2015-10-07 14:37:48 -07:00
Berkeley Martinez
0cb8c6c58b hot patch/ prevent dedube 2015-10-07 06:05:33 -07:00
Berkeley Martinez
f9d616a4a6 Merge pull request #3626 from QuincyLarson/fix/learn-button
fix learn button
2015-10-07 02:40:00 -07:00
Quincy Larson
066b2ac7f9 fix learn button 2015-10-07 02:35:23 -07:00
Berkeley Martinez
c6914fa205 Fix small typo on certification challenge 2015-10-07 02:22:04 -07:00
Berkeley Martinez
f2679810a9 fix some typos in commit and getting started 2015-10-07 02:11:23 -07:00
Quincy Larson
cdbd052b35 Merge branch 'staging' into clementine 2015-10-07 01:29:15 -07:00
Quincy Larson
1f7141c523 Merge branch 'staging' into clementine 2015-10-07 01:28:41 -07:00
Berkeley Martinez
0f6cdf8be1 Merge pull request #3615 from FreeCodeCamp/feature/commit
Add feature Commit
2015-10-07 01:23:24 -07:00
Berkeley Martinez
a906b8f411 Fix firstChallenge var should point to new first challenge 2015-10-07 01:14:33 -07:00