Quincy Larson
|
66d4ffba32
|
update modal
|
2015-06-11 15:46:41 -07:00 |
Quincy Larson
|
1e8d58068c
|
add LinkedIn easy route
|
2015-06-11 15:34:06 -07:00 |
Quincy Larson
|
d56cee1f72
|
update challenge map and news nav
|
2015-06-11 15:01:21 -07:00 |
terakilobyte
|
f7bb14803e
|
Update field guides to display properly. Correct models on user object.
|
2015-06-11 16:19:44 -04:00 |
terakilobyte
|
0aa83f1bb9
|
Remove mongoose style lookup from fieldguide.js. Update user model.
|
2015-06-11 15:33:38 -04:00 |
terakilobyte
|
0b1c23207d
|
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
|
2015-06-11 15:18:45 -04:00 |
terakilobyte
|
3115ba6404
|
update tests
|
2015-06-11 15:18:37 -04:00 |
Berkeley Martinez
|
0d32cf701f
|
fix find instance or currentInstance
|
2015-06-11 12:17:53 -07:00 |
Quincy Larson
|
b3fb1d492d
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-11 11:39:20 -07:00 |
Berkeley Martinez
|
fe5cbec117
|
add pull in user image on signup when available
|
2015-06-11 11:38:08 -07:00 |
Quincy Larson
|
5fb89cb091
|
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-11 11:16:31 -07:00 |
Quincy Larson
|
4d8ab0a915
|
fix conflicting id
|
2015-06-11 10:36:47 -07:00 |
Berkeley Martinez
|
af902799b1
|
add acl controls to models
|
2015-06-10 23:59:42 -07:00 |
Quincy Larson
|
e190aacd9b
|
update pair programming challenge text
|
2015-06-10 23:45:03 -07:00 |
Quincy Larson
|
53fe6a1b62
|
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
|
2015-06-10 23:30:34 -07:00 |
Quincy Larson
|
52840884e6
|
fix 883
|
2015-06-10 23:13:33 -07:00 |
Quincy Larson
|
a87757b35c
|
fix #888
|
2015-06-10 23:06:44 -07:00 |
Quincy Larson
|
243f4cd2ec
|
update twitch page and add new cities
|
2015-06-10 23:04:43 -07:00 |
Quincy Larson
|
d2ea02e60a
|
Merge pull request #878 from ahmednaguib/naguib-782
issue 782
|
2015-06-10 22:52:03 -07:00 |
Berkeley Martinez
|
147f1d1d37
|
fix user.exists returns an object with property exists
|
2015-06-10 17:21:57 -07:00 |
Berkeley Martinez
|
f3b1b5ca0d
|
remove misc console.logs
|
2015-06-10 17:14:48 -07:00 |
Berkeley Martinez
|
84f2168769
|
fix remove stray profile reference
fix findOne queries should have where filter
|
2015-06-10 17:12:21 -07:00 |
Berkeley Martinez
|
d01a48a8c3
|
Allow debug to be set at runtime for gulp
|
2015-06-10 17:11:56 -07:00 |
Berkeley Martinez
|
9f5ace03dc
|
fix acls access for user exists remote method
|
2015-06-10 17:11:32 -07:00 |
Berkeley Martinez
|
bdb7d40548
|
fix usernames should be saved lowercased
|
2015-06-10 15:22:57 -07:00 |
Berkeley Martinez
|
996c3e7816
|
fix make email optional
|
2015-06-10 15:12:48 -07:00 |
Berkeley Martinez
|
cd38a2d88e
|
fix user local signin
|
2015-06-09 17:22:14 -07:00 |
Berkeley Martinez
|
c5d3b4a041
|
move get emails script to seed
|
2015-06-09 16:49:03 -07:00 |
Berkeley Martinez
|
a8494b29da
|
add user signup through loopback
|
2015-06-09 16:45:14 -07:00 |
Berkeley Martinez
|
39d57db782
|
add explorer in dev
|
2015-06-09 16:45:14 -07:00 |
Berkeley Martinez
|
2e5f250ba8
|
remove hpp
loopback is protected against hpp attack by default
|
2015-06-09 16:45:14 -07:00 |
Berkeley Martinez
|
b34646dd6b
|
remove passport file
remove unneeded comments
|
2015-06-09 16:45:14 -07:00 |
Berkeley Martinez
|
68da1f1c68
|
optionally add email field if available
|
2015-06-09 16:43:32 -07:00 |
ahmednaguib
|
b7e7eb692f
|
add alert message for outdated video
|
2015-06-09 23:43:58 +02:00 |
ahmednaguib
|
8e7a333520
|
add link for slack channel
|
2015-06-09 23:42:33 +02:00 |
terakilobyte
|
5ec532f3d9
|
Remove debug statements from story.js and clean up one linting error. Rename href in navbar from news to stories to unify API names.
|
2015-06-09 16:57:23 -04:00 |
terakilobyte
|
25e500a457
|
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
|
2015-06-09 16:49:10 -04:00 |
Quincy Larson
|
61486c2d7c
|
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 |
terakilobyte
|
870c80d72d
|
Alter variable names in testing loop to avoid common collisions. Bump file version to force browser fetch.
|
2015-06-09 16:46:41 -04:00 |
Quincy Larson
|
ccc440fb4f
|
replace _id with id
|
2015-06-09 13:30:57 -07:00 |
Quincy Larson
|
c338b25a77
|
Merge branch 'ekojsalim-master't push origin master:
|
2015-06-09 13:04:26 -07:00 |
Quincy Larson
|
1a2a610520
|
Merge branch 'master' of https://github.com/ekojsalim/freecodecamp into ekojsalim-master
|
2015-06-09 13:04:21 -07:00 |
Quincy Larson
|
26eb488ded
|
fix #873
|
2015-06-09 12:58:50 -07:00 |
Quincy Larson
|
f33269d2b9
|
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
seed_data/challenges/basic-html5-and-css.json
|
2015-06-09 12:56:22 -07:00 |
Quincy Larson
|
6ffdbb7b8a
|
Merge pull request #872 from treece/treece-864
Fixed regexp on both ul and li opening tags
|
2015-06-09 12:54:30 -07:00 |
Quincy Larson
|
5eee9b7ac3
|
fix #867
|
2015-06-09 12:53:08 -07:00 |
Quincy Larson
|
4de23ac8ac
|
close #874
|
2015-06-09 12:51:19 -07:00 |
Charles Treece
|
6b46c097be
|
Changed regexp to Quincy's normal method
|
2015-06-09 03:22:30 -04:00 |
Quincy Larson
|
56df2f37db
|
fix #870
|
2015-06-08 22:37:07 -07:00 |
Quincy Larson
|
528344f0ca
|
update cities
|
2015-06-08 22:31:46 -07:00 |