 gaba
|
da7f39c9e9
|
Merge branch 'master' into ban-user
|
2016-12-02 07:58:46 -08:00 |
|
|
gaba
|
15eb946f00
|
Trying to get the Dialog up.
|
2016-12-01 13:05:10 -08:00 |
|
|
Belen Curcio
|
c38c556002
|
merge
|
2016-11-30 20:11:22 -03:00 |
|
|
gaba
|
2dd3359cb6
|
Merge branch 'master' into ban-user
|
2016-11-30 13:31:59 -08:00 |
|
|
Belen Curcio
|
6e7926ab30
|
Working bios
|
2016-11-30 12:41:50 -03:00 |
|
|
Belen Curcio
|
2607c608f5
|
D
ividing userData from userAuth
|
2016-11-30 10:20:03 -03:00 |
|
|
Belen Curcio
|
bd704bf2ce
|
User Settings, Restricted User, Banned User, Bio and User actions and Reducers
|
2016-11-30 08:42:25 -03:00 |
|
|
David Jay
|
b7ffd31ea4
|
Cleaning up tests after merge.
|
2016-11-29 16:37:39 -05:00 |
|
|
gaba
|
27eb341fa8
|
Fix users and comments as a merge was weird before.
|
2016-11-29 10:56:44 -08:00 |
|
|
gaba
|
a375bf638a
|
Merge branch 'master' into ban-user
|
2016-11-29 10:42:46 -08:00 |
|
|
Wyatt Johnson
|
3448752f6f
|
Added asset settings + improved tests for routes
|
2016-11-28 17:13:11 -07:00 |
|
|
Wyatt Johnson
|
ab46c020d9
|
Added asset searching
|
2016-11-28 15:01:13 -07:00 |
|
|
gaba
|
1ec7435ef4
|
Merge branch 'master' into ban-user
|
2016-11-28 11:41:31 -08:00 |
|
|
Wyatt Johnson
|
b0f01cf00f
|
Initial commit of asset queuing (#97)
* Initial commit of asset queuing
* Addresssing comments
|
2016-11-28 13:29:39 -05:00 |
|
|
Wyatt Johnson
|
d34cbc7870
|
Moved the action insert into the action model.
|
2016-11-28 10:19:33 -07:00 |
|
|
Wyatt Johnson
|
9d8968f1ce
|
Corrected action upserting functionality
|
2016-11-28 10:14:13 -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 |
|