Commit Graph

3586 Commits

Author SHA1 Message Date
Riley Davis dd5c114dc2 don't use well-known email settings 2016-12-08 18:36:20 -10:00
gaba 71d6b90993 SMall changes for PR. 2016-12-08 18:29:15 -10:00
gaba ecd3f5c347 IT removes duplicated code. 2016-12-08 18:19:00 -10:00
gaba a46ffe8ea6 It removes duplicated code. 2016-12-08 18:16:37 -10:00
gaba 9bfac3872e Moves banUser to users actions instead of comments actions. 2016-12-08 18:16:17 -10:00
gaba 0df1b9a498 Remove file that is not being used anymore. 2016-12-08 16:37:05 -10:00
Kim Gardner 82e3d73d2d Merge pull request #143 from coralproject/format-readme
Fix formatting
2016-12-08 13:38:03 -10:00
gaba 1eb204f822 Merge branch 'master' into ban-user 2016-12-08 13:28:12 -10:00
Riley Davis 0bbefa071e Merge branch 'master' into format-readme 2016-12-08 13:17:23 -10:00
Gabriela Rodríguez Berón cfb1b75b39 Merge pull request #137 from coralproject/payload-filtering
Add payload filtering and status_history updates
2016-12-08 13:08:12 -10:00
Gabriela Rodríguez Berón be632ada47 Merge branch 'master' into payload-filtering 2016-12-08 13:05:14 -10:00
Kim Gardner 7ce44ccd8c More formatting 2016-12-08 12:53:39 -10:00
Riley Davis b129d91e9f Merged branch payload-filtering into payload-filtering 2016-12-08 12:51:58 -10:00
Riley Davis 500dafbafa riley being anal 2016-12-08 12:51:45 -10:00
Kim Gardner c8d0fae097 Fix formatting 2016-12-08 12:50:12 -10:00
Kim Gardner 26e3f1d851 Merge pull request #136 from coralproject/update-talk-docs
Update config notes
2016-12-08 12:41:50 -10:00
Kim Gardner 501df52cf8 Merge branch 'master' into update-talk-docs 2016-12-08 12:37:05 -10:00
Belen Curcio fa4ef2cab0 Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings 2016-12-08 19:34:10 -03:00
Belen Curcio 77ae7f1329 Merge branch 'asset-comment-settings' of github.com:coralproject/talk into asset-comment-settings 2016-12-08 19:33:39 -03:00
Wyatt Johnson d95d9aa8e3 Merge branch 'master' into payload-filtering 2016-12-08 17:28:50 -05:00
Jeff Nelson 7ee4f3c7cb Merge pull request #142 from coralproject/create-user-w-role
Create user with a role
2016-12-08 12:27:45 -10:00
Wyatt Johnson c90c125dbd Merge branch 'master' into create-user-w-role 2016-12-08 17:24:47 -05:00
Wyatt Johnson bc88cd1e9d Adjusted promise 2016-12-08 17:23:31 -05:00
Riley Davis 4572d8e68e filter by premod status 2016-12-08 12:20:54 -10:00
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