 Quincy Larson
|
08d2b373ac
|
add new jquery challenges and resequence other challenges
|
2015-07-30 22:40:17 -07:00 |
|
|
Quincy Larson
|
d7a4f7c2c2
|
about to start priority and !important waypoints
|
2015-07-28 17:11:51 -07:00 |
|
|
Quincy Larson
|
bee2a843d1
|
fix broken challenges and attempt to make streak more lenient.
|
2015-06-29 16:32:49 -07:00 |
|
|
greasan
|
6a0996b1e0
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-26 19:22:13 +02:00 |
|
|
Quincy Larson
|
b287c14ddd
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
public/js/main_0.0.3.js
seed/challenges/get-set-for-free-code-camp.json
seed/field-guides.json
|
2015-06-26 01:08:40 -07:00 |
|
|
Quincy Larson
|
30c46a43eb
|
update emails and refine sponsor view
|
2015-06-25 23:35:48 -07:00 |
|
|
LumenTeun
|
6b423dfcb1
|
'Slack' to 'Gitter'
|
2015-06-24 10:29:52 -07:00 |
|
|
Quincy Larson
|
9442f5f648
|
Merge branch 'master' into staging
Conflicts:
controllers/resources.js
public/js/main_0.0.2.js
seed/challenges/advanced-bonfires.json
seed/challenges/basic-bonfires.json
seed/challenges/get-set-for-free-code-camp.json
server/views/partials/navbar.jade
|
2015-06-24 07:19:54 -07:00 |
|
|
greasan
|
e3eb642fa8
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-21 12:25:45 +02:00 |
|
|
Quincy Larson
|
3f21574b5e
|
add new chat challenge
|
2015-06-20 18:12:12 -07:00 |
|
|
Quincy Larson
|
c01a0ad9d7
|
fix a bunch of github issues regarding waypoints
|
2015-06-19 18:31:21 -07:00 |
|
|
greasan
|
e5a4c2f8f5
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-15 18:54:20 +02:00 |
|
|
Quincy Larson
|
9589b6abeb
|
add dashedName attributes to JSON
|
2015-06-14 00:55:27 -07:00 |
|
|
greasan
|
b12fcae985
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-10 07:16:02 +02:00 |
|
|
Quincy Larson
|
3b861a5a7f
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
app.js
controllers/fieldGuide.js
controllers/story.js
seed/challenges/basic-html5-and-css.json
seed/challenges/bootstrap.json
seed/field-guides.json
server/views/partials/navbar.jade
views/resources/jobs-form.jade
views/resources/nonprofits-form.jade
views/resources/pmi-acp-agile-project-managers-form.jade
|
2015-06-09 13:48:29 -07:00 |
|
|
greasan
|
3c042cba30
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-05 15:48:38 +02:00 |
|
|
Quincy Larson
|
323ec3d587
|
change _id to id everywhere that seems relevant to loopback
|
2015-06-04 13:20:42 -07:00 |
|
|
Quincy Larson
|
67d35540cd
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-04 12:24:30 -07:00 |
|
|
Berkeley Martinez
|
9032880e27
|
Update seed directory to use loopback
|
2015-06-02 20:32:10 -07:00 |
|