Commit Graph

59 Commits

Author SHA1 Message Date
David Jay d229d5a96f Updating route to davidjay. 2016-12-09 19:28:19 -05:00
David Jay f5ac576187 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-09 16:33:06 -05:00
David Jay bf01543a88 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-09 13:26:48 -05:00
gaba 1eb204f822 Merge branch 'master' into ban-user 2016-12-08 13:28:12 -10: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
gaba 23c67b4a49 It fix the status change after merging master in. 2016-12-07 16:37:11 -10:00
David Jay 713cc0cda1 Posting actions to comment and user endpoints. 2016-12-07 19:01:02 -05:00
Wyatt Johnson d1cdc48e85 Merge branch 'master' into status-history 2016-12-05 14:20:31 -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
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 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
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
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 0a8ab759b5 Move into setStatus and other actions when banned and unbanned. 2016-11-21 17:01:36 -08: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
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
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 0755a0783e Added documentation to the user model + abstracted it 2016-11-16 11:59:32 -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
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
Belén Curcio 5b74beabd6 Community Section - Search Commenters (#60)
* Table

* úsers api

* Ádding envs and version

* Community Table Added

* Ádding redux

* Adding loading data state

* Community Actions

* Adding Inmutable

* Fetching commenters

* Search commenters

* Linting and translations

* Ádding Sort

* sortBuilder

* pagr

* request per page, pager and mor

* package.json

* new Page actiokn

* éslint

* Changes and cleaner comps

* removed console.log
2016-11-11 11:14:26 -05:00
David Erwin f7249c4016 More linting and commenting 2016-11-10 15:12:56 -05:00
David Erwin d9dc198d46 Moved chained funcitons to multiple lines 2016-11-10 14:52:05 -05:00
Wyatt Johnson c203bf16eb Improved tests and fixed them for new users model 2016-11-09 16:26:23 -07:00
Wyatt Johnson 0646645686 Added new cli interface + users model 2016-11-09 12:51:32 -07:00