Commit Graph

136 Commits

Author SHA1 Message Date
Wyatt Johnson ac17fc2cc6 Added asset settings + improved tests for routes 2016-11-29 10:01:52 -07:00
Wyatt Johnson cf93a48186 Merge branch 'master' into asset-searching 2016-11-28 17:21:06 -07:00
Riley Davis 01e7150dd1 Merge branch 'master' into return-all-settings 2016-11-28 16:26:00 -07:00
David Jay c0a9ea9905 Returning all settings from api/v1/settings. 2016-11-28 18:19:07 -05:00
David Jay 461e80e260 Removing switch in steam endpoint. 2016-11-28 17:43:24 -05:00
David Jay 7cf05bbdca Merge branch 'master' of https://github.com/coralproject/talk into settings-in-stream 2016-11-28 17:25:07 -05:00
Wyatt Johnson ab46c020d9 Added asset searching 2016-11-28 15:01:13 -07:00
David Jay ca5049feeb Adding settings to stream. 2016-11-28 16:52:00 -05:00
Wyatt Johnson 616dd534d9 Moved kue redis connector 2016-11-28 14:05:06 -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 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
Wyatt Johnson 00a8c59c96 Merge branch 'master' into admin 2016-11-22 08:31:21 -07:00
Belen Curcio 8108ca09ef Permissions, views and somestyling 2016-11-22 11:04:56 -03:00
David Jay 06686105c4 Merge branch 'master' into connect-reset-to-fe 2016-11-21 19:06:04 -05:00
Riley Davis a0469301bb add password reset form 2016-11-21 16:32:07 -07:00
David Jay 2b9caf8daf Updating frontend to utilize new action delete endpoint. 2016-11-21 18:00:50 -05:00
Wyatt Johnson a45a5f7296 Updated test to verify middleware is working 2016-11-21 12:49:04 -07: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
Riley Davis 506c514799 request pw reset from ui 2016-11-18 15:09:13 -07: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 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
Belen Curcio da1539422b Using User Interface 2016-11-17 11:18:17 -03:00
Belen Curcio f1320c7f04 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-17 10:54:16 -03:00
Belen Curcio 60c17fc973 Ádding Debouncing for CheckAvailability, Valid Check form and Styling 2016-11-16 20:56:05 -03:00
riley 3c835c1ce5 update from address 2016-11-16 15:59:44 -07:00
Riley Davis 6e932b840e merge master. load reset password template from a view 2016-11-16 15:32:44 -07:00
riley 81299e8add better error reporting. log when env variable is unset 2016-11-16 13:20:07 -07:00
Belen Curcio bd47495b63 User Email Availability check 2016-11-16 16:55:47 -03:00
riley 9942d6eee4 remove reference 2016-11-16 12:09:47 -07:00
Wyatt Johnson d5a1c0a174 Merge branch 'master' into user-documentation 2016-11-16 12:01:14 -07:00
Riley Davis 1795fc8863 remove log 2016-11-16 12:00:44 -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
David Erwin b55d3768ff Merge master into site-wide-comments 2016-11-16 10:43:35 -05:00
Riley Davis c86e1e8d47 create and decode jwt 2016-11-15 16:21:25 -07:00
riley e5898118e1 Merged master into password-reset 2016-11-15 13:11:02 -07:00
David Jay d1ea85468e Addressing issue when deleting actions. 2016-11-15 14:46:08 -05: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
David Jay 44292a81ad Moving init and responsehandler to shared functions, updating all routes to return valid JSON. 2016-11-14 17:09:20 -05:00
David Jay 688fbd0bf6 Sending asset_url to backend and retreiving stream with asset. 2016-11-14 16:40:04 -05:00
Dan Zajdband 223887616d feature(coral-admin): Add users role change 2016-11-14 16:20:56 -05:00