Commit Graph

3611 Commits

Author SHA1 Message Date
hugoender
c9621aac2b Change .fa class style text-decoration property to none 2015-10-18 21:48:21 -04:00
Ankit Aggarwal
dea4bf3973 Fix for create-my-github-issue button not working 2015-10-18 02:18:26 +05:30
Berkeley Martinez
12eeef2f41 Add chat room titles 2015-10-16 16:10:45 -07:00
Berkeley Martinez
fc97bc8266 Add help button toggle 2015-10-16 15:24:35 -07:00
Berkeley Martinez
465a3e399c Add identifiers to chat embed divs 2015-10-16 14:00:02 -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
c578a68ec8 Merge pull request #3360 from bugron/fix/highlight-bonfire_code_in-GitHub_issues
Adds a switch case to highlight bonfires' code in GitHub issues
2015-10-15 18:37:08 -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
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
Quincy Larson
3dee03d38b add more stories and clean up css 2015-10-12 01:22:11 -07:00
Quincy Larson
51012bd121 remove console.log statement 2015-10-11 17:05:28 -07:00
Berkeley Martinez
1627aa522a Fix form action attribute regex
Should ignore whitespace and new lines
2015-10-10 11:44:20 -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
Quincy Larson
6fafbdf441 improve stories view 2015-10-08 17:05:42 -07:00
Berkeley Martinez
113c9a297b Fix form action attr throwing xss errors
This PR fixes codeURI xss errors in chrome due to action
attribute.
2015-10-07 16:16:02 -07:00
Quincy Larson
cdbd052b35 Merge branch 'staging' into clementine 2015-10-07 01:29:15 -07:00
Berkeley Martinez
0f6cdf8be1 Merge pull request #3615 from FreeCodeCamp/feature/commit
Add feature Commit
2015-10-07 01:23:24 -07:00
Quincy Larson
4f26d82f65 add labs and stories 2015-10-07 00:17:18 -07:00
Berkeley Martinez
bc6a9c6db2 Add redirect to user page on submit 2015-10-06 19:51:19 -07:00
Quincy Larson
b1d8814aed remove angular from views 2015-10-06 16:43:46 -07:00
Berkeley Martinez
33e8f35bbf Fix replace script tags in URL
Replace script tags in URL with fcc tags.
This prevents some xss bugs blocking code from running
in the iFrame.
2015-10-06 16:39:15 -07:00
Quincy Larson
b8dc81214d Merge branch 'staging' into remove-angular
Conflicts:
	server/boot/user.js
	server/views/account/show.jade
2015-10-06 16:00:59 -07:00
benmcmahon100
a0885d4481 Merge remote-tracking branch 'origin/staging' into curriculum/JSONAndAJAX
:ting with '#' will be ignored, and an empty message aborts
:
aad]
dad
2015-10-06 22:34:20 +01:00
Quincy Larson
c27e5bf6c4 start adding clementine challenge 2015-10-05 21:57:15 -07:00
Berkeley Martinez
8c48626f03 Add certification page 2015-10-05 15:55:50 -07:00
benmcmahon100
da09a7b650 Brought in line with staging and added spoofigator! 2015-10-05 23:42:30 +01:00
Berkeley Martinez
72e0595ca6 add uri code storage 2015-09-30 22:32:31 -07:00
Berkeley Martinez
5de6837959 Merge pull request #3548 from FreeCodeCamp/converge-bonfires
refactor all Bonfire tests to use assert and have friendly messages
2015-09-30 19:47:20 -07:00
Quincy Larson
dca179c2c5 Merge branch 'staging' into converge-bonfires
Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json
2015-09-30 19:06:28 -07:00
Quincy Larson
416a866ec0 add step based challenge to framework 2015-09-30 13:26:06 -07:00
Quincy Larson
03675ef0a6 finish QAing basic and intermediate bonfires 2015-09-30 01:33:07 -07:00
Quincy Larson
31f9b7d707 Merge pull request #3530 from FreeCodeCamp/map-share
add facebook sharing to map on completed challenges
2015-09-28 20:08:06 -07:00
Berkeley Martinez
55de772ade Remove portfolio comment from share 2015-09-28 20:05:22 -07:00
Berkeley Martinez
c7d68932ce Show share button from last completed 2015-09-28 19:47:45 -07:00
Quincy Larson
1ff55374db improve facebook sharing copy 2015-09-28 19:04:44 -07:00
Quincy Larson
91efd5940d add facebook sharing to map on completed challenges
remove twitter share from non-bonfire challenges
2015-09-28 17:35:25 -07:00
Quincy Larson
7900628d2a Merge pull request #3525 from FreeCodeCamp/feature/jobs
intermediate pull
2015-09-28 17:35:13 -07:00
Quincy Larson
27f231e72f refactor tests to show same message when passing and failing 2015-09-27 23:22:06 -07:00
Quincy Larson
51af4e4b0d Merge branch 'google-cdns' into remove-angular
Conflicts:
	server/boot/user.js
	server/views/account/show.jade
	server/views/account/signin.jade
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-09-23 09:56:01 -07:00
Berkeley Martinez
a34bcc2266 fix (hack) override history object with original 2015-09-21 12:54:33 -07:00
Berkeley Martinez
e579cbd778 update to react-router 1.0.0-rc1 2015-09-21 12:54:33 -07:00
Berkeley Martinez
39fdd637d5 fix load fonts through css
attempt to cache font files and load after dom init
resulted in a visible jitter when fonts transitioned.
2015-09-21 12:16:10 -07:00
Arsen Melikyan
8424fef76f adds a switch case to highlight bonfires' code in GitHub issues 2015-09-19 15:58:58 +04:00
Berkeley Martinez
723b490932 load lato font after dom ready 2015-09-17 09:57:27 -07:00
Berkeley Martinez
e63e05c1b6 fix typeof comparison should be to string 2015-09-17 00:18:43 -07:00
Berkeley Martinez
1418669757 remove unnecessary doc ready 2015-09-17 00:08:08 -07:00
Arsen Melikyan
829257194d removes the checkbox and improves a condition 2015-09-15 20:27:36 +04:00
Berkeley Martinez
6d2c5a4f5f Merge pull request #3294 from bugron/fix/11-lines
fixes 'only 11 lines' issue
2015-09-15 00:35:06 -07:00