 David Jay
|
90ef16e111
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-09 15:51:13 -05:00 |
|
|
David Jay
|
922fc630a4
|
Addressing null item_id in user flagging.
|
2016-12-09 15:27:11 -05:00 |
|
|
David Jay
|
bf01543a88
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-09 13:26:48 -05:00 |
|
|
Belen Curcio
|
b33713e723
|
Changes to master
|
2016-12-09 12:32:59 -03:00 |
|
|
Belen Curcio
|
e4df3bcafc
|
Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings
|
2016-12-09 12:28:40 -03:00 |
|
|
Dan Zajdband
|
09ba535d68
|
Merge with master
|
2016-12-09 10:17:55 -05:00 |
|
|
Wyatt Johnson
|
3d35183e67
|
Add payload filtering and status_history updates
|
2016-12-08 15:56:52 -05:00 |
|
|
David Jay
|
7f24153b4e
|
Revert "Removing extra commas and collapsing actions into an object in the backend."
This reverts commit 9d28577e9b.
|
2016-12-08 15:47:47 -05:00 |
|
|
David Jay
|
9d28577e9b
|
Removing extra commas and collapsing actions into an object in the backend.
|
2016-12-08 15:27:49 -05:00 |
|
|
Dan Zajdband
|
fb392422ea
|
Added textarea for closed message on admin
|
2016-12-08 12:44:02 -05:00 |
|
|
David Jay
|
713cc0cda1
|
Posting actions to comment and user endpoints.
|
2016-12-07 19:01:02 -05:00 |
|
|
Belen Curcio
|
ebf9754287
|
merge
|
2016-12-07 10:58:30 -03:00 |
|
|
David Jay
|
507e89a301
|
Merge branch 'master' of github.com:coralproject/talk into flag-username
|
2016-12-06 18:19:45 -05:00 |
|
|
David Jay
|
13d0dec84a
|
Updating postAction to send reasons to backend.
|
2016-12-06 18:11:44 -05:00 |
|
|
Wyatt Johnson
|
b82f130454
|
Adds a new closedAt time for assets to prevent new comments from being
created
|
2016-12-06 14:44:15 -05:00 |
|
|
Belen Curcio
|
8036b4790d
|
Notifications
|
2016-12-06 14:09:36 -03:00 |
|
|
Wyatt Johnson
|
5298efa89f
|
Adjusting based on PR feedback, added public filter to settings object
|
2016-12-06 11:55:15 -05:00 |
|
|
Wyatt Johnson
|
d2d4640eee
|
Merge branch 'master' into status-history
|
2016-12-06 11:08:00 -05:00 |
|
|
Dan Zajdband
|
62cc489c21
|
Merge with master
|
2016-12-05 16:39:00 -05:00 |
|
|
Wyatt Johnson
|
d1cdc48e85
|
Merge branch 'master' into status-history
|
2016-12-05 14:20:31 -05:00 |
|
|
Wyatt Johnson
|
40fd5984a9
|
Added "assigned_by" to status changes
|
2016-12-05 13:49:12 -05:00 |
|
|
Wyatt Johnson
|
2f7f0249b2
|
Added status changing + history
- Status's for comments is now an array of objects
|
2016-12-05 11:28:27 -05:00 |
|
|
Dan Zajdband
|
4be258c63d
|
Added simple open/close flow
|
2016-12-05 11:02:39 -05:00 |
|
|
David Jay
|
8dad90104d
|
Returning infobox data in stream.
|
2016-12-02 12:26:31 -05:00 |
|
|
Belen Curcio
|
c38c556002
|
merge
|
2016-11-30 20:11:22 -03: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 |
|
|
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 |
|
|
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 |
|
|
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 |
|
|
David Jay
|
7a6dfbcb4a
|
Returning public user info.
|
2016-11-18 14:13:42 -05: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 |
|
|
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 |
|