Commit Graph

482 Commits (e93901a57fdf53f68734ba00ee10f1d09808e9fa)

Author SHA1 Message Date
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
benmcmahon100 38a73e392f Deactivated scroll locking 2015-08-22 00:59:21 +01:00
Berkeley Martinez f5a652e046 fix remove console log 2015-08-21 16:09:50 -07:00
Berkeley Martinez 0f3acc629c fix profile linking 2015-08-21 16:09:07 -07:00
Quincy Larson adc50b764d uncomment social linking 2015-08-20 19:52:48 -07:00
Berkeley Martinez d14eb0dbaa fix 401 account/delete if not auth 2015-08-20 09:40:29 -07:00
Berkeley Martinez 16dcc6a39e remove old password reset route 2015-08-20 08:55:26 -07:00
Berkeley Martinez eaca9ef495 refactor challenges
now only queries challenges on start up
use default scheduler for array manipulation
2015-08-20 08:55:25 -07:00
Berkeley Martinez 6d1d8a3e28 fix current streak
always start from today
2015-08-20 08:55:25 -07:00
Berkeley Martinez da61161765 fix longest streak 2015-08-20 08:55:25 -07:00
benmcmahon100 d52a2d8da0 Attempt to sorta fix the scroll locker resetting 2015-08-20 16:48:46 +01:00
Berkeley Martinez f3410a3a95 remove debug statement 2015-08-19 13:48:04 -07:00
Berkeley Martinez 03b837cf51 fix break current stream 2015-08-19 13:46:26 -07:00
benmcmahon100 f4eecc9127 Merge pull request #1993 from kurzninja/patch-4
Potentially missing ;
2015-08-19 21:30:09 +01:00
Berkeley Martinez 576315abdc fix current streak,
longest streak still broken
2015-08-19 13:05:53 -07:00
Berkeley Martinez 6a11b30bc2 serve static assets before sessions 2015-08-19 11:28:44 -07:00
Quincy Larson 04c9d376f7 remove server maintenance warnings 2015-08-18 23:48:31 -07:00
Berkeley Martinez 679d1383a5 up timeout 2015-08-18 23:14:27 -07:00
Berkeley Martinez bc84a25ff9 add message on emergency maintenance 2015-08-18 23:07:06 -07:00
Berkeley Martinez 01a45e0635 fix cannot find challengeId of undefined 2015-08-18 20:02:39 -07:00
Berkeley Martinez 0128829d11 fix cannot read property id of user durring upvote
post to upvote without auth returns 401
2015-08-18 19:48:42 -07:00
Berkeley Martinez 8c803281f6 fix cannot read property match of undefined 2015-08-18 19:23:43 -07:00
Berkeley Martinez 0367a19ffc add bower_components to pathsOfNOReturnTo 2015-08-18 16:00:27 -07:00
Berkeley Martinez f59d029336 fix check if url sent with story 2015-08-18 15:56:23 -07:00
Berkeley Martinez 478ed3c522 fix should toString userId's 2015-08-18 15:23:26 -07:00
Quincy Larson 9dcf284825 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-18 15:21:38 -07:00
Quincy Larson b4ae49f915 add challenge type to beginning of challenge in map 2015-08-18 15:21:26 -07:00
Quincy Larson b667a776ea add bonfires back in but now they are only visible to their creators 2015-08-18 14:53:18 -07:00
Berkeley Martinez b2f4e520cb fix account link failure now flashes 2015-08-18 14:48:52 -07:00
Berkeley Martinez d9d44ae509 fix redirect link failures to /account 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
Berkeley Martinez 112972cfdd fix enables email login 2015-08-18 01:32:37 -07: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
Berkeley Martinez 495aac8233 remove part of note about email signin 2015-08-17 19:21:57 -07:00
patlanders 973c9e67c2 Change "opps!" to "Oops!" in error-handlers.js 2015-08-17 13:20:15 -04:00
benmcmahon100 fe102bdf51 fix #1840 2015-08-17 14:04:12 +01:00
Ionut Costica c39189eab0 Fix for Issue #1828 2015-08-17 15:04:53 +03:00
Quincy Larson 07dd58d65b update copy and remove bug warnings 2015-08-16 23:43:57 -07:00
Quincy Larson 2634569e60 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 19:34:44 -07:00
Quincy Larson 21cbbc2233 Update warning messages 2015-08-16 19:34:23 -07:00
benmcmahon100 3be62c5374 Fixed the script issues 2015-08-17 00:04:20 +01:00
Berkeley Martinez a228e61353 hot fix test for function first 2015-08-16 15:27:06 -07:00
Quincy Larson a0c9906e69 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 14:20:19 -07:00
Berkeley Martinez f475a4e1ad fix map, should not mutate challenges 2015-08-16 14:20:00 -07:00
Quincy Larson dfc557f9e6 move refactor all non-jquery JS to load last 2015-08-16 13:49:43 -07:00
Quincy Larson de10e77645 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 11:02:33 -07:00
Quincy Larson 454e59939e add wiki to tops of pages 2015-08-16 11:02:22 -07:00
Berkeley Martinez de7eb3d440 fix email password reset 2015-08-16 09:54:59 -07:00
Quincy Larson 98df14bf86 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 08:03:48 -07:00
Quincy Larson b05d9338f4 update csp 2015-08-16 08:03:34 -07:00
Berkeley Martinez b828a1e825 fix google should be oauth2 2015-08-16 06:51:47 -07:00
Quincy Larson d14514f661 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-08-16 06:07:49 -07:00
Quincy Larson 58d86ce2dc hide linking buttons 2015-08-16 06:07:38 -07:00
Berkeley Martinez 7d22c2a073 fix should check completed challenge old _id 2015-08-16 05:52:25 -07:00
Quincy Larson edb58f6890 add authentication back in 2015-08-16 05:47:13 -07:00
Quincy Larson 63d506c14f remove beta warning 2015-08-16 04:06:01 -07:00
Quincy Larson 23003e8724 add new congratulatory quotes 2015-08-16 04:05:49 -07:00
Quincy Larson e3404c6564 minor improvements and bug fixes to stories 2015-08-15 14:13:21 -07:00
Berkeley Martinez bcdda9c62a fix unexpected syntax error on map 2015-08-14 18:25:34 -07:00
Berkeley Martinez 42303dc6aa fix progressBar not showing
reduce function needs initial seed

closes #1753
2015-08-14 18:24:14 -07:00
Quincy Larson ed0d38a474 make more progress QAing challenges 2015-08-13 17:20:52 -07:00