Commit Graph

3544 Commits

Author SHA1 Message Date
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
gaba 953178a1e4 Adds a translation string in spanish. 2016-12-08 10:27:24 -10:00
Belen Curcio acbd465636 merge 2016-12-08 16:37:11 -03:00
David Jay b3d84d724f Merge branch 'master' of github.com:coralproject/talk into flag-username 2016-12-08 14:36:02 -05:00
Belen Curcio 59182e75d3 Translations 2016-12-08 16:32:39 -03: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
gaba 50afa3d190 Merge branch 'master' into ban-user 2016-12-08 09:22:22 -10:00
Belen Curcio 74e4771e17 new config 2016-12-08 16:21:07 -03:00
Riley Davis be2d9838e6 Merge branch 'master' into wordlist 2016-12-08 09:13:48 -10:00
Belén Curcio 0c050bdec9 Merge branch 'master' into like-login-prompt 2016-12-08 15:53:16 -03:00
David Jay e91564f706 Merge branch 'master' of github.com:coralproject/talk into like-login-prompt 2016-12-08 13:49:15 -05:00
David Jay 9b5d85aaef Merge branch 'wordlist' of github.com:coralproject/talk into wordlist 2016-12-08 13:26:02 -05:00
David Jay 6d701ef49e Updating to detect new status format. 2016-12-08 13:25:18 -05:00
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
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 Davis 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
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
gaba 0e2a7decd4 Adds ban/unban to cli. Fix ban user in the admin. 2016-12-07 14:55:49 -10:00
David Jay 713cc0cda1 Posting actions to comment and user endpoints. 2016-12-07 19:01:02 -05:00
Riley Davis e56583e250 Merge branch 'master' into bugfix-for-permalink-path 2016-12-07 09:11:22 -10: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 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 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
Belen Curcio e751d91794 typo 2016-12-06 14:21:02 -03:00
Belen Curcio 8036b4790d Notifications 2016-12-06 14:09:36 -03:00
Belen Curcio 623c32a002 Configure Stream Ready, Checkbox Coral UI 2016-12-06 12:18:29 -03:00
David Jay 3562d9f235 Merge branch 'master' into wordlist 2016-12-05 17:44:23 -05:00
David Jay ab43d1f0ac Showing first set of options in menu. 2016-12-05 17:38:13 -05:00