Quincy Larson
|
e322b3b7d6
|
Merge branch 'master' into modals
Conflicts:
seed_data/field-guides.json
views/coursewares/showHTML.jade
|
2015-05-28 17:25:34 -07:00 |
Quincy Larson
|
560e66527b
|
add jobs
|
2015-05-28 16:40:22 -07:00 |
Quincy Larson
|
28d2f700c2
|
add multi-lingual placeholders and update announcement modal
|
2015-05-28 01:32:56 -07:00 |
terakilobyte
|
5f169001f6
|
Change migration middleware to not rely on boolean flag in User model
|
2015-05-25 19:55:18 -04:00 |
Quincy Larson
|
3ee2c29324
|
more challenge-related view and copy improvements
|
2015-05-24 23:51:56 -07:00 |
Quincy Larson
|
27a35e65a7
|
make a ton of small improvements related to github issues
|
2015-05-23 16:48:55 -07:00 |
terakilobyte
|
8783683e50
|
Add MDNlinks to Challenge scheme so they can display on bonfire views.
|
2015-05-20 22:15:28 -04:00 |
terakilobyte
|
16ca72f716
|
Update views for new variable names. Get profile view working. Update challenge map.
|
2015-05-20 21:50:31 -04:00 |
terakilobyte
|
a174a1c630
|
Work on challenge flow from block to block, start refactoring the name courseware to challenges in main.js
|
2015-05-19 22:31:01 -04:00 |
Quincy Larson
|
e659d8c7fa
|
factor challenges and bonfires into smaller json files
|
2015-05-19 01:58:25 -07:00 |
terakilobyte
|
94abc6cf5b
|
Begin restructuring all Coursewares and Bonfires to one unified model and flow.
|
2015-05-16 00:39:43 -04:00 |
Quincy Larson
|
f3646b0aae
|
give points for upvoting, add facebook profile attribute, improve social profile icons
|
2015-05-09 16:23:45 -07:00 |
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
|
332d4f1875
|
refactor story.js mailer and remove some cruft
|
2015-04-09 17:50:10 -07: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
|
29b4e3b970
|
get seed data seeding and improve application submitted button
|
2015-04-08 14:57:08 -07:00 |
Michael Q Larson
|
c02fafa6a9
|
add status, turn hours into integer, create a directory view of all nonprofits
|
2015-04-08 14:36:05 -07:00 |
Michael Q Larson
|
6242f322d7
|
still working on passing original author email all the way down the comment chain
|
2015-04-08 00:30:51 -07:00 |
Michael Q Larson
|
1c7d0b11b6
|
pass the original story URL to all comments for notification email
|
2015-04-07 23:39:52 -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
|
fbeff58477
|
build a functional challenge map and change navbar links
|
2015-04-03 20:05:53 -07:00 |
Michael Q Larson
|
3cff4e9879
|
add logic to add campers to nonprofit projects of interest to them
|
2015-04-02 17:23:45 -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
|
1248cde97f
|
continue work on nonprofit show views
|
2015-04-01 22:31:08 -07:00 |
Michael Q Larson
|
ca404e66e8
|
close to getting all nonprofits to render
|
2015-03-30 20:08:29 -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
|
660214f87e
|
able to seed and view wiki content
|
2015-03-30 13:48:54 -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
|
f6df15d5e0
|
merge master in ux-improvements
|
2015-03-29 19:19:19 +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 |
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
|
ac8487a4fc
|
update basejump, zipline and nonprofit models
|
2015-03-23 08:33:59 -07:00 |
Michael Q Larson
|
91edf73965
|
start building zipline views and controller
|
2015-03-21 17:23:13 -07:00 |
Michael Q Larson
|
0eb15269be
|
create zipline model
|
2015-03-21 16:48:48 -07:00 |
Nathan Leniz
|
6ad7c22313
|
Working on codemirror display issue in html coursewares
|
2015-03-21 16:34:06 +09:00 |
Nathan Leniz
|
d48da59aa7
|
resolve merge conflicts
|
2015-03-21 12:03:16 +09:00 |
Nathan Leniz
|
ac89c44064
|
Merge branch 'master' of https://github.com/freecodecamp/freecodecamp
|
2015-03-09 18:45:21 +09:00 |