Nathan Leniz
|
aa2f0e8af8
|
Change completion event to remove duplicate entries if the user states they paired with themselves
|
2015-03-29 21:15:18 +09: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
|
f6df15d5e0
|
merge master in ux-improvements
|
2015-03-29 19:19:19 +09:00 |
Michael Q Larson
|
47d0d8e0da
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
|
2015-03-28 23:43:08 -07:00 |
Quincy Larson
|
1b247f97fc
|
Merge pull request #262 from aldraco/bonfirelinks
Bonfire MDN links - Issue #255
|
2015-03-28 20:34:34 -07:00 |
Geoff Storbeck
|
64ccae938a
|
Posts completed status when challenge 2 is opened for issue #274
|
2015-03-28 17:18:09 -04:00 |
Ashley Drake
|
3e839030ac
|
Fixed async function
|
2015-03-28 14:08:51 -04:00 |
Ashley Drake
|
69533424a3
|
Fixed user.save error callback handler
|
2015-03-28 14:01:31 -04:00 |
Ashley Drake
|
ca3d46a776
|
fixed obvious error handlers
|
2015-03-28 13:53:26 -04:00 |
Michael Q Larson
|
ef27fda537
|
remove references to meeting from announcements and notification modal
|
2015-03-28 10:14:49 -07:00 |
Nathan Leniz
|
65a4c923b2
|
resolve merge conflicts
|
2015-03-29 00:51:09 +09:00 |
Nathan Leniz
|
6a19dc9bda
|
Zipline/Basejump view with controller logic to serve. Will have to change based upon json
|
2015-03-29 00:09:50 +09:00 |
Michael Q Larson
|
672df775a2
|
add a zipline and a base jump to the seed file
|
2015-03-28 07:47:47 -07:00 |
Nathan Leniz
|
9e1a4a1348
|
Streak display in account/show.jade, refactor courseware.json for error handling and linting
|
2015-03-28 23:42:07 +09:00 |
Quincy Larson
|
85a06d5ac2
|
Merge pull request #256 from terakilobyte/ux-improvements
User will now get a point for news/stories interactions
|
2015-03-28 06:12:18 -07:00 |
Nathan Leniz
|
ff94d10aa8
|
resolve merge conflict, favoring upstream
|
2015-03-28 17:41:07 +09:00 |
Nathan Leniz
|
0a07c1e397
|
Streaks!
|
2015-03-28 17:38:11 +09:00 |
Michael Q Larson
|
4d3337df32
|
Merge branch 'ziplines' into ux-improvements
Conflicts:
views/coursewares/showJS.jade
|
2015-03-28 00:24:41 -07:00 |
Michael Q Larson
|
a1ffc88b58
|
add trello and blogger apis back in
|
2015-03-27 23:30:06 -07:00 |
Michael Q Larson
|
e4eb5052c7
|
intermediary work on ziplines
|
2015-03-27 23:15:39 -07:00 |
jameskopacz
|
d3dee00df5
|
Stories reply and upvote redirect to signin when user isn't signed in.
Redirects user back to story after signing in.
|
2015-03-28 00:16:48 -05:00 |
Nathan Leniz
|
338d87424c
|
More work towards unifying timestamps
|
2015-03-28 12:22:08 +09:00 |
Nathan Leniz
|
eb96d2cb02
|
Resolve merge conflict, using ziplines changes
|
2015-03-28 12:16:42 +09:00 |
Nathan Leniz
|
947b034533
|
Resolve merge conflict (spacing issue in app.js)
|
2015-03-28 11:35:14 +09:00 |
Nathan Leniz
|
efd7707ac8
|
Move to Mongoose 4.0, begin implementation of streak
|
2015-03-28 11:34:12 +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 |
Michael Q Larson
|
94b6cae3ec
|
apply Nathan's insights into multistep form'
|
2015-03-27 12:36:21 -07:00 |
Nathan Leniz
|
29e29d5687
|
Merge remote-tracking branch 'upstream/master' into ux-improvements
|
2015-03-28 02:51:52 +09:00 |
Michael Q Larson
|
c69d919d46
|
Merge branch 'master' into ux-improvements
|
2015-03-27 10:28:31 -07:00 |
Michael Q Larson
|
e915e74b8d
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
|
2015-03-27 00:21:00 -07:00 |
Michael Q Larson
|
683498e62a
|
remove calls to trello and blogger, camp counselor photos, and update the notice about Saturday's meeting
|
2015-03-27 00:20:50 -07:00 |
Michael Q Larson
|
e78609171d
|
continue work on the param-based funnel
|
2015-03-26 23:33:52 -07:00 |
jameskopacz
|
c17ff59aef
|
Handle callback errors for user, bonfire, challenges,
courseware, and resources controllers
|
2015-03-26 23:41:06 -05:00 |
Ashley Drake
|
85c996ad2e
|
Added bonfire links for level 3.
|
2015-03-26 10:45:33 -04:00 |
Ashley Drake
|
c053069f23
|
Added bonfire links for level 2.
|
2015-03-26 10:34:59 -04:00 |
Ashley Drake
|
4cad7c1aee
|
fixed comma error for merge.
|
2015-03-26 09:53:22 -04:00 |
Michael Q Larson
|
d64b5c5718
|
add progress bar to nonprofit project proposal wizard
|
2015-03-25 15:25:19 -07:00 |
Michael Q Larson
|
09b812688e
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
Conflicts:
app.js
|
2015-03-25 14:20:34 -07:00 |
Michael Q Larson
|
7d4c30c502
|
start adding progress bar to nonprofit onboarding
|
2015-03-25 14:18:27 -07:00 |
Nathan Leniz
|
25ae3ec909
|
resolve merge conflict in app.js while merging in master, get rid of completed-challenge route
|
2015-03-26 02:32:07 +09:00 |
Nathan Leniz
|
e9c6498cdf
|
Error handling
|
2015-03-26 02:28:04 +09:00 |
Berkeley Martinez
|
8a357dd48a
|
Merge pull request #265 from FreeCodeCamp/errorHandlerUpgrade
Add production error handler
|
2015-03-25 06:56:04 -07:00 |
Michael Q Larson
|
6e4067ee00
|
most views are now in place
|
2015-03-24 22:12:16 -07:00 |
Michael Q Larson
|
d4935d44de
|
add the routes, controller actions and views for the nonprofit wizard
|
2015-03-24 21:46:42 -07:00 |
Michael Q Larson
|
bcec96e427
|
half way done with the initial views and controllers
|
2015-03-24 19:08:26 -07:00 |
Berkeley Martinez
|
6fe7392f8f
|
Merge pull request #267 from storbeck/master
fixed typo for issue #266
|
2015-03-24 13:35:38 -07:00 |
Geoff Storbeck
|
482cc3fa7b
|
fixed typo for issue #266
|
2015-03-24 15:58:17 -04:00 |
Berkeley Martinez
|
2b0cc91754
|
Add production error handler
|
2015-03-24 08:03:59 -07:00 |
Nathan
|
6bcec35ae9
|
Merge pull request #264 from BlueOceanView/master
Add chai-jquery to package.json
|
2015-03-24 19:43:24 +09:00 |
Julie Myers
|
a6ce700831
|
Add chai-jquery to package.json
|
2015-03-24 04:26:39 -06:00 |