Commit Graph

7846 Commits

Author SHA1 Message Date
Wyatt Johnson d56c19016a Merge pull request #1279 from coralproject/docs
Updated docs for 4.0
2018-01-11 17:53:12 -07:00
Kim Gardner bb9a93986e Small wording tweak 2018-01-11 19:41:45 -05:00
Kim Gardner c906b2df5e Merge branch 'next' into docs 2018-01-11 19:36:58 -05:00
Wyatt Johnson 204b442e2f added deprecation warning 2018-01-11 17:32:52 -07:00
Wyatt Johnson 876f4ef700 updated docs for 4.0 2018-01-11 16:51:08 -07:00
Wyatt Johnson 7f02d4f39c fixed circle.yml 2018-01-11 15:54:46 -07:00
Kim Gardner c1f5450b9a Merge branch 'master' into next 2018-01-11 17:43:43 -05:00
Wyatt Johnson 7f291cf056 Merge pull request #1276 from coralproject/email-send-fix
Missing Email Error
2018-01-11 15:28:18 -07:00
Wyatt Johnson 7706a0521c Merge branch 'next' into email-send-fix 2018-01-11 15:28:11 -07:00
Wyatt Johnson 81d2927c0f Merge pull request #1278 from coralproject/plugin-context
Plugin context
2018-01-11 15:27:50 -07:00
Wyatt Johnson f2698298f7 Merge branch 'next' into plugin-context 2018-01-11 15:27:04 -07:00
Wyatt Johnson a4e8ea93bc fixed import typo 2018-01-11 15:24:46 -07:00
Kim Gardner ca49b373bf Merge branch 'next' into email-send-fix 2018-01-11 17:23:42 -05:00
Kim Gardner 4c6ec75cd7 Merge pull request #1277 from coralproject/hide-user-status-auth
Hide user status auth
2018-01-11 17:23:23 -05:00
Wyatt Johnson 07826a9bf4 fixing spelling :( 2018-01-11 15:20:53 -07:00
Belén Curcio f79f521d3d Merge branch 'next' into plugin-context 2018-01-11 19:15:59 -03:00
Belén Curcio 7e465f7317 Merge branch 'next' into email-send-fix 2018-01-11 19:11:33 -03:00
Belén Curcio 943c3e93a4 Merge branch 'next' into hide-user-status-auth 2018-01-11 19:11:16 -03:00
Kim Gardner f070d47c2d Merge pull request #1267 from coralproject/perm-fix
Permission fix
2018-01-11 16:40:10 -05:00
Wyatt Johnson 4eda547734 removed config from context 2018-01-11 14:22:45 -07:00
Wyatt Johnson 5865c30155 added a plugin context 2018-01-11 14:20:51 -07:00
Kim Gardner 838083e76d Merge branch 'next' into perm-fix 2018-01-11 16:10:41 -05:00
Wyatt Johnson 4d65052eef allow moderators to view role 2018-01-11 14:00:26 -07:00
Wyatt Johnson eec7d0fb63 Merge branch 'next' into hide-user-status-auth 2018-01-11 13:57:21 -07:00
Wyatt Johnson d837562089 hides the user status histories and tokens from the auth endpoints, which were resulting in errors 2018-01-11 13:56:23 -07:00
Kim Gardner fddba1e059 Merge branch 'next' into email-send-fix 2018-01-11 15:49:44 -05:00
Kim Gardner 1e85894a0c Merge pull request #1274 from coralproject/account-history
Suspension duration, fixes and wording for Account History
2018-01-11 15:49:26 -05:00
Kim Gardner 9b4dcd8d32 Merge branch 'next' into account-history 2018-01-11 15:34:50 -05:00
Kim Gardner 54ec9ea9a6 Merge pull request #1275 from coralproject/flags-enh
Change Flags to Reports and make font a bit bigger
2018-01-11 15:34:18 -05:00
Kim Gardner f51eda4f5e Merge branch 'next' into flags-enh 2018-01-11 15:24:24 -05:00
Kim Gardner be40594ecf Merge pull request #1273 from coralproject/selected-bug
Restore shortcut functionality
2018-01-11 15:24:09 -05:00
Kim Gardner f340cdd4b7 Merge branch 'next' into selected-bug 2018-01-11 15:10:09 -05:00
Kim Gardner 24b6a4f16f Merge pull request #1272 from coralproject/fix-scrollbars
Fix scrollbars issues
2018-01-11 15:05:34 -05:00
Kim Gardner f2e63b7621 Merge branch 'next' into fix-scrollbars 2018-01-11 14:41:32 -05:00
Kim Gardner 6d3d717ab3 Merge pull request #1271 from coralproject/fix-no-status-history
Fix no status history error
2018-01-11 14:41:17 -05:00
Wyatt Johnson 1dcf297a45 added email fixes 2018-01-11 10:58:43 -07:00
Kiwi 8cdc881f3d Merge branch 'next' into flags-enh 2018-01-11 18:47:05 +01:00
Belén Curcio 9187231737 Merge branch 'next' into account-history 2018-01-11 14:45:23 -03:00
okbel 2bc60b1211 fixes 2018-01-11 14:44:53 -03:00
Chi Vinh Le 90f1ef050b Change Flags to Reports and make a bit bigger 2018-01-11 18:41:53 +01:00
Kim Gardner eb5b736484 Merge branch 'next' into fix-no-status-history 2018-01-11 12:27:37 -05:00
Kim Gardner 92b506c85a Merge pull request #1270 from coralproject/suspect-label
Fix suspect label
2018-01-11 12:17:38 -05:00
Chi Vinh Le 2269c91244 Restore shortcut functionality 2018-01-11 16:54:54 +01:00
Chi Vinh Le 210b0ab907 Only show scrollbars when necessary 2018-01-11 16:05:20 +01:00
Chi Vinh Le 1337873adf Remove unwanted scroll in configure 2018-01-11 16:05:02 +01:00
Kim Gardner 737b77a6ac Merge pull request #1269 from larrylizhao/feature/pluginTranslation
Translations refinement for plugins
2018-01-11 09:36:35 -05:00
Chi Vinh Le 11b38f7ea0 Fix no status history error 2018-01-11 13:55:09 +01:00
Kiwi f89a5013d2 Merge branch 'next' into suspect-label 2018-01-11 11:20:04 +01:00
Kiwi 139d319965 Merge branch 'next' into perm-fix 2018-01-11 11:19:13 +01:00
Chi Vinh Le 89c929f970 Fix suspect label 2018-01-11 11:16:30 +01:00