Commit Graph
870 Commits
Author SHA1 Message Date
Gabriela Rodríguez BerónandGitHub 8ea61c3a05 Merge pull request #122 from coralproject/wordlist
Banned word list
2016-12-09 10:29:23 -10:00
Gabriela Rodríguez BerónandGitHub 1fefd3c8b4 Merge branch 'master' into wordlist 2016-12-09 10:26:39 -10:00
Gabriela Rodríguez BerónandGitHub 14cd482608 Merge pull request #129 from coralproject/asset-comment-settings
Asset comment settings
2016-12-09 10:09:51 -10:00
gaba 8b850a8d33 Fix the message. 2016-12-09 09:29:27 -10:00
gaba d9b778fa74 A few translations for the spanish for this feature. 2016-12-09 09:19:08 -10:00
David Jay bfe188eb5c Cleaning up from merge. 2016-12-09 13:17:50 -05:00
David Jay e032a5521e Merge branch 'master' of github.com:coralproject/talk into wordlist 2016-12-09 13:05:11 -05:00
Belen Curcio 3ef8f295c3 newConfig update 2016-12-09 12:59:17 -03:00
Belen Curcio a3cae4a608 Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings 2016-12-09 12:55:32 -03:00
Belén CurcioandGitHub 47da346e13 Merge pull request #134 from coralproject/close-comments
Close comments
2016-12-09 12:55:08 -03:00
Belen Curcio b33713e723 Changes to master 2016-12-09 12:32:59 -03:00
Belen Curcio e4df3bcafc Merge branch 'master' of github.com:coralproject/talk into asset-comment-settings 2016-12-09 12:28:40 -03:00
Dan Zajdband 72ab489e61 Merge branch 'close-comments' of github.com:coralproject/talk into close-comments 2016-12-09 10:20:06 -05:00
Dan Zajdband 09ba535d68 Merge with master 2016-12-09 10:17:55 -05:00
Kim GardnerandGitHub c096c61302 Merge pull request #146 from coralproject/smtp-madness
don't use well-known email settings
2016-12-08 18:39:32 -10:00
Riley Davis dd5c114dc2 don't use well-known email settings 2016-12-08 18:36:20 -10:00
Kim GardnerandGitHub 82e3d73d2d Merge pull request #143 from coralproject/format-readme
Fix formatting
2016-12-08 13:38:03 -10:00
Riley DavisandGitHub 0bbefa071e Merge branch 'master' into format-readme 2016-12-08 13:17:23 -10:00
Gabriela Rodríguez BerónandGitHub 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ónandGitHub 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 GardnerandGitHub 26e3f1d851 Merge pull request #136 from coralproject/update-talk-docs
Update config notes
2016-12-08 12:41:50 -10:00
Kim GardnerandGitHub 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 JohnsonandGitHub d95d9aa8e3 Merge branch 'master' into payload-filtering 2016-12-08 17:28:50 -05:00
Jeff NelsonandGitHub 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 JohnsonandGitHub 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
Kim GardnerandGitHub 104a00a22f Merge branch 'master' into update-talk-docs 2016-12-08 11:52:35 -10:00
Wyatt JohnsonandGitHub df712e4efe Merge branch 'master' into payload-filtering 2016-12-08 16:15:32 -05:00
Wyatt JohnsonandGitHub 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 JohnsonandGitHub aaebbabef9 Revert "Revert "Status history"" 2016-12-08 16:12:44 -05:00
Riley DavisandGitHub a81125ae09 Merge pull request #138 from coralproject/revert-128-status-history
Revert "Status history"
2016-12-08 11:09:17 -10:00
David ErwinandGitHub 9ea6c66744 Revert "Status history" 2016-12-08 10:59:56 -10:00
Wyatt JohnsonandGitHub 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
Kim GardnerandGitHub 1c5dffc94c Add product links 2016-12-08 10:05:38 -10:00
Kim GardnerandGitHub 7c4208fa16 Update config notes 2016-12-08 10:04:10 -10:00
Belen Curcio acbd465636 merge 2016-12-08 16:37:11 -03:00
Belen Curcio 59182e75d3 Translations 2016-12-08 16:32:39 -03:00
David ErwinandGitHub e7fd77a45e Merge pull request #135 from coralproject/arch-diag
Architecture Diagram.
2016-12-08 09:27:17 -10:00
Belen Curcio 74e4771e17 new config 2016-12-08 16:21:07 -03:00