Commit Graph

7162 Commits

Author SHA1 Message Date
gaba a86b5f84ac Adds a role option when creating the user. 2016-12-08 12:18:53 -10:00
gaba 413db123c4 Type on comment. 2016-12-08 12:18:19 -10:00
Dan Zajdband fed41e1fba Linted code 2016-12-08 16:59:29 -05:00
David Jay f0108e1434 Fixing bug in addItem in commentStream. 2016-12-08 16:55:42 -05:00
Kim Gardner 104a00a22f Merge branch 'master' into update-talk-docs 2016-12-08 11:52:35 -10:00
Wyatt Johnson df712e4efe Merge branch 'master' into payload-filtering 2016-12-08 16:15:32 -05:00
Wyatt Johnson 42b2b5fd82 Merge pull request #139 from coralproject/revert-138-revert-128-status-history
Revert "Revert "Status history""
2016-12-08 16:15:24 -05:00
Wyatt Johnson aaebbabef9 Revert "Revert "Status history"" 2016-12-08 16:12:44 -05:00
Riley Davis a81125ae09 Merge pull request #138 from coralproject/revert-128-status-history
Revert "Status history"
2016-12-08 11:09:17 -10:00
David Erwin 9ea6c66744 Revert "Status history" 2016-12-08 10:59:56 -10:00
Wyatt Johnson aa7892ede7 Merge branch 'master' into payload-filtering 2016-12-08 15:58:51 -05:00
Wyatt Johnson 3d35183e67 Add payload filtering and status_history updates 2016-12-08 15:56:52 -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
gaba 953178a1e4 Adds a translation string in spanish. 2016-12-08 10:27:24 -10:00
Kim Gardner 1c5dffc94c Add product links 2016-12-08 10:05:38 -10:00
Kim Gardner 7c4208fa16 Update config notes 2016-12-08 10:04:10 -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
David Erwin e7fd77a45e Merge pull request #135 from coralproject/arch-diag
Architecture Diagram.
2016-12-08 09:27:17 -10: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
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 97276b9524 Merge branch 'master' into close-comments 2016-12-08 15:55:20 -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 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
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 Davis ab8f2b438f Merge branch 'master' into bugfix-for-permalink-path 2016-12-07 16:16:09 -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
Belén Curcio fc79307e28 Merge branch 'master' into asset-comment-settings 2016-12-07 22:48:34 -03:00