Commit Graph

98 Commits

Author SHA1 Message Date
terakilobyte
b73c7eac62 Ensure all bonfires have names in account profile view. Add more aptly names state flag for future user data massaging. 2015-05-05 16:12:53 -04:00
Quincy Larson
19456f2e23 add unsubscribe path 2015-04-30 23:41:40 -07:00
Quincy Larson
12fbc41761 clean up User.js a little 2015-04-24 03:04:53 -07:00
Quincy Larson
bea77c580e redirect user to bonfires if has completed waypoints but not bonfires gulp 2015-04-24 02:02:02 -07:00
terakilobyte
ca812f09ae Update User model for migration 2015-04-22 07:30:40 -04:00
Michael Q Larson
d10011acc3 Pull some useful changes from aborted branch 2015-04-16 23:54:26 -07:00
terakilobyte
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
brndnb
96ac90274d Update User model to make migration easier and complete user migration script 2015-04-13 21:30:08 -04:00
Michael Q Larson
83c14cccc4 continue work on user migration 2015-04-13 01:03:26 -04:00
Michael Q Larson
f85804f270 start writing user migration for challenge completion 2015-04-12 02:07:01 -04:00
Michael Q Larson
9145e959de able to use the api upon button click 2015-04-08 22:42:40 -07:00
Michael Q Larson
7da6f69cd8 start process of moving wiki over to field guide 2015-04-08 17:18:51 -07:00
Michael Q Larson
60fee94574 create infrastructure for advancing through wiki 2015-04-05 16:44:07 -07:00
Michael Q Larson
9d746f7d49 add zipline and basejump to portfolio view, and bonfires with solutions(not yet writing name to bonfireCompletion record on user 2015-04-05 00:01:51 -07:00
Michael Q Larson
36c43cc73a add jQuery to check for broken images and replace them with standard image. Remove gravatar logic. 2015-04-02 13:42:15 -07:00
Michael Q Larson
18a9818200 Merge branch 'master' into nonprofit-show
Conflicts:
	controllers/challenges.js
	controllers/courseware.js
2015-03-30 16:17:04 -07:00
Michael Q Larson
9fe8bf2fbf remove references to codepen from codebase 2015-03-29 15:14:13 -07:00
Nathan Leniz
1fc3cffdbf Add .editorconfig to enforce certain automatic behavior on all editors,
Add logic for ziplines and basejumps completion.
2015-03-29 20:49:56 +09:00
Nathan Leniz
0a07c1e397 Streaks! 2015-03-28 17:38:11 +09:00
Michael Q Larson
f7f7fb39b9 start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds 2015-03-27 14:36:17 -07:00
Nathan Leniz
6ad7c22313 Working on codemirror display issue in html coursewares 2015-03-21 16:34:06 +09:00
Michael Q Larson
fc1d560a89 start refactoring points into progressTimestamps which is essentially points with timestamps 2015-02-22 18:16:26 -08:00
Michael Q Larson
f059bc33d8 add courseware controller and routes 2015-02-01 23:35:27 -08:00
Nathan Leniz
227c938445 massive redesign of user model and the way it interacts with bonfires, successfully returning next bonfire for the user, showing meet bonfire to unauthenticated users 2015-01-27 01:22:02 -05:00
Nathan Leniz
2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Michael Q Larson
c4bd0e4dc3 make bonfire dynamically direct to best subsequent bonfire after completion 2015-01-24 14:29:50 -08:00
Nathan Leniz
a3cf6c3ee2 Persisting completion of bonfire challenges into User model, split routes for bonfires and challenges, refactored class selectors to be challenge type specific 2015-01-24 03:11:01 -05:00
Nathan Leniz
6b4475a5b8 Major refactor of bonfireFramework to differentiate tests, refactor tests in Bonfire schema to remove public/private tests and only have tests, fire modal on successful run of all tests in bonfire/show, added bonfiresHash to User schema, and we should have committed a while ago because there is too much too list 2015-01-24 00:44:08 -05:00
Nathan Leniz
74291d2299 More bonfire improvements. Removed redundant console statements, improved test scraping, comment scraping included, better reset behavior 2015-01-21 23:54:59 -05:00
Nathan Leniz
6ea5f5c895 Preparing for bonfire challenges, create Bonfire model, BonfireCompletion model, update bonfire controller, create initial bonfire seed data 2015-01-21 21:32:13 -05:00
Michael Q Larson
da3ed43b2f update user schema for sparseness and uniqueness on email 2015-01-11 18:24:36 -08:00
Michael Q Larson
bfe75a180d improve the profile layout and start building the public profile view 2015-01-08 18:39:16 -08:00
Michael Q Larson
0ec2e0a759 finished validation on the form fields 2015-01-08 14:56:44 -08:00
Michael Q Larson
41abdae46f further progress on the form and add angular inline 2015-01-05 17:29:37 -08:00
Michael Q Larson
db9622a2e5 public profile accessible and start updating form 2015-01-05 16:38:56 -08:00
Michael Q Larson
aab3b98f5d remove unique requirement from username 2014-12-31 22:59:01 -08:00
Michael Q Larson
c896584b21 quick fix for Twitter auth issue 2014-12-28 17:40:57 -08:00
Michael Q Larson
fcd457b958 email validations work, now on to username validations 2014-12-23 18:20:53 -08:00
Berkeley Martinez
86fcfe8296 Major refactor. Add error handlers everywhere. 2014-12-23 08:48:28 -08:00
Michael Q Larson
1d56a2572a tweaked challenges 2014-12-14 09:01:37 -08:00
Michael Q Larson
177dc900cf made parallel 'points' infrastructure 2014-12-05 20:44:42 -08:00
Michael Q Larson
5c54fddaec Merge branch 'master' into timestamp
Conflicts:
	views/partials/challenges.jade
2014-12-03 23:31:36 -08:00
Michael Q Larson
abcf15074b remove email regex check and restrictions and username for now 2014-12-01 20:49:08 -08:00
Michael Q Larson
ec5fea2eaa start writing validations 2014-11-30 15:25:00 -08:00
Michael Q Larson
21370b83a5 start adding omniauth functionality back in and debugging in production 2014-11-29 22:22:27 -08:00
Michael Q Larson
00c92176cb update the hackathon starter base app 2014-11-29 21:32:59 -08:00
Michael Q Larson
9b9554c47d update the hash to have default values 2014-11-25 11:31:35 -08:00
Michael Q Larson
d973619f4a writes completed challenges to database 2014-11-25 11:17:07 -08:00
Michael Q Larson
1a0acdea82 attempt to modify User.js 2014-11-24 18:48:07 -08:00
Michael Q Larson
06fe5390ba seems to attempt to write timestamp 2014-11-24 18:07:03 -08:00