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
Michael Q Larson
ef27fda537
remove references to meeting from announcements and notification modal
2015-03-28 10:14:49 -07: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
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
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
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
Michael Q Larson
c69d919d46
Merge branch 'master' into ux-improvements
2015-03-27 10:28:31 -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
Michael Q Larson
d64b5c5718
add progress bar to nonprofit project proposal wizard
2015-03-25 15:25:19 -07:00
Michael Q Larson
7d4c30c502
start adding progress bar to nonprofit onboarding
2015-03-25 14:18:27 -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
A. Drake
b3174eeadf
If no links are present, the template does not show the helpful links header.
2015-03-24 01:24:06 -04:00
A. Drake
4dae91ff41
formatting done.
2015-03-23 23:57:44 -04:00
A. Drake
dbc57dd0cb
links iterated through on the page. TODO formatting and adding more data.
2015-03-23 23:55:24 -04:00
A. Drake
0bf68fea5f
Links from database are being passed to the view. TODO create links
2015-03-23 23:20:19 -04:00
Michael Q Larson
1facf532f3
start building the nonprofit project flow
2015-03-23 10:42:59 -07:00
Michael Q Larson
f9523beb29
update copy on show all bonfires button
2015-03-22 18:22:07 -07:00
Michael Q Larson
6e0da758e0
finish wiring in buttons and hotkeys
2015-03-22 01:38:04 -07:00
Michael Q Larson
9633a2dbe0
get hotkey working in showVideo
2015-03-22 01:28:40 -07:00
Michael Q Larson
d0a40dc202
fix intermittent variable declaration error in camper news view
2015-03-22 01:16:02 -07:00
Michael Q Larson
91edf73965
start building zipline views and controller
2015-03-21 17:23:13 -07:00
Michael Q Larson
2dbd59b7f1
Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
...
Conflicts:
controllers/resources.js
views/account/show.jade
views/coursewares/showHTML.jade
views/coursewares/showJS.jade
views/partials/bonfires.jade
2015-03-21 16:36:35 -07:00
Michael Q Larson
88e261ccf6
Merge branch 'master' into ux-improvements
...
Conflicts:
controllers/resources.js
controllers/user.js
seed_data/challenges.json
views/account/show.jade
views/coursewares/showHTML.jade
views/coursewares/showJS.jade
views/partials/bonfires.jade
2015-03-21 16:25:39 -07:00
Nathan Leniz
fa0462da4c
point courseware reference in navbar to challenges
2015-03-21 18:58:14 +09:00
Nathan Leniz
cf44287d7a
resolve merge conflict in navbar
2015-03-21 18:53:15 +09:00
Nathan Leniz
ac511982a4
User facing challenge mentions now point to coursewares, remove completed view from account/show
2015-03-21 18:42:19 +09:00
Nathan Leniz
6ad7c22313
Working on codemirror display issue in html coursewares
2015-03-21 16:34:06 +09:00
Nathan Leniz
a2e2e6bfa2
Improve profile view on devices, store name in completedCoursewares for display in account/show
2015-03-21 15:44:18 +09:00
Nathan Leniz
be91849d20
coursewares properly push timestamps to user object
2015-03-21 14:28:00 +09:00
Nathan Leniz
cd89ad1574
Change complete-challenge to completed-challenge
2015-03-21 13:50:31 +09:00
Nathan Leniz
5e095e8832
Merge remote-tracking branch 'upstream/master' into ux-improvements
2015-03-21 13:42:08 +09:00
Nathan Leniz
b35f5ca59c
Working on unifying coursewares view and logic
2015-03-21 13:42:02 +09:00
Nathan Leniz
6aaebbf34e
Clean up show all bonfires modal
2015-03-21 12:12:48 +09:00
Nathan Leniz
d48da59aa7
resolve merge conflicts
2015-03-21 12:03:16 +09:00
Michael Q Larson
2f240655a2
update announcements and move announcement modal back into learn-to-code view
2015-03-19 23:24:44 -07:00
Michael Q Larson
29a0701e71
update link to nodeschool challenges video
2015-03-19 23:09:50 -07:00
Michael Q Larson
56d7301d25
refactor announcement modal and add nodeschool-challenges
2015-03-19 22:34:36 -07:00
Michael Q Larson
76d0467758
update nonprofit project guide copy
2015-03-18 16:01:21 -07:00
Michael Q Larson
af19ea4308
improve upvoting UX and start adding angular validation to submit-story view
2015-03-18 00:40:18 -07:00
jameskopacz
5ff3aabdd5
stories js var double output fix
...
challengeName and user are in stories/index.jade and stories/show.jade.
show.jade is only called from index.jade. This fix removes double output of those vars.
2015-03-17 21:18:55 -05:00
Michael Q Larson
a52ab83757
half way done with the new upvoting ux
2015-03-17 17:57:50 -07:00
Michael Q Larson
f1dcb4c373
start fixing the password in scope potential corner case security issue
2015-03-17 17:22:58 -07:00
Quincy Larson
f144e84310
Merge pull request #214 from MrRenter/upvoteFix
...
Upvote fix
2015-03-17 15:48:15 -07:00
