Commit Graph

485 Commits (d9e9af0a0f05c57f4f398fd69c7ea313de8f3392)

Author SHA1 Message Date
Berkeley Martinez a4dd9667ca Fix typos 2016-02-10 10:09:40 -08:00
Berkeley Martinez dc27f53ecb Commit uses challengeMap 2016-02-10 10:09:40 -08:00
Berkeley Martinez 76cfbdf752 challenge/user router now works with challengeMap 2016-02-10 10:09:40 -08:00
Hallaathrad fe422d2300 adding wiki as detached and integrating into .less folder 2016-02-09 23:26:59 -05:00
JelenaBarinova 631c7ea319 Timestamps are converted to start of the days and filtered to b unique before calculating streaks 2016-02-09 13:48:20 -08:00
Quincy Larson a55488e5eb create shop with link to tshirt 2016-02-05 21:06:30 -08:00
Akira Laine a7bd7e3729 worked on video challenge superblock
fixed rebase merge errors

Fix videos route

Fix hikes broken true/false

fixed component name
2016-02-04 17:20:34 +11:00
Logan Tegman e2ac51f166 Fix lint errors 2016-02-01 14:16:27 -08:00
Rex Schrader 01cc33ec67 Merge pull request #6630 from FreeCodeCamp/fix/is-cheater
Fix isCheater/isLocked not blocking certs
2016-01-31 21:10:49 -08:00
Berkeley Martinez c7fc9dc99f Merge pull request #6601 from SaintPeter/feature/challenge-checksum
Add Checksum to Challenges for Google Analytics
2016-01-31 17:36:16 -08:00
Berkeley Martinez 3e989de2a3 Fix isCheater/isLocked not blocking certs 2016-01-31 16:35:15 -08:00
Berkeley Martinez 76c75b8e48 Merge pull request #6333 from LenaBarinova/fix/streak-seems-broken-because-of-timezone
Fixed streak and completion dates to be showed using users timezone
2016-01-30 11:47:38 -08:00
Berkeley Martinez ab2a4d8f6f [HOTFIX] remove twit
twit is not depending on it's dependencies.
2016-01-30 10:53:52 -08:00
SaintPeter f2e61ea0ac Add Checksum to Challenges for Google Analytics 2016-01-30 09:02:22 -08:00
JelenaBarinova 2df86ceb91 Not signed user case fixed 2016-01-27 22:14:19 -08:00
JelenaBarinova 29f93df1bb Getting users timezone on client side and passing it to server side within POST (on challenge complete), showing users stats with users timezone
After CR
2016-01-26 15:09:47 -08:00
Berkeley Martinez 6b6232fb3e Block certs from cheaters 2016-01-24 15:48:00 -08:00
Berkeley Martinez 8a0341a7ac Fix zipline/basejump completed endpoint
This PR refactors and normalizes the endpoint and the ajax request.
Some weird bug keeps popping up on the server, but keymetrics has
decided to take a crap and not actually report back with the error
I don't know what exactly is causing it.

Normally I don't like fixing something I can't see, but I'm getting
a constant flood of emails because of some obscure bug here.

We removed the `completedWith` functionality a while back so that
was removed from this endpoint and the ajax call.

To test, verify that you can complete both a zipline/basejump.

Also show last updated date since it is possible a user might want
to update links
2016-01-23 20:34:49 -08:00
Berkeley Martinez 49987c57e8 Merge pull request #5941 from FreeCodeCamp/fix/update-babel-to-6.0
Update babel to 6.0
2016-01-19 13:02:25 -08:00
Berkeley Martinez e3ec56ef40 Fix show profile page challenge filtering to use challengeType 2016-01-18 17:33:06 -08:00
Berkeley Martinez 12b2be9db8 Remove old terminology 2016-01-15 06:08:54 -08:00
Berkeley Martinez 50b1e61e70 Fix change challenge model to POJO 2016-01-15 04:51:11 -08:00
Berkeley Martinez 47c930d7f4 Add new help rooms and logic 2016-01-15 04:51:11 -08:00
Berkeley Martinez 918ea56e33 Add stats to about page 2016-01-15 04:49:46 -08:00
Quincy Larson 1e5f3dc61c refactor map view and make buttons and text bigger 2016-01-15 04:49:46 -08:00
Berkeley Martinez 95dfd2304e Use specific layout for map aside
Links in aside change parent location
2016-01-15 04:46:20 -08:00
Berkeley Martinez 776b5156c1 Redirect user to current challenge 2016-01-15 04:46:20 -08:00
Berkeley Martinez 98b54e9fc7 Load map aside as an iframe on every page 2016-01-15 04:46:20 -08:00
Berkeley Martinez a2fd213a86 Ad minimal map for iframe loading 2016-01-15 04:46:20 -08:00
Quincy Larson 6d23e4931b update privacy, terms, code of conduct and add links to about page 2016-01-15 04:46:20 -08:00
Quincy Larson dad1e1638e surface isRequired in view 2016-01-15 04:40:55 -08:00
Berkeley Martinez cc1c2e6aa1 Add map aside to challenges 2016-01-15 04:40:55 -08:00
Berkeley Martinez 5798537bcb Abstract map and showChallenge logic
Rename some legacy naming conventions
Remove logic for waypoint,basejumps, etc...
2016-01-15 04:39:45 -08:00
Berkeley Martinez 0c54adfb07 Add map aside to challenges 2016-01-15 04:14:38 -08:00
Berkeley Martinez b03e71e7c0 Abstract map and showChallenge logic
Rename some legacy naming conventions
Remove logic for waypoint,basejumps, etc...
2016-01-15 04:14:38 -08:00
Quincy Larson 09b4f1caa2 Update nonprofits structure and remove old directory 2016-01-15 04:10:16 -08:00
Berkeley Martinez 52fd15284a Add banning to camper news 2016-01-12 22:07:19 -08:00
Quincy Larson 4c9026a354 Merge pull request #6071 from FreeCodeCamp/feature/add-data-science-cert
Add data vis certification
2016-01-11 18:24:39 -06:00
Berkeley Martinez ee0c5c90e0 Fix cert type switch 2016-01-11 16:23:24 -08:00
Berkeley Martinez a7f04cdc11 Add data vis certification 2016-01-11 15:58:37 -08:00
Logan Tegman 4341a3eee2 Update babel to 6.0 2016-01-10 20:21:15 -08:00
Berkeley Martinez 05d34c8e15 Merge pull request #5848 from FreeCodeCamp/fix/hiding-text
Update certificate error messages
2016-01-10 18:22:01 -08:00
Berkeley Martinez 7f60af8a3f Fix change links to about 2016-01-10 18:20:13 -08:00
Berkeley Martinez 17eaed7f99 Fix lint errors 2016-01-10 18:20:13 -08:00
Quincy Larson 93ebfd4515 update labs, update about page, create TOS and privacy view 2016-01-10 18:20:13 -08:00
Quincy Larson 6233f66411 update GitHub in use error message copy 2016-01-10 18:20:13 -08:00
Quincy Larson 9b4b6a241c fix typo 2016-01-10 19:41:50 -06:00
Berkeley Martinez 2962ee52a0 Remove old debug 2016-01-09 23:23:04 -08:00
Berkeley Martinez e51127ffc7 feature completed challenge can also return json 2016-01-09 20:08:01 -08:00
Berkeley Martinez ea574d721e Make document titles work 2016-01-04 14:27:22 -08:00
Berkeley Martinez cec243b032 [add] Upgrade ThunderCats react 2016-01-04 14:27:22 -08:00
Quincy Larson 3743b8ddf6 update certificate error messages 2016-01-04 02:01:38 -06:00
SaintPeter 9a18344dad Fix display of Checkpoints
Tested Locally\n\nFixes 5782
2016-01-02 17:43:48 -08:00
SaintPeter b32afaea1b Fix Merge Issue 2016-01-01 21:10:08 -08:00
Quincy Larson 035b6027de make challenges new and extend to 60 days 2016-01-01 00:34:05 -06:00
Berkeley Martinez 6e7cadb2e7 Load random commit if none specified 2015-12-29 17:40:20 -08:00
Berkeley Martinez 2a48f42313 Fix user redirect on email account creation 2015-12-29 11:57:12 -08:00
Berkeley Martinez d745e3a254 Add ability to change message type in middleware util 2015-12-29 11:43:06 -08:00
Berkeley Martinez 8c3e14cd8e Fix commit redirect for non signed user.
Now users will be directed to sign in page and on sign in
will have pledge completed
2015-12-29 10:57:35 -08:00
Berkeley Martinez 83e43dbbff Merge pull request #5134 from LenaBarinova/fix/streak-still-seems-to-be-broken
Current and Longest streak calculation fixed
2015-12-18 21:00:47 -08:00
JelenaBarinova 6c7d2685fd Current and Longest streak calculation fixed
Minor refactoring and unit tests added

After CR: user-stats file moved to util folder, export keywork added to exported functions, new line added at the end of gulp file

User-stats-test file moved to replicate user-stats path in test folder
2015-12-15 18:33:04 -05:00
Berkeley Martinez 0fca3bad7f Filter out coming soon from challenge blocks 2015-12-14 13:19:30 -08:00
Berkeley Martinez 355c8214e6 Filter out coming soon challenges from returnNextChallenge 2015-12-14 13:19:30 -08:00
Berkeley Martinez 2d559efdee Fix for block order 2015-12-14 13:19:30 -08:00
Berkeley Martinez 38d71abda6 Fix block stream not being set correctly 2015-12-14 13:19:30 -08:00
Berkeley Martinez 107f42e8f4 Change verify cert to back end 2015-12-14 13:19:30 -08:00
Berkeley Martinez 2aa611047f Change full stack to back end 2015-12-14 13:19:30 -08:00
Berkeley Martinez 0c4a780f54 Add logic to allow coming soon challenge to be seen and not used 2015-12-14 13:19:30 -08:00
Berkeley Martinez fe8fe0ff0d Fix lint error 2015-12-14 13:19:30 -08:00
Berkeley Martinez 5c2bdd974a Add isComingSoon flag 2015-12-14 13:19:30 -08:00
Berkeley Martinez 9848aa8eab Remove console.log 2015-12-14 13:19:30 -08:00
Berkeley Martinez f7f587194d Add superblock ordering 2015-12-14 13:19:30 -08:00
Berkeley Martinez c736a5c00f Use regex to hide hikes
Capitalize super block
2015-12-14 13:19:30 -08:00
Berkeley Martinez 8175fbb297 Remove console.log 2015-12-14 13:19:30 -08:00
Berkeley Martinez 8037ff9038 Remove hikes from map view 2015-12-14 13:19:30 -08:00
Berkeley Martinez ab043d1c6d Change map logic and view 2015-12-14 13:19:30 -08:00
Quincy Larson 6d911a70cd Merge pull request #5119 from FreeCodeCamp/fix/commit-directory
Add new cert goals to commit
2015-12-11 18:46:48 -06:00
Logan Tegman 74d5c0bf00 Merge pull request #5127 from Zenith-One/fix/forgot-password-error-message
Fix/forgot password error message
2015-12-10 15:13:33 -08:00
Craig Burton 275e3ad9ea Fixed error message displayed when an error occurs while requesting a password reset 2015-12-10 09:21:21 -05:00
Harsha a443c2bd37 Go to next step is enabled after user finishes step challenge 2015-12-09 20:25:43 -05:00
Berkeley Martinez 1464adc350 Add new cert goals to backend 2015-12-09 14:19:37 -08:00
Berkeley Martinez 579c569d15 Fix remove bonfire save endpoint
fix completedChallenge saving solution
remove unnecessary code.
2015-12-08 16:17:45 -08:00
Berkeley Martinez 9774638d43 Fix waypoints are not bonfires 2015-12-08 16:17:45 -08:00
Berkeley Martinez 5270f0e42e Make tag replacement more robust
Some challenges are incorrectly saved with no solutions
2015-12-08 11:30:47 -08:00
Quincy Larson 7e9d65675a Merge branch 'master' into remove-angular
Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-12-04 18:49:38 -06:00
Quincy Larson d4fde2a98a create the fastest site on the internet 2015-11-25 10:23:35 -06:00
Quincy Larson 9d08c1702e update navbar, remove footer, create links page 2015-11-19 22:46:36 -08:00
Arsen Melikyan b88caa80be fix rss feed content type 2015-11-15 11:39:30 +04:00
Rex Schrader 3b5b9dfcdc Merge pull request #4242 from bugron/feature/rss-feed-for-camper-news
Adds RSS feed for Camper News
2015-11-13 11:28:41 -08:00
Arsen Melikyan e2a4f5468d adds rss feed for camper news 2015-11-11 22:27:48 +04:00
Berkeley Martinez d095fd5d90 Feature in dev mode always pull from disk 2015-11-09 17:27:56 -08:00
Berkeley Martinez 5dbfbfcf57 Add head/tail to challenge spec.
Lint EVERYTHING!
2015-11-06 17:32:01 -08:00
Aniruddh Agarwal 81c74f4209 Merge pull request #4136 from FreeCodeCamp/greenkeeper-update-all
Update all dependencies 🌴
2015-11-06 10:53:26 +08:00
Berkeley Martinez 00fcdc9bc1 Fix news username query should be case insensitive 2015-11-05 17:06:13 -08:00
Berkeley Martinez 085fc2fe72 Fix loopback explorer issue 2015-11-05 16:41:19 -08:00
Arsen Melikyan 8a5e12f6f3 find users news by typing their usernames in search box and fix FF CSS issue 2015-11-04 22:28:13 +04:00
Berkeley Martinez 1f16b0f79a Fix story search not closing connections
Now story search will use loopbacks mongo connection
to do search
2015-11-04 00:15:45 -08:00
Berkeley Martinez a8b61f566d Merge pull request #4156 from FreeCodeCamp/testimonial-update
Testimonial update and landing page improvement
2015-11-03 22:15:18 -08:00
Berkeley Martinez 692f577eb3 Fix linting issue 2015-11-03 21:54:42 -08:00
Quincy Larson 9995a73e6d update testimonials 2015-11-03 17:58:47 -08:00
Quincy Larson e064416dca Update testimonial views 2015-11-03 17:39:02 -08:00
Quincy Larson 672b529f31 update challenge completion rate 2015-11-03 17:38:27 -08:00
Berkeley Martinez 406a821c34 Merge pull request #4094 from ltegman/fix/half-way-club-link-3934
Fix Half Way Club Gitter Link
2015-11-03 13:06:51 -08:00
Logan Tegman 0e4f85e8ea Merge pull request #4120 from terakilobyte/newFlags
Adds 'new' callouts to top level challenge blocks
2015-11-02 20:47:24 -08:00
Logan Tegman a028059aaf Fix Half Way Club Gitter Link
Closes #3934
2015-11-02 18:20:44 -08:00
Arsen Melikyan 10ca69391f fixes incorrect collection name in getStories function 2015-11-02 20:25:06 +04:00
Quincy Larson d77d78a3b2 Merge branch 'staging' into feature/jobs
Conflicts:
	seed/jobs.json
2015-11-02 00:07:16 -08:00
Berkeley Martinez 0546e34abf Merge pull request #4124 from FreeCodeCamp/update-titles
update page titles and sitemap
2015-11-01 23:35:07 -08:00
terakilobyte 502f7f83ba Adds 'new' callouts to top level challenge block links if all challenges
all challenges in that block are new.
2015-11-01 19:36:28 -08:00
terakilobyte c30f7f0795 Addresses lint errors 2015-11-01 17:45:01 -08:00
terakilobyte af30d4d56e Implements a 'releasedOn' flag and marks challenges less than 30 days old as NEW https://www.dropbox.com/s/43un2a908ldktpl/Screenshot%202015-11-01%2017.06.53.png 2015-11-01 17:26:26 -08:00
Berkeley Martinez e5449ee65f Fix linting errors 2015-10-31 22:13:18 -07:00
Quincy Larson 0fefac1090 update page titles and sitemap 2015-10-31 02:59:09 -07:00
Quincy Larson 03f189b260 add reddit add and update landing map stats 2015-10-30 23:39:11 -07:00
Berkeley Martinez c354ddf1ac Expose jobs board to production. 2015-10-29 17:55:42 -07:00
Berkeley Martinez 25464c4f9e Add jobs behind beta flag 2015-10-29 17:10:28 -07:00
Berkeley Martinez c6c1d7dac4 Add redirects 2015-10-29 17:10:28 -07:00
Quincy Larson fd7451e233 Merge branch 'staging' into improve-early-challenges
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/bootstrap.json
	seed/challenges/html5-and-css.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-10-28 02:20:09 -07:00
Quincy Larson 63f56c94b8 continue refining waypoints 2015-10-27 17:49:58 -07:00
Quincy Larson 4910118366 update flash message 2015-10-23 14:12:09 -07:00
Quincy Larson 1db84d1455 Merge branch 'staging' into feature/block-camper-news 2015-10-23 14:08:19 -07:00
Berkeley Martinez c13bdb65e5 Add camper must be auth with gitub to post to news 2015-10-21 22:05:27 -07:00
Berkeley Martinez 43155e85e8 Merge pull request #3848 from FreeCodeCamp/feature/nonprofit-ids
Feature/nonprofit ids
2015-10-21 21:41:48 -07:00
Quincy Larson 1dc0e868b9 update nonprofit files and delete old commented code 2015-10-21 21:30:47 -07:00
Quincy Larson 7f2f3885f8 change blog links to lead to medium subdomain 2015-10-19 21:55:29 -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
Quincy Larson f30239fb6c add time estimates to challenge blocks on map 2015-10-12 22:56:10 -07:00
Berkeley Martinez 7b444b15dc Update loopback, ThunderCats and RxJS.
closes #2929
2015-10-11 17:35:46 -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 0cb8c6c58b hot patch/ prevent dedube 2015-10-07 06:05:33 -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
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
Berkeley Martinez 241ca8097d Fix link errors in randomAPIs 2015-10-07 00:28:42 -07:00
Berkeley Martinez 7a4f5d752c Move labs/stories to server/resources
Rename stories to testimonials to reduce confusion
2015-10-07 00:26:17 -07:00
Quincy Larson 4f26d82f65 add labs and stories 2015-10-07 00:17:18 -07:00
Quincy Larson 56673d429d add labs 2015-10-07 00:17:17 -07:00
Berkeley Martinez 92b9f71532 Add commit directory page 2015-10-07 00:05:26 -07:00
Berkeley Martinez f5966c0959 Change redirect and text on commit 2015-10-06 23:33:17 -07:00
Berkeley Martinez 44fd85dff8 Add ability to filter beta challenges from production
This PR adds the ability to test out challenges in beta
without fear that they will leak to production servers.

In development all challenges will display.

In production all challenges marked 'isBeta' will be filtered out
except in the case the environmental variable `BETA` is set ture,
in which case all challenges will display.
2015-10-06 22:37:08 -07:00
Berkeley Martinez 2864f607cc Add on certification, complete goal and stop pledge 2015-10-06 21:12:40 -07:00
Berkeley Martinez 49c06b266e Add complete commit endpoint 2015-10-06 19:51:19 -07:00
Berkeley Martinez 0b716c0057 Add stop commit functionality 2015-10-06 19:51:19 -07:00
Berkeley Martinez d132978df9 Add ability to edit commit 2015-10-06 19:51:19 -07:00