gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,975 Commits 9 Branches 0 Tags
2bfcc9c46d7a400addedec7f6e00a889ee95b2af
Commit Graph

444 Commits

Author SHA1 Message Date
Quincy Larson
79a396b9c8 Merge branch 'patch-1' of https://github.com/tcyrus/FreeCodeCamp into staging 
Conflicts:
	server/views/coursewares/showHTML.jade
 2015-09-04 14:26:56 -07:00
Timothy Cyrus
f8a5d0d7ba Update showHTML.jade 
Fix Styling issue with Submit Button based on showJS.jade and showBonfire.jade
 2015-09-04 14:11:52 -04:00
Ammar Dodin
fcaf10ca9d Updated README.md 
The author of this file typed "this files" where I believe he meant to type "these".
 2015-09-02 00:38:15 -07:00
jameskopacz
70b769cc6a Updated text to "Submit and go to next challenge" 2015-08-30 23:49:21 -05:00
jameskopacz
c036e00f53 Updated challenge submit button text from "Submit" to "Go to my next challenge" 2015-08-30 23:17:22 -05:00
Berkeley Martinez
150676fa6e Merge pull request #2870 from QuincyLarson/add-quotes 
Add quotes
 2015-08-30 19:37:10 -07:00
Florian Beijers
a3b54e3e63 added a space in the sr-only span for challenge map so it doesn't run together and fixed a typo on the getting started page 2015-08-30 12:43:27 +02:00
Quincy Larson
8392dcf156 Merge branch 'staging' into add-quotes 2015-08-29 22:32:44 -07:00
Quincy Larson
23c1e71823 update quotes 2015-08-29 22:31:46 -07:00
benmcmahon100
71b6e21e77 Added the accessibility fix and added the hack to fix the challenge complete modal 2015-08-30 00:31:07 +01:00
Berkeley Martinez
702dbeceab change Run code button to Run tests 
Changes run button copy

closes #2846
 2015-08-29 09:30:47 -07:00
Berkeley Martinez
16b33ee90a fix some linting issues 2015-08-29 01:48:01 -07:00
Berkeley Martinez
f0b953eb66 fix typo js challenges view 2015-08-29 01:05:07 -07:00
Berkeley Martinez
0dfa11ca99 remove all manifest files from tracking 
add readme explaining empty directory
 2015-08-28 16:39:14 -07:00
Berkeley Martinez
6c48395868 separate main manifest generation from sub manifests 
in dev mode always pull manifest on each request
add manifest build to gulp build task
add react bundle to manifest generation
 2015-08-28 15:56:58 -07:00
Berkeley Martinez
376b58cc15 combine sandbox into commonFramework 
a @benmcmahon suggestion
 2015-08-27 12:37:41 -07:00
Berkeley Martinez
306c441ae7 add revisioning to js/css files to break caching 
This moves the location of javascript files, commonFramework,
iFrameScript, sandbox, plugin, and all the less files.
On gulp or gulp build these files are moved and revisioned.
Places where they are references in jade/html are now removed and
replaced with the use of a helper function `rev`. This function will
take the required file and return a string referencing the revisioned
file. This should alleviate the need for hard refreshing and will break
caches when files change, so fixes for firefox caching issue as well.

NOTE: @benmcmahon @quincylarson, This means files will need to be build
on the server in production before doing a server restart/reload
In production: 'npm run build' To build and revision js/css files

`gulp` and `gulp build` will used in development

npm install also needs to be run in production on initial deploy
 2015-08-26 23:30:33 -07:00
Berkeley Martinez
39f636ae91 add loader to challenge submit 2015-08-26 15:17:38 -07:00
benmcmahon100
7c3f650521 Bump up cFW version number to ensure eveyone is on te latest version 2015-08-26 22:37:54 +01:00
Berkeley Martinez
2c9ed16b7a fix only submit on user click 2015-08-26 13:09:38 -07:00
benmcmahon100
306551848c Update cFW version no 2015-08-26 20:45:50 +01:00
benmcmahon100
a63d6bd00b Fixed my stupid mistake that almost killed the server again 2015-08-26 20:22:29 +01:00
benmcmahon100
695ad48778 Fixed version number 2015-08-26 12:26:01 +01:00
benmcmahon100
9f9f151a6f Re add init run 2015-08-26 12:24:44 +01:00
Berkeley Martinez
cb2bc3c0bd Merge pull request #2705 from QuincyLarson/alt-text 
Alt text
 2015-08-25 22:30:44 -07:00
benmcmahon100
8cdd49e7f1 Fix caching issue with frameworks 2015-08-26 01:13:17 +01:00
Quincy Larson
07f66b61f4 update the completed all challenges message 2015-08-25 15:51:47 -07:00
Berkeley Martinez
851af506b5 Merge pull request #2691 from QuincyLarson/alt-text 
Add more alt text to onboarding page.
 2015-08-25 15:21:44 -07:00
Berkeley Martinez
14d1d1db02 fix left panel jitter jump 2015-08-25 14:49:19 -07:00
benmcmahon100
b1b07a5b9e Fixed major Fudge up with challenges without functions 2015-08-25 22:25:00 +01:00
Quincy Larson
56b18f313b update get-started alt text 2015-08-25 14:23:47 -07:00
Ben McMahon
c913e9bbf7 Merge pull request #2679 from FreeCodeCamp/staging 
update framework to remove merge conflicts
 2015-08-25 19:41:29 +01:00
benmcmahon100
14cc6a7cef Final touch up to the framework before merge 2015-08-25 19:28:13 +01:00
Quincy Larson
50f1705cbc start updating alt text 2015-08-25 08:59:42 -07:00
Quincy Larson
bc1393edac Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into calculator 2015-08-24 19:19:58 -07:00
Quincy Larson
a94c919374 update cost calculator 2015-08-24 19:19:47 -07:00
Ben McMahon
86d7c2f35a Merge pull request #2646 from QuincyLarson/linking 2015-08-25 02:00:04 +01:00
Quincy Larson
fd440916a8 add descriptive message to failed account linking attempt 2015-08-24 17:52:12 -07:00
Berkeley Martinez
15c49ec520 remove unused challenge utils 2015-08-24 16:19:06 -07:00
Berkeley Martinez
67681d41f6 Merge pull request #2487 from bugron/bugron-news_more_btn_fix 
Fixes info buttons' text in Camper News search results
 2015-08-24 11:12:12 -07:00
Berkeley Martinez
4ff9d2ffe1 Merge pull request #2578 from issyl0/fix_github_capitalization 
Consistently capitalize GitHub in the account settings text
 2015-08-24 11:04:24 -07:00
Berkeley Martinez
d5118f489f Merge pull request #2619 from bugron/bugron-lisenting_typo 
Fixes a typo in source code
 2015-08-24 10:57:03 -07:00
Arsen Melikyan
49e3e20555 Fixes a typo in source code 2015-08-24 11:57:14 +04:00
benmcmahon100
1477f56f97 Merge of the frameworks: the desolation of the views 2015-08-23 22:26:02 +01:00
benmcmahon100
ede956e1d6 Merge of the frameworks: an unexpected merge 2015-08-23 21:59:29 +01:00
Isabell Long
d85eded058 Consistently capitalize GitHub in the account settings text 
- Also remove the capital D from Delete in the confirmation line—it's
  not the start of a sentence.
 2015-08-23 13:52:14 +01:00
benmcmahon100
38397fa5f7 Fixed help modal part 3: the modal strikes back 2015-08-22 23:18:10 +01:00
Quincy Larson
73eb6ec2d1 kind of got the modals working - Ben will finish this 2015-08-22 12:10:08 -07:00
Arsen Melikyan
37b4530df2 Fixes info buttons' text in Camper News search results 
In Camper News search results "more info..." buttons' text changes to "more info.more info...". This commit fixes that.
 2015-08-22 17:11:44 +04:00
benmcmahon100
901f1a977d Merge remote-tracking branch 'origin/staging' into staging 2015-08-22 00:59:34 +01:00