wassname/talk
1
0
Fork 0
mirror of https://github.com/wassname/talk.git synced 2026-07-15 11:26:58 +08:00
Code Issues Packages Projects Releases Wiki Activity
8,775 Commits 10 Branches 125 Tags
4fcdec92d8e68b60efa047b50cdc4ec8fe1ee2ce
Commit Graph
8775 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
David Jay 8446c49c14 Fixing error when posting comment. 2016-12-08 13:08:18 -05:00
Dan Zajdband fb392422ea Added textarea for closed message on admin 2016-12-08 12:44:02 -05:00
Belen Curcio be721b85c6 204 response 2016-12-08 14:39:05 -03:00
Belen Curcio c1ba2d432e Replacing res.send by res.json 2016-12-08 13:43:21 -03: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
gaba ec2b40fafe Missed a few actions when banned. 2016-12-07 16:49:55 -10:00
gaba 23c67b4a49 It fix the status change after merging master in. 2016-12-07 16:37:11 -10:00
Riley DavisandGitHub ab8f2b438f Merge branch 'master' into bugfix-for-permalink-path 2016-12-07 16:16:09 -10:00
Riley DavisandGitHub 6247510cd7 Merge branch 'master' into wordlist 2016-12-07 16:15:23 -10:00
David Jay 18f7b07198 Addressing setting bug caused by open thread feature. 2016-12-07 21:12:31 -05:00
Belén CurcioandGitHub fc79307e28 Merge branch 'master' into asset-comment-settings 2016-12-07 22:48:34 -03: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
gaba 0e2a7decd4 Adds ban/unban to cli. Fix ban user in the admin. 2016-12-07 14:55:49 -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
Riley DavisandGitHub e56583e250 Merge branch 'master' into bugfix-for-permalink-path 2016-12-07 09:11:22 -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
Belen Curcio ebf9754287 merge 2016-12-07 10:58:30 -03:00
Riley Davis 260d1bd9f4 restoring the scroll to comment functionality 2016-12-06 16:29:40 -10:00
Riley Davis d9d9c50961 un-sneaking in some stuff 2016-12-06 15:52:22 -10:00
Riley Davis 1201196566 un-sneaking in some stuff 2016-12-06 15:51:22 -10:00
Riley Davis 09245403aa riley is silly 2016-12-06 14:42:09 -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
Wyatt Johnson b82f130454 Adds a new closedAt time for assets to prevent new comments from being 
created
 2016-12-06 14:44:15 -05:00
David Jay 17e4e57171 Merge branch 'wordlist' of github.com:coralproject/talk into wordlist 2016-12-06 12:54:39 -05:00
David Jay 582c0c0c9e Handling case where child and parent_id are undefined. 2016-12-06 12:53:35 -05:00
David JayandGitHub bfcb2cdb21 Merge branch 'master' into wordlist 2016-12-06 12:44:23 -05:00
David JayandGitHub b88c413d09 Merge pull request #128 from coralproject/status-history 
Status history
 2016-12-06 12:43:14 -05:00