terakilobyte
|
4473b6b620
|
Merge remote-tracking branch 'upstream/master'
|
2015-04-19 21:07:47 -04:00 |
|
terakilobyte
|
083cd7d710
|
Fix json for get 'started with ziplines' ziplines
|
2015-04-19 21:07:38 -04:00 |
Quincy Larson
|
b115b81204
|
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
|
2015-04-19 18:07:29 -07:00 |
|
Quincy Larson
|
993819cf3b
|
mirror the zipline view and the showVideo view
|
2015-04-19 18:07:19 -07:00 |
|
terakilobyte
|
f396dad029
|
Fix upvote button on initial story submission.
|
2015-04-19 20:28:56 -04:00 |
|
terakilobyte
|
1596cdfedb
|
Merge remote-tracking branch 'upstream/master'
|
2015-04-19 19:45:25 -04:00 |
|
Quincy Larson
|
d9ddda6cb9
|
record videos and add to courseware.json and field-guide.json
|
2015-04-19 16:28:11 -07:00 |
|
Quincy Larson
|
102550fd0b
|
update the symmetric difference challenge
|
2015-04-19 01:18:56 -07:00 |
|
terakilobyte
|
2736dfe638
|
Merge remote-tracking branch 'origin/master'
|
2015-04-19 03:37:25 -04:00 |
|
terakilobyte
|
08bf658897
|
Harden camper news and don't expose user object. Upvoting still needs to be looked at.
|
2015-04-19 03:36:54 -04:00 |
|
Quincy Larson
|
9fa12b8ad4
|
Merge pull request #310 from FreeCodeCamp/QuincyLarson-README-patch
Update README.md with better contribution directions. Point to AirBnB st...
|
2015-04-18 22:38:56 -07:00 |
|
Quincy Larson
|
2c53a17521
|
fix an issue with checklists
|
2015-04-18 21:09:24 -07:00 |
|
Quincy Larson
|
07becee1c4
|
further improvements to courseware.json
|
2015-04-18 17:25:59 -07:00 |
|
Michael Q Larson
|
d078c6768a
|
make the all field guides view conform to the challengeMap aesthetic
|
2015-04-18 17:19:06 -07:00 |
|
Michael Q Larson
|
d31031f92c
|
continue updating coursewares and field-guide
|
2015-04-18 17:10:18 -07:00 |
|
Michael Q Larson
|
b671ab9817
|
move checkboxes to the left of the showVideo view
|
2015-04-18 15:00:31 -07:00 |
|
Michael Q Larson
|
aacfb86e1f
|
improve challenge map look
|
2015-04-18 14:17:10 -07:00 |
|
Michael Q Larson
|
6106dfa31a
|
presist checklist states in localStorage
|
2015-04-18 01:29:10 -07:00 |
|
Michael Q Larson
|
e39dfee5ef
|
getting closer with the persisted checklists
|
2015-04-17 23:51:57 -07:00 |
|
Michael Q Larson
|
11ece0fda1
|
fix courseware.json typo and make it easier to click checkboxes
|
2015-04-17 22:37:13 -07:00 |
|
Michael Q Larson
|
13d5b64427
|
fix a bug in the account view
|
2015-04-17 19:28:07 -07:00 |
|
Michael Q Larson
|
7bc2232c01
|
remove api.js as it is a vestigial hackathon starter controller
|
2015-04-17 19:27:44 -07:00 |
|
Michael Q Larson
|
8fbfae9554
|
further updates to basejumps
|
2015-04-17 19:05:18 -07:00 |
|
Michael Q Larson
|
b1e92ddcd8
|
comment out non-twitter auth options and add pintrest clone to basejumps
|
2015-04-17 19:04:46 -07:00 |
|
Michael Q Larson
|
fe31271ee5
|
add ziplines, basejumps and node school challenges to coursewares.json
|
2015-04-17 17:38:30 -07:00 |
|
Nathan
|
5bdcc15e05
|
Enable search
|
2015-04-17 20:32:46 -04:00 |
|
Michael Q Larson
|
820fbb99c7
|
finalize the way zipline and basejump challenges will look, fix twitch view
|
2015-04-17 15:01:08 -07:00 |
|
Michael Q Larson
|
061d86b074
|
simplify the camper news UX
|
2015-04-17 13:09:35 -07:00 |
|
Michael Q Larson
|
d10011acc3
|
Pull some useful changes from aborted branch
|
2015-04-16 23:54:26 -07:00 |
|
Michael Q Larson
|
d2fae63310
|
fix a few minor issues post merge
|
2015-04-16 23:16:55 -07:00 |
|
Quincy Larson
|
d7f862eea5
|
Merge pull request #320 from FreeCodeCamp/ux-improvements
Pulling Ux improvements the rest of the way into master
|
2015-04-16 23:07:10 -07:00 |
|
Quincy Larson
|
8afb3e1199
|
Merge pull request #319 from terakilobyte/ux-improvements
Ux improvements
|
2015-04-16 23:00:58 -07:00 |
|
terakilobyte
|
020e1999a3
|
Merge remote-tracking branch 'upstream/master' into ux-improvements
|
2015-04-17 01:52:04 -04:00 |
|
terakilobyte
|
04d9856d4f
|
Remove vomit route.
|
2015-04-17 01:48:06 -04:00 |
|
terakilobyte
|
dbc99eafb6
|
Update chat link and copy.
|
2015-04-17 01:41:01 -04:00 |
|
terakilobyte
|
edefd90268
|
Fix bug where users could get points for completing the same challenge.
|
2015-04-17 01:40:32 -04:00 |
|
terakilobyte
|
f1acc59f82
|
Fix bug where users could get points for completing the same challenge.
|
2015-04-17 01:39:55 -04:00 |
|
terakilobyte
|
b9372b9af6
|
Resolve merge conflicts using Webstorm's merge integration tool. v2
|
2015-04-17 00:39:48 -04:00 |
|
terakilobyte
|
b49d2fd343
|
Resolve merge conflicts using Webstorm's merge integration tool.
|
2015-04-17 00:11:13 -04:00 |
|
terakilobyte
|
56e45ba9dd
|
resolve merge conflict
|
2015-04-15 18:35:06 -04:00 |
|
terakilobyte
|
8119858a24
|
Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show
|
2015-04-15 18:20:40 -04:00 |
|
terakilobyte
|
6341b1158b
|
add eslint task to gulp to let us know how we need to write better code
|
2015-04-15 18:20:20 -04:00 |
|
Quincy Larson
|
d20aa1cf3c
|
Merge pull request #288 from FreeCodeCamp/resources
Create Wiki controller to replace our static pages
|
2015-04-15 01:03:19 -07:00 |
|
Michael Q Larson
|
993db11189
|
Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show
|
2015-04-15 00:12:27 -07:00 |
|
Michael Q Larson
|
22be5b90ba
|
more improvements to the basejump challenges
|
2015-04-15 00:12:16 -07:00 |
|
Quincy Larson
|
27f80eddea
|
Update README.md with better contribution directions. Point to AirBnB styleguide. (closes #307)
|
2015-04-15 00:07:14 -07:00 |
|
Quincy Larson
|
255a6b48be
|
Merge pull request #298 from aldraco/coursewaresErr
Issue #277 Fix- coursewares chai-jquery test issue
|
2015-04-14 23:43:38 -07:00 |
|
terakilobyte
|
3748356079
|
Update user migration script to ensure user model validity.
|
2015-04-15 00:53:36 -04:00 |
|
Michael Q Larson
|
ddb88643e0
|
Nathan's updates to the userMigration script'
|
2015-04-14 21:19:05 -07:00 |
|
Michael Q Larson
|
e033f224bc
|
fix challenge map to redirect to nonprofits
|
2015-04-14 20:20:38 -07:00 |