Commit Graph

814 Commits

Author SHA1 Message Date
David Jay ee187469e0 Moving FlagComment to seperate file. 2016-12-09 12:54:15 -05:00
David Jay f0108e1434 Fixing bug in addItem in commentStream. 2016-12-08 16:55:42 -05:00
David Jay e4a13d433f Removing commas. 2016-12-08 15:48:43 -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
David Jay b3d84d724f Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-08 14:36:02 -05:00
David Jay 191681d756 Closing Report menu when a user clicks outside of it. 2016-12-08 14:31:09 -05:00
David Jay fc96c1ee91 Compressing variables from postAction into single object. 2016-12-08 14:27:31 -05:00
David Erwin e7fd77a45e Merge pull request #135 from coralproject/arch-diag
Architecture Diagram.
2016-12-08 09:27:17 -10:00
gaba 74bef9dc94 Clean the text. 2016-12-08 09:13:34 -10:00
gaba d52ff11f41 Architecture Diagram. 2016-12-08 09:02:45 -10:00
Belén Curcio 35a18c874b Merge pull request #125 from coralproject/like-login-prompt
Adjusting height of login button to match current comment
2016-12-08 15:56:17 -03:00
Belén Curcio 0c050bdec9 Merge branch 'master' into like-login-prompt 2016-12-08 15:53:16 -03:00
David Jay 5e06560a99 Merge branch 'like-login-prompt' of github.com:coralproject/talk into like-login-prompt 2016-12-08 13:50:12 -05:00
David Jay e91564f706 Merge branch 'master' of github.com:coralproject/talk into like-login-prompt 2016-12-08 13:49:15 -05:00
Riley Davis 5fbe1dee0b Merge pull request #130 from coralproject/bugfix-for-permalink-path
restoring the scroll to comment functionality
2016-12-08 08:41:21 -10: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
Riley Davis ab8f2b438f Merge branch 'master' into bugfix-for-permalink-path 2016-12-07 16:16:09 -10: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 Gardner 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 Gardner 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
Riley Davis e56583e250 Merge branch 'master' into bugfix-for-permalink-path 2016-12-07 09:11:22 -10:00
David Jay 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 260d1bd9f4 restoring the scroll to comment functionality 2016-12-06 16:29:40 -10: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 Davis 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 Jay b88c413d09 Merge pull request #128 from coralproject/status-history
Status history
2016-12-06 12:43:14 -05:00