Michael Q Larson
|
acea52dc1b
|
make further improvements to wiki and start new show view for nonprofits
|
2015-03-30 18:02:50 -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
|
106a10edca
|
add a modal that allows one to scroll through all wiki pages
|
2015-03-30 15:55:00 -07:00 |
Michael Q Larson
|
23a3e235a7
|
Update routes for all static pages and leave redirects for existing routes to get to new wiki routes
|
2015-03-30 15:15:07 -07:00 |
Michael Q Larson
|
660214f87e
|
able to seed and view wiki content
|
2015-03-30 13:48:54 -07:00 |
Berkeley Martinez
|
b6da312547
|
Merge pull request #278 from FreeCodeCamp/accessability
Fix some bugs, improver perf of show all bonfires/challenges and add buttons to challenge views
|
2015-03-30 13:12:56 -07:00 |
Michael Q Larson
|
83a9223dcc
|
respond to @BerkeleyTrue feedback
|
2015-03-30 13:09:24 -07:00 |
Michael Q Larson
|
97c978dc7c
|
Make Basejumps show up properly and get their github routes persisting in the database.
|
2015-03-29 18:13:04 -07:00 |
Michael Q Larson
|
aa01a896a5
|
Add show all challenges button to all challenge views and refactor bonfire to use same modal and button ids
|
2015-03-29 17:09:12 -07:00 |
Michael Q Larson
|
f0ae47dcf2
|
Fix show all bonfire bug where it wouldn't show while unauthenticated; add sr-only class to completed bonfires
|
2015-03-29 16:47:49 -07:00 |
Michael Q Larson
|
9fe8bf2fbf
|
remove references to codepen from codebase
|
2015-03-29 15:14:13 -07:00 |
Michael Q Larson
|
43810ccb0c
|
Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements
Conflicts:
controllers/bonfire.js
controllers/resources.js
public/js/main.js
views/bonfire/show.jade
|
2015-03-29 14:44:49 -07:00 |
Michael Q Larson
|
f20743428a
|
Merge branch 'jameskopacz-patch-259' of https://github.com/jameskopacz/freecodecamp into ux-improvements
|
2015-03-29 14:19:12 -07:00 |
Michael Q Larson
|
70f812dc78
|
Merge branch 'master' into ux-improvements
Conflicts:
controllers/bonfire.js
controllers/resources.js
views/bonfire/show.jade
|
2015-03-29 13:05:39 -07:00 |
Nathan Leniz
|
b00c5be45c
|
View improvement for users that are not logged in or happen to hit control enter
|
2015-03-29 21:41:59 +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 |
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 |
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 |
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 |