Commit Graph

20778 Commits

Author SHA1 Message Date
greasan
dab805174e Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-12 14:08:44 +02:00
greasan
d9e64f842f Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-12 14:08:44 +02:00
Berkeley Martinez
b9b5a649ee fix grab user photo from profile 2015-06-11 21:12:47 -07:00
terakilobyte
52b529fbdf rename generic test file 2015-06-11 23:21:50 -04:00
Quincy Larson
03df5cf492 remove reference to original alumni network 2015-06-11 19:01:31 -07:00
Quincy Larson
7077b18480 fix twitch view 2015-06-11 18:57:22 -07:00
terakilobyte
ae3f253f5b Update index file for gh-pages 2015-06-11 21:28:45 -04:00
terakilobyte
f0604ec9c7 Add istanbul and generate ininital coverage report 2015-06-11 21:21:02 -04:00
terakilobyte
a5092d379d Merge conflicts and clean up lint errors. 2015-06-11 21:08:40 -04:00
terakilobyte
223ea2a393 Merge conflicts and clean up lint errors. 2015-06-11 21:08:16 -04:00
terakilobyte
3017991de5 Finished local user login flow 2015-06-11 21:03:01 -04:00
Berkeley Martinez
c2f408fb56 add blacklist to usernames 2015-06-11 17:04:48 -07:00
Berkeley Martinez
5be6ce7193 add delete user idenity and credentials after profile deletion 2015-06-11 16:57:06 -07:00
terakilobyte
34c3fef7d4 Move api hooks to user.js 2015-06-11 19:11:07 -04:00
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
794c036fd3 Update field guides to display properly. Correct models on user object. 2015-06-11 16:19:44 -04: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
fc7ac3b3ca Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging 2015-06-11 11:16:31 -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
585bd40fc3 fix conflicting id 2015-06-11 10:36:47 -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
greasan
6123f3de5d Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-11 07:28:17 +02: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
greasan
b12fcae985 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-10 07:16:02 +02:00
greasan
701241aac8 Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE 2015-06-10 07:16:02 +02:00
Berkeley Martinez
cd38a2d88e fix user local signin 2015-06-09 17:22:14 -07:00
Berkeley Martinez
9e44deda0c move get emails script to seed 2015-06-09 16:49:03 -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