Commit Graph
8775 Commits
Author SHA1 Message Date
riley 5d5ad2585d autoclose an article toggle 2017-03-24 10:40:12 -06:00
Wyatt Johnson 05efbc4ded Updated lockfile 2017-03-24 10:15:03 -06:00
gaba 323749915a CSS alignments 2017-03-24 08:59:43 -07:00
gaba 84f1d3ece2 Use findONeAndUpdate and the moderation queue for account flags should only give back pending accounts. 2017-03-23 16:02:25 -07:00
riley 6b6d3d8bbb highlight suspect, banned words and links 2017-03-23 16:09:36 -06:00
gaba b9c816285d Fix params for moduserflaggedquery. 2017-03-23 14:48:15 -07:00
Belen Curcio 3be9b13691 First draft of plugins working :) 2017-03-23 16:59:11 -03:00
Riley Davis 7f1b993ea6 always show moderation link to admins 2017-03-23 13:04:37 -06:00
Riley DavisandGitHub c1baccae5a Merge pull request #435 from coralproject/reset-password-redirect
redirect to the parent url when resetting your password
2017-03-23 12:59:31 -06:00
Riley Davis 984514d7eb check whitelist before redirecting 2017-03-23 12:46:20 -06:00
Wyatt Johnson 0e0c3f19aa Fixed tests 2017-03-23 11:11:57 -06:00
Wyatt Johnson 63ef49d595 Initial subscription impl 2017-03-23 11:09:14 -06:00
Riley DavisandGitHub 67e04bf156 Merge branch 'master' into reset-password-redirect 2017-03-23 10:29:05 -06:00
Belen Curcio 2e80d2a36e fixing and separating broken tests /client /server 2017-03-23 12:27:30 -03:00
David ErwinandGitHub 7e65ba6371 Merge pull request #437 from coralproject/revert-370-story-138187767-mod-flag-names
Revert "Story 138187767  - Moderate Flag User Names"
2017-03-23 11:22:28 -04:00
David ErwinandGitHub 903aa23f19 Revert "Story 138187767 - Moderate Flag User Names" 2017-03-23 11:18:55 -04:00
David ErwinandGitHub 03aebd7840 Merge pull request #432 from coralproject/my-comments-ux
My Comments / Profile Tab UX
2017-03-23 10:57:40 -04:00
David ErwinandGitHub 53ba313f57 Merge branch 'master' into my-comments-ux 2017-03-23 10:53:47 -04:00
David ErwinandGitHub da8e632fd3 Merge pull request #433 from coralproject/design-more
Design UX - #141430305
2017-03-23 10:53:32 -04:00
David ErwinandGitHub 6c83b2e60d Merge branch 'master' into design-more 2017-03-23 10:49:26 -04:00
Belen Curcio 341a7320f9 Adding dynamic imports 2017-03-23 11:48:32 -03:00
David ErwinandGitHub ae457f1951 Merge branch 'master' into my-comments-ux 2017-03-23 10:40:00 -04:00
David ErwinandGitHub 907f7173fb Merge pull request #430 from coralproject/admin-ux
Admin UX
2017-03-23 10:39:18 -04:00
David ErwinandGitHub a01c6f0f78 Merge branch 'master' into admin-ux 2017-03-23 09:04:36 -04:00
Belen Curcio 23833886bb missing tab name 2017-03-23 09:51:26 -03:00
Belen Curcio 464539d6a3 missing tab name 2017-03-23 09:50:18 -03:00
Riley DavisandGitHub 375ff08584 Merge branch 'master' into reset-password-redirect 2017-03-22 18:45:40 -06:00
Gabriela Rodríguez BerónandGitHub 849be3d5fd Merge branch 'master' into translations 2017-03-22 17:31:28 -07:00
gaba 35c8e1b5f9 Check spanish translations 2017-03-22 17:27:43 -07:00
gaba 4cbd6ebad2 Mooore translations. 2017-03-22 16:21:40 -07:00
Gabriela Rodríguez BerónandGitHub ae96cb1e44 Merge branch 'master' into my-comments-ux 2017-03-22 16:18:45 -07:00
Riley Davis 4b0d0fed53 unused variable 2017-03-22 17:10:11 -06:00
Riley Davis fb2f8ef074 redirect to the parent url when resetting your password 2017-03-22 16:49:34 -06:00
Riley DavisandGitHub c6401a2d08 Merge pull request #434 from coralproject/asset-url
asset_url and canonical link tags
2017-03-22 15:51:08 -06:00
Riley Davis 7af16471cd if the asset_url is not present, attempt to find the canonical link tag. if not, warn the user and strip the query params. 2017-03-22 15:41:06 -06:00
gaba 27a8c994a8 Fixing more translations 2017-03-22 13:19:08 -07:00
Belen Curcio 0bae6fe76c design tweaks 2017-03-22 17:06:41 -03:00
Belén CurcioandGitHub 1e54a997d6 Merge branch 'master' into my-comments-ux 2017-03-22 16:25:06 -03:00
Belen Curcio 85d235bf37 Merge branch 'my-comments-ux' of github.com:coralproject/talk into my-comments-ux 2017-03-22 16:23:00 -03:00
Riley DavisandGitHub d8e92968a5 Merge branch 'master' into admin-ux 2017-03-22 13:22:21 -06:00
Belen Curcio 4f50e8f19c Removing tests for now until we find a better solution for this 2017-03-22 16:19:05 -03:00
gaba 78e7951ad7 Merge branch 'master' into translations 2017-03-22 12:11:52 -07:00
Gabriela Rodríguez BerónandGitHub 82068cd20e Merge pull request #370 from coralproject/story-138187767-mod-flag-names
Story 138187767  - Moderate Flag User Names
2017-03-22 12:10:43 -07:00
gaba 72e714a42c Translations into json 2017-03-22 11:59:33 -07:00
gaba 54015691fe Merge branch 'master' into translations 2017-03-22 11:46:09 -07:00
gaba d9af09d2a3 Email templates 2017-03-22 11:43:03 -07:00
Belén CurcioandGitHub ae672d038c Merge branch 'master' into my-comments-ux 2017-03-22 15:37:48 -03:00
Belen Curcio 5729b03656 my-comments-ux 2017-03-22 15:35:40 -03:00
gaba 046cea5043 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-22 11:33:25 -07:00
Gabriela Rodríguez BerónandGitHub d7ccfa4eda Merge pull request #431 from coralproject/remove-express-dep
remove express dep from mailer service
2017-03-22 11:32:36 -07:00