Commit Graph

49 Commits

Author SHA1 Message Date
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
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
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
benmcmahon100
f4eecc9127 Merge pull request #1993 from kurzninja/patch-4
Potentially missing ;
2015-08-19 21:30:09 +01:00
Berkeley Martinez
b2f4e520cb fix account link failure now flashes 2015-08-18 14:48:52 -07:00
benmcmahon100
366b9e98a7 Merge remote-tracking branch 'origin/staging' into staging 2015-08-18 19:32:04 +01:00
Quincy Larson
0d0528a743 fix LinkedIn link in footer 2015-08-18 11:22:59 -07:00
benmcmahon100
6de1f49a1f Temp fix for buttons on modals and bonfires exec on load 2015-08-18 19:21:34 +01:00
Brett Guillory
c5d07b9e05 Potentially missing ;
My browser was throwing an error:
```Uncaught SyntaxError: missing ) after argument list```
That pointed to this line in the console as far as I could tell.
If this is a fix, w00t. If not, ignore this.
2015-08-17 22:05:16 -05:00
benmcmahon100
3be62c5374 Fixed the script issues 2015-08-17 00:04:20 +01:00
Quincy Larson
dfc557f9e6 move refactor all non-jquery JS to load last 2015-08-16 13:49:43 -07:00
Quincy Larson
1b7195fbc1 replace RSAP with read-search-ask and replace AWS gifs with Imgur 2015-08-13 00:56:05 -07:00
Quincy Larson
99d0a58049 update the look of onboarding and change RSAP to RSA 2015-08-12 21:24:57 -07:00
Quincy Larson
add87ae801 start simplifying account page 2015-08-10 15:10:38 -07:00
Berkeley Martinez
611098ba09 if user is github cool navbar links to account show page 2015-08-07 18:26:18 -07:00
Berkeley Martinez
a838a4097d fix clicking on image or points always takes you to /account 2015-08-05 19:12:54 -07:00
Quincy Larson
73f0dcf732 make wiki open in new tab 2015-08-04 14:58:24 -07:00
Quincy Larson
0682857236 remove learn link from navbar 2015-08-04 14:40:47 -07:00
Quincy Larson
feab8b508e remove field guide cruft and update all field guide links to wiki 2015-07-31 21:55:49 -07:00
Quincy Larson
439849e9d8 start removing field guide and update nonprofits 2015-07-31 21:13:40 -07:00
Quincy Larson
2547868854 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
Berkeley Martinez
c82b2e3ae6 set and render page title
note this requires changes to thundercats to work
see: thundercatsjs/thundercats-react/issues/3
2015-07-29 10:18:06 -07:00
Quincy Larson
fd3374fca7 about to start priority and !important waypoints 2015-07-28 17:11:51 -07:00
Berkeley Martinez
94ed227aeb add video css 2015-07-23 15:49:03 -07:00
Quincy Larson
10f53bdd49 Merge pull request #1161 from LumenTeun/grammar
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
2015-07-02 13:56:11 -07:00
Berkeley Martinez
580e2e3ebd add redirect for https 2015-07-01 14:35:15 -07:00
LumenTeun
75948c4bc1 Quite a few spelling and grammar fixes 2015-06-30 04:28:43 +02:00
Quincy Larson
7e2d5c91e2 minor ui improvements 2015-06-26 01:28:02 -07:00
Quincy Larson
378f6da221 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	public/js/main_0.0.3.js
	seed/challenges/get-set-for-free-code-camp.json
	seed/field-guides.json
2015-06-26 01:08:40 -07:00
Berkeley Martinez
310bf7f6fb fix navbar should point to /news not /stories 2015-06-25 23:43:02 -07:00
Quincy Larson
6700729658 update emails and refine sponsor view 2015-06-25 23:35:48 -07:00
Berkeley Martinez
82c96ec0ba bump main.js version 2015-06-25 23:20:16 -07:00
Quincy Larson
ce0731df5f Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	server/boot/randomAPIs.js
	server/views/coursewares/showBonfire.jade
	server/views/partials/navbar.jade
2015-06-21 15:53:16 -07:00
Berkeley Martinez
8f445b58f2 fix chat links go to Gitter Room 2015-06-20 23:11:33 -07:00
Quincy Larson
a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson
0621b8c62b Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-16 13:46:37 -07:00
Quincy Larson
2e1babb12d finalize calculator for release 2015-06-16 13:46:24 -07:00
terakilobyte
b0b236821e More inspectlet configuring 2015-06-16 12:30:49 -04:00
terakilobyte
308e539e1e More protocol experimentation 2015-06-16 12:23:49 -04:00
terakilobyte
3546cf4765 Fetch google fonts over https 2015-06-16 12:09:45 -04:00
Quincy Larson
5e3edf5cda Merge branch 'master' into staging 2015-06-14 01:10:51 -07:00
Quincy Larson
43f347bae0 Merge branch 'calculator' into staging
Conflicts:
	app.js
	controllers/resources.js
	seed/field-guides.json
2015-06-14 01:10:48 -07:00
terakilobyte
5ec532f3d9 Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names. 2015-06-09 16:57:23 -04:00
Quincy Larson
61486c2d7c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/fieldGuide.js
	controllers/story.js
	seed/challenges/basic-html5-and-css.json
	seed/challenges/bootstrap.json
	seed/field-guides.json
	server/views/partials/navbar.jade
	views/resources/jobs-form.jade
	views/resources/nonprofits-form.jade
	views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
terakilobyte
8b7bfb23ab Update story api to use stories instead of news 2015-06-05 09:07:46 -04:00
Quincy Larson
b2aafd89e7 flatten user object references throughout controllers and views 2015-06-04 12:54:41 -07:00
Quincy Larson
f6596d2654 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
	app.js
	controllers/challengeMap.js
	controllers/resources.js
	server/views/partials/field-guide.jade
	server/views/partials/github.jade
	server/views/partials/nonprofit-application-progress-bar.jade
	server/views/partials/nonprofits.jade
2015-06-02 13:44:53 -07:00
terakilobyte
d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00