Commit Graph
793 Commits
Author SHA1 Message Date
David Jay fc96c1ee91 Compressing variables from postAction into single object. 2016-12-08 14:27:31 -05:00
David Jay f8923aa283 Updating tests. 2016-12-07 22:22:23 -05:00
David Jay 6fc3f00175 Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-07 22:21:50 -05:00
David Jay dd85fbb3e0 Adding other field. 2016-12-07 22:16:41 -05:00
David Jay 18f7b07198 Addressing setting bug caused by open thread feature. 2016-12-07 21:12:31 -05:00
David Jay 3be1556803 Enabling i18n 2016-12-07 20:30:30 -05:00
David Jay a8805b464b Updating style. 2016-12-07 20:19:07 -05:00
Kim GardnerandGitHub c9548e1d89 Merge pull request #132 from coralproject/smtp-settings-v2
add host and port because GCP is silly
2016-12-07 15:15:06 -10:00
Riley Davis 9f360cf780 make the provider an env var 2016-12-07 15:03:49 -10:00
Riley Davis f7fa0ae866 make PORT and HOST optional 2016-12-07 15:01:07 -10:00
Riley Davis 5d4abf7269 add host and port because GCP is silly 2016-12-07 14:55:12 -10:00
Kim GardnerandGitHub bbf476a7ee Merge pull request #131 from coralproject/pw-reset-logs
Pw reset logs
2016-12-07 14:09:32 -10:00
David Jay 713cc0cda1 Posting actions to comment and user endpoints. 2016-12-07 19:01:02 -05:00
Riley Davis a4af29cfa0 put things back 2016-12-07 11:32:42 -10:00
Riley Davis 25cc1ecb20 remove debug statements 2016-12-07 11:23:59 -10:00
Riley Davis 7012684c23 correct error logs 2016-12-07 11:06:09 -10:00
Riley Davis 1c2b2c142e change the environment vars. can't use sendgrid connection string 2016-12-07 11:04:57 -10:00
Riley Davis d2ba04def1 add a comma 2016-12-07 10:28:58 -10:00
Riley Davis 61c0af93e3 add some debug statements so we can figure out why pw reset doesn't work in staging 2016-12-07 10:28:01 -10:00
David JayandGitHub 0d97b91903 Merge pull request #126 from coralproject/i18n-var
Adds a variable to the possible translations.
2016-12-07 11:44:10 -05:00
Riley Davis 1201196566 un-sneaking in some stuff 2016-12-06 15:51:22 -10:00
Riley Davis f2ded3f2a7 replace things multiple times 2016-12-06 14:34:27 -10:00
Riley Davis 31c87cb93f make the translation function accept n arguments. ninja bugfix to permalink 2016-12-06 14:17:01 -10:00
Riley DavisandGitHub f2c751f9f0 Merge branch 'master' into i18n-var 2016-12-06 13:41:44 -10:00
David Jay 74eb09a807 Cleaning up after merge. 2016-12-06 18:20:19 -05: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 9e69a453d9 Adding text to postAction in commentStream. 2016-12-06 18:14:53 -05:00
David Jay 13d0dec84a Updating postAction to send reasons to backend. 2016-12-06 18:11:44 -05:00
David Jay 3438024624 Posting flag action. 2016-12-06 18:01:11 -05:00
David Jay 9da19e87ea Adding options to popup menu. 2016-12-06 17:48:08 -05:00
David Jay 5e8315c0d7 Styling popup menu. 2016-12-06 15:46:03 -05:00
David JayandGitHub b88c413d09 Merge pull request #128 from coralproject/status-history
Status history
2016-12-06 12:43:14 -05:00
Wyatt Johnson 5298efa89f Adjusting based on PR feedback, added public filter to settings object 2016-12-06 11:55:15 -05:00
Wyatt JohnsonandGitHub d2d4640eee Merge branch 'master' into status-history 2016-12-06 11:08:00 -05:00
Belén CurcioandGitHub c7108b7fed Merge pull request #91 from coralproject/stream-e2e
Embed stream end to end testing
2016-12-05 19:39:14 -03:00
David Jay ab43d1f0ac Showing first set of options in menu. 2016-12-05 17:38:13 -05:00
Belén CurcioandGitHub 67aa261a56 Merge branch 'master' into stream-e2e 2016-12-05 19:34:57 -03:00
Belén CurcioandGitHub e644b68f66 Merge pull request #127 from coralproject/close-comments
Adds the ability to close and open comments on an asset
2016-12-05 19:33:05 -03:00
Belen Curcio 08e232c4fe User Should still be able to see sign info even if its closed // moving comp 2016-12-05 19:28:47 -03:00
Belen Curcio 03b6ec4fe4 Lint 2016-12-05 19:18:29 -03:00
Dan Zajdband 568e46f1e3 Added restricted wrapper 2016-12-05 17:02:21 -05:00
Dan Zajdband 62cc489c21 Merge with master 2016-12-05 16:39:00 -05:00
David Jay a9bc90619d Adding popup on report button click. 2016-12-05 15:59:16 -05:00
Wyatt Johnson 91efa60b55 Fixed linting error 2016-12-05 14:20:47 -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
David JayandGitHub 9c19cabf3e Merge branch 'master' into i18n-var 2016-12-05 12:43:40 -05:00
David JayandGitHub 7c02ece881 Merge branch 'master' into stream-e2e 2016-12-05 12:42:26 -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 95ec57c64d Added default message on thread 2016-12-05 11:11:21 -05:00