 Wyatt Johnson
|
9d8968f1ce
|
Corrected action upserting functionality
|
2016-11-28 10:14:13 -07:00 |
|
|
Riley Davis
|
28520bfd4a
|
add get comments by user endpoint. refactor getStream to be functional programming
|
2016-11-23 17:14:51 -07:00 |
|
|
Wyatt Johnson
|
325162cb3e
|
Added authorization pieces + test functions
|
2016-11-22 17:15:14 -07:00 |
|
|
gaba
|
822e13914a
|
Fix changeStatus
|
2016-11-22 14:52:43 -08:00 |
|
|
gaba
|
f7c4e8bf24
|
Merge branch 'master' into ban-user
|
2016-11-22 09:35:06 -08:00 |
|
|
gaba
|
7dc7df2601
|
Merge branch 'master' into ban-user
|
2016-11-22 09:30:52 -08:00 |
|
|
gaba
|
0a8ab759b5
|
Move into setStatus and other actions when banned and unbanned.
|
2016-11-21 17:01:36 -08:00 |
|
|
David Jay
|
1931c85d67
|
Merging
|
2016-11-21 19:23:29 -05:00 |
|
|
David Jay
|
9afc9640ee
|
Merge branch 'user-integration' of https://github.com/coralproject/talk into notification-room
|
2016-11-21 16:26:22 -05:00 |
|
|
gaba
|
8355f441e3
|
When banning without commentid.
|
2016-11-21 12:42:14 -08:00 |
|
|
gaba
|
3337e95a6c
|
Move the change status of the user to a ban the user func.
|
2016-11-21 12:18:19 -08:00 |
|
|
Wyatt Johnson
|
7893d425ef
|
Updated tests
|
2016-11-21 12:42:42 -07:00 |
|
|
Wyatt Johnson
|
7cc311bd81
|
Added wordlist, cleaned comments api
|
2016-11-21 11:18:52 -07:00 |
|
|
David Jay
|
7a6dfbcb4a
|
Returning public user info.
|
2016-11-18 14:13:42 -05:00 |
|
|
gaba
|
e2813d2cc7
|
Missing SET_STATUS
|
2016-11-18 10:21:03 -08:00 |
|
|
gaba
|
8bf8ed08aa
|
Merge branch 'master' into ban-user
|
2016-11-18 09:36:38 -08:00 |
|
|
gaba
|
2f6e0b04d6
|
Adds status to the user.
|
2016-11-18 09:29:14 -08:00 |
|
|
Wyatt Johnson
|
fe4f8bc464
|
Replaced query with aggregation
|
2016-11-18 09:56:52 -07:00 |
|
|
David Jay
|
95cd83c09e
|
Merge branch 'master' of https://github.com/coralproject/talk into notification-room
|
2016-11-18 11:55:47 -05:00 |
|
|
David Jay
|
2e6700e490
|
Addressing but where flag increases like count.
|
2016-11-18 11:50:12 -05:00 |
|
|
Belen Curcio
|
6e75b03d6b
|
Empty states, validation and removing availability
|
2016-11-18 07:41:46 -03:00 |
|
|
Belen Curcio
|
b1824cdc01
|
Merge branch 'master' of github.com:coralproject/talk into passport
|
2016-11-18 06:08:23 -03:00 |
|
|
Wyatt Johnson
|
c4ba18778c
|
Merge branch 'master' into passport
|
2016-11-17 14:26:52 -07:00 |
|
|
gaba
|
81f770fb05
|
Merge branch 'passport' into ban-user
|
2016-11-17 11:55:20 -08:00 |
|
|
Riley Davis
|
145bb68681
|
don't use this keyword in UserService methods
|
2016-11-17 11:31:27 -07:00 |
|
|
Riley Davis
|
869d871157
|
always return 204 for password reset. update swagger file
|
2016-11-17 11:25:19 -07:00 |
|
|
Riley Davis
|
04decde9fc
|
throw instead of log errors. rename for clarity
|
2016-11-17 10:31:46 -07:00 |
|
|
Wyatt Johnson
|
e809c479e1
|
Added all method on user service
|
2016-11-17 10:30:34 -07:00 |
|
|
Wyatt Johnson
|
73c681b98f
|
Added missing service function
|
2016-11-17 10:20:29 -07:00 |
|
|
Belen Curcio
|
da1539422b
|
Using User Interface
|
2016-11-17 11:18:17 -03:00 |
|
|
Riley Davis
|
6e932b840e
|
merge master. load reset password template from a view
|
2016-11-16 15:32:44 -07:00 |
|
|
gaba
|
bc3f9bb0b4
|
Adds status to the user and tests on setStatus.
|
2016-11-16 12:44:34 -08:00 |
|
|
riley
|
81299e8add
|
better error reporting. log when env variable is unset
|
2016-11-16 13:20:07 -07:00 |
|
|
Wyatt Johnson
|
d5a1c0a174
|
Merge branch 'master' into user-documentation
|
2016-11-16 12:01:14 -07:00 |
|
|
Wyatt Johnson
|
0755a0783e
|
Added documentation to the user model + abstracted it
|
2016-11-16 11:59:32 -07:00 |
|
|
riley
|
fa8036ac3f
|
merge master
|
2016-11-16 11:58:01 -07:00 |
|
|
Riley Davis
|
7df7279323
|
endpoints for updating password
|
2016-11-16 11:49:58 -07:00 |
|
|
Riley Davis
|
c86e1e8d47
|
create and decode jwt
|
2016-11-15 16:21:25 -07:00 |
|
|
gaba
|
4137758bfd
|
Merge branch 'master' into comment-box
|
2016-11-15 15:21:08 -08:00 |
|
|
riley
|
e5898118e1
|
Merged master into password-reset
|
2016-11-15 13:11:02 -07:00 |
|
|
David Jay
|
a886123c62
|
Merge branch 'like-button' of https://github.com/coralproject/talk into like-button
|
2016-11-15 14:39:58 -05:00 |
|
|
Riley Davis
|
eabce87f99
|
Merged branch master into password-reset
|
2016-11-15 12:34:43 -07:00 |
|
|
David Jay
|
fbf27a9d75
|
Resolving 500 error when deleting an action.
|
2016-11-15 14:24:38 -05:00 |
|
|
Riley Davis
|
7ecd60fbf7
|
Merge branch 'master' into like-button
|
2016-11-15 12:15:13 -07:00 |
|
|
gaba
|
08d672ed46
|
Changes model and add admin.
|
2016-11-15 10:11:37 -08:00 |
|
|
Belen Curcio
|
366e072280
|
Linting Issues
|
2016-11-14 23:35:33 -03:00 |
|
|
Dan Zajdband
|
9c41adf224
|
Added enum check for the user model
|
2016-11-14 16:44:21 -05:00 |
|
|
David Jay
|
6fa40c3f9b
|
Adding model tests for assets.
|
2016-11-14 15:11:25 -05:00 |
|
|
Riley Davis
|
7d9b24c5b9
|
start adding mail settings
|
2016-11-14 10:44:33 -07:00 |
|
|
David Jay
|
4bea5e5914
|
Adding route to delete actions.
|
2016-11-11 17:06:29 -05:00 |
|