Commit Graph

3586 Commits

Author SHA1 Message Date
Wyatt Johnson 6c13e1c1c9 Added fallback for secret during testing 2016-11-10 17:22:14 -07:00
Wyatt Johnson 6867760099 Initial pass at adding middleware for users 2016-11-10 17:14:33 -07:00
gaba ce2b21b805 Merge branch 'master' into lint-newlines 2016-11-10 15:09:49 -08:00
gaba ce206047f4 Merge branch 'master' into moving-to-queue 2016-11-10 15:03:13 -08:00
gaba 7d5b79c6a0 Moved the moderation queue to its own folder and change the route to /queue/comments/pending 2016-11-10 14:59:56 -08:00
David Jay d7c02b53a7 Addressing formatting errors. 2016-11-10 17:51:39 -05:00
David Erwin 5df5bf65b9 Merge pull request #58 from coralproject/embeds
Add embedding routes and homepage
2016-11-10 17:39:24 -05:00
David Erwin d92295c35a Bit of lint 2016-11-10 17:35:06 -05:00
David Jay ff4e778dde Adding seperate translation files for packages. 2016-11-10 17:34:26 -05:00
David Erwin 75e1f86719 Create embed router 2016-11-10 17:31:59 -05:00
David Erwin 6f7fe6ace7 Add embedding routes and homepage 2016-11-10 17:12:32 -05:00
David Jay 0ce892fe7a Loading settings and modifying commentbox to reflect pre and post-mod behavior. 2016-11-10 17:04:04 -05:00
Riley Davis 8bf6bea5b9 Merge pull request #55 from coralproject/init-on-app-startup
initialize settings in an init file before app accepts requests
2016-11-10 13:34:58 -07:00
David Erwin 7a8cb90ebd Fix port scope bug 2016-11-10 15:28:14 -05:00
David Erwin 95f3b86f3b cleaning up nested objects 2016-11-10 15:24:34 -05:00
David Erwin f7249c4016 More linting and commenting 2016-11-10 15:12:56 -05:00
Riley Davis 677faebf76 adhere to new linting rules 2016-11-10 13:09:23 -07:00
Riley Davis c698ae78a7 initialize settings in an init file before app accepts requests 2016-11-10 13:02:52 -07:00
David Erwin 89398120d5 Remove function keyword 2016-11-10 14:57:57 -05:00
David Erwin d9dc198d46 Moved chained funcitons to multiple lines 2016-11-10 14:52:05 -05:00
Gabriela Rodríguez Berón 26f48196d9 Merge pull request #53 from coralproject/remove-queue-folder
Removes queue folder as we are already working on the moderation queu…
2016-11-10 10:33:22 -08:00
David Erwin fcd62140c6 Merge branch 'master' into remove-queue-folder 2016-11-10 13:27:25 -05:00
David Erwin 72cf149feb Merge pull request #51 from coralproject/reader-flags
Reader flags
2016-11-10 13:26:38 -05:00
David Erwin f4bc5d4e82 Merge and resolve an initial state bug 2016-11-10 13:20:21 -05:00
gaba eb9e8f4713 Removes queue folder as we are already working on the moderation queue in comments. 2016-11-10 09:38:46 -08:00
David Erwin e632632754 Merging and updating tests 2016-11-10 12:16:58 -05:00
David Erwin 49744182f6 Merge pull request #50 from coralproject/auth
Users
2016-11-10 11:46:38 -05:00
David Erwin 822f586888 Merge master and lint 2016-11-10 11:37:14 -05:00
David Erwin 5e76e16b56 Merge pull request #49 from coralproject/actions-working
add(coral-admin): Working actions
2016-11-10 10:55:06 -05:00
David Erwin a234eeb3ba Add json header, update status, and lint 2016-11-10 10:49:55 -05:00
David Erwin 465437b04a Merge branch 'master' into actions-working 2016-11-10 10:26:49 -05:00
David Erwin 499d3470e4 Merge pull request #46 from coralproject/queue
Queue
2016-11-10 10:16:37 -05:00
David Erwin b6a0a99d91 Update method name for clarity 2016-11-10 10:12:47 -05:00
David Erwin 923edc7828 Merge branch 'master' into queue 2016-11-10 10:07:07 -05:00
David Jay 53001eafa3 Fixing linting error. 2016-11-09 22:44:43 -05:00
David Jay b50c22a414 Merge branch 'master' of https://github.com/coralproject/talk into reader-flags 2016-11-09 22:44:12 -05:00
Wyatt Johnson 27896b8e42 Fixed tests for new users model 2016-11-09 16:33:19 -07:00
David Jay 6ef0d3ef41 Posting flags correctly and displaying flags when clicked. 2016-11-09 18:30:01 -05:00
Wyatt Johnson 42a7eee1a2 Merge branch 'master' into auth 2016-11-09 16:28:39 -07:00
Wyatt Johnson c203bf16eb Improved tests and fixed them for new users model 2016-11-09 16:26:23 -07:00
David Erwin 43a77e49c7 Merge pull request #42 from coralproject/update-settings-in-ui
Update settings in ui
2016-11-09 17:35:30 -05:00
David Erwin 9856c377eb Merge branch 'master' into update-settings-in-ui 2016-11-09 17:34:25 -05:00
Dan Zajdband 99f0e77ce1 add(coral-admin): Working actions 2016-11-09 17:27:44 -05:00
David Erwin f6473972d8 Remove browser: true in favor of client's eslint file 2016-11-09 17:19:44 -05:00
David Erwin 39654f34f2 Updating eslint as per @wyattjoh's request 2016-11-09 17:15:39 -05:00
David Erwin 777dd9d4ed Merge branch 'update-settings-in-ui' of https://github.com/coralproject/talk into update-settings-in-ui 2016-11-09 17:13:27 -05:00
David Erwin decb6747fd Comment out inactive Settings options 2016-11-09 17:12:52 -05:00
David Jay b7ee23d000 Updating commentstream to reflect new store structure. 2016-11-09 17:01:50 -05:00
gaba 49ea01049f Merge branch 'master' into update-settings-in-ui 2016-11-09 13:57:19 -08:00
gaba d7ea18cba9 Fix linting problems. Remove comment of code. Add package. 2016-11-09 13:52:47 -08:00