Commit Graph

  • 66cfd20f7b Merge branch 'master' into master Wyatt Johnson 2018-01-16 16:00:37 -07:00
  • af40a85071 Merge branch 'master' into master Wyatt Johnson 2018-01-16 15:58:58 -07:00
  • b11a730373 Merge branch 'master' into reply-on-hidden-comment Wyatt Johnson 2018-01-16 14:13:13 -07:00
  • b709cb485e refactored publicCreate Wyatt Johnson 2018-01-16 14:11:24 -07:00
  • 13fc91b355 Merge pull request #1287 from coralproject/ci-time-sync Kiwi 2018-01-16 20:53:13 +01:00
  • 9eec280868 added time syncing Wyatt Johnson 2018-01-16 12:31:45 -07:00
  • 45d4c79c26 added reply bug Wyatt Johnson 2018-01-16 12:30:38 -07:00
  • 1cf2bda36c Merge pull request #1286 from coralproject/e2e-pause Kiwi 2018-01-16 19:44:21 +01:00
  • b1adfe8c46 Add a little pause in e2e test Chi Vinh Le 2018-01-16 19:33:07 +01:00
  • 6aece16fd0 Add userFlagged subscription Chi Vinh Le 2018-01-16 11:31:44 +01:00
  • 2684ac4933 missing brackets okbel 2018-01-15 13:14:24 -03:00
  • 1f0e9da5d0 Merge branch 'formatting' of github.com:coralproject/talk into formatting okbel 2018-01-15 13:00:07 -03:00
  • bfa2f6edb9 Updates okbel 2018-01-15 12:59:39 -03:00
  • ea7998257c Merge branch 'master' into action-index Kiwi 2018-01-15 16:02:53 +01:00
  • 25c178b267 Merge branch 'master' into formatting Wyatt Johnson 2018-01-12 17:23:35 -07:00
  • 7885b025ee Merge pull request #1262 from coralproject/firefox-actionmenu-deselect Wyatt Johnson 2018-01-12 16:49:04 -07:00
  • 3606726c4b Merge branch 'master' into firefox-actionmenu-deselect Wyatt Johnson 2018-01-12 16:33:55 -07:00
  • d69b1f98c8 Merge branch 'master' into action-index Wyatt Johnson 2018-01-12 15:50:02 -07:00
  • 77d83e04d5 Wrong name okbel 2018-01-12 15:53:32 -03:00
  • 86c4d70daf Adding changes to the comments on the User Drawer Detail okbel 2018-01-12 15:51:49 -03:00
  • e256b0da8a Adding format to admin comment - CommentFormatter okbel 2018-01-12 15:47:09 -03:00
  • 93bda87ad0 Merge pull request #1153 from coralproject/next Wyatt Johnson 2018-01-12 09:43:40 -07:00
  • 1ccd36e9e9 prettier Chi Vinh Le 2018-01-12 14:07:05 +01:00
  • bf77ddc49b Merge branch 'master' into master Tibo Beijen 2018-01-12 13:54:31 +01:00
  • ebe6341b01 Merge pull request #1 from sanoma/feature/MDN-10616_translation_additions daan944 2018-01-12 13:45:20 +01:00
  • 34a0e314e8 After discussion: changed status to shorter “Pre-moderatie” d.luijten 2018-01-12 13:44:29 +01:00
  • 9762f34324 End of line Chi Vinh Le 2018-01-12 11:45:52 +01:00
  • 951f16f0a1 Improved email message: ‘je gebruiker’ is always referred to as ‘je account’. Also, simplified ‘Diens inhoud’ to ‘de inhoud van je gebruikersnaam’. d.luijten 2018-01-12 11:32:48 +01:00
  • 9ce14acc9a More syncs Chi Vinh Le 2018-01-12 11:23:29 +01:00
  • 988b39f19d Fixed call-to-action: “Kom in gesprek!” sounds a bit weird to me. d.luijten 2018-01-12 11:20:29 +01:00
  • 9333b407bb Fixed consistency: Community guidelines are used both with and without capital C. Chose to go for the version without capital C, since it’s not a title. d.luijten 2018-01-12 11:19:21 +01:00
  • 8867fd54f3 Fixed consistency: “Voor-mod” is never used. “Pre-moderatie” would be acceptable, but “Wachtend op moderatie” sounds more like the correct status message. d.luijten 2018-01-12 11:14:51 +01:00
  • 56bd3041d6 Fixed consistency: a “bio” has been both named “biografie” and “bio”. Chose “biografie” for now. d.luijten 2018-01-12 11:11:09 +01:00
  • a53bb6650a Fixed SI units. d.luijten 2018-01-12 11:10:30 +01:00
  • 0a99ae50b1 Fixed consistency: “Afgewezen wachtrij” implies that this name is used more frequently, but it isn’t. d.luijten 2018-01-12 11:10:06 +01:00
  • 6bad3fdc2f Dotted some sentences. Tibo Beijen 2018-01-12 09:09:21 +01:00
  • c19a6c8b10 Merge branch 'next' into firefox-actionmenu-deselect Wyatt Johnson 2018-01-11 20:25:18 -07:00
  • 0abc2ca243 replaced eslint:recommended with prettier Wyatt Johnson 2018-01-11 20:00:34 -07:00
  • d56c19016a Merge pull request #1279 from coralproject/docs Wyatt Johnson 2018-01-11 17:53:12 -07:00
  • bb9a93986e Small wording tweak Kim Gardner 2018-01-11 19:41:45 -05:00
  • c906b2df5e Merge branch 'next' into docs Kim Gardner 2018-01-11 19:36:58 -05:00
  • 204b442e2f added deprecation warning Wyatt Johnson 2018-01-11 17:32:52 -07:00
  • 876f4ef700 updated docs for 4.0 Wyatt Johnson 2018-01-11 16:51:08 -07:00
  • 7f02d4f39c fixed circle.yml Wyatt Johnson 2018-01-11 15:54:35 -07:00
  • c1f5450b9a Merge branch 'master' into next Kim Gardner 2018-01-11 17:43:43 -05:00
  • 7f291cf056 Merge pull request #1276 from coralproject/email-send-fix Wyatt Johnson 2018-01-11 15:28:18 -07:00
  • 7706a0521c Merge branch 'next' into email-send-fix Wyatt Johnson 2018-01-11 15:28:11 -07:00
  • 81d2927c0f Merge pull request #1278 from coralproject/plugin-context Wyatt Johnson 2018-01-11 15:27:50 -07:00
  • f2698298f7 Merge branch 'next' into plugin-context Wyatt Johnson 2018-01-11 15:27:04 -07:00
  • a4e8ea93bc fixed import typo Wyatt Johnson 2018-01-11 15:24:46 -07:00
  • ca49b373bf Merge branch 'next' into email-send-fix Kim Gardner 2018-01-11 17:23:42 -05:00
  • 4c6ec75cd7 Merge pull request #1277 from coralproject/hide-user-status-auth Kim Gardner 2018-01-11 17:23:23 -05:00
  • 07826a9bf4 fixing spelling :( Wyatt Johnson 2018-01-11 15:20:33 -07:00
  • f79f521d3d Merge branch 'next' into plugin-context Belén Curcio 2018-01-11 19:15:59 -03:00
  • 7e465f7317 Merge branch 'next' into email-send-fix Belén Curcio 2018-01-11 19:11:33 -03:00
  • 943c3e93a4 Merge branch 'next' into hide-user-status-auth Belén Curcio 2018-01-11 19:11:16 -03:00
  • f070d47c2d Merge pull request #1267 from coralproject/perm-fix Kim Gardner 2018-01-11 16:40:10 -05:00
  • 4eda547734 removed config from context Wyatt Johnson 2018-01-11 14:22:45 -07:00
  • 5865c30155 added a plugin context Wyatt Johnson 2018-01-11 14:20:51 -07:00
  • 838083e76d Merge branch 'next' into perm-fix Kim Gardner 2018-01-11 16:10:41 -05:00
  • 4d65052eef allow moderators to view role Wyatt Johnson 2018-01-11 14:00:26 -07:00
  • eec7d0fb63 Merge branch 'next' into hide-user-status-auth Wyatt Johnson 2018-01-11 13:57:21 -07:00
  • d837562089 hides the user status histories and tokens from the auth endpoints, which were resulting in errors Wyatt Johnson 2018-01-11 13:56:23 -07:00
  • fddba1e059 Merge branch 'next' into email-send-fix Kim Gardner 2018-01-11 15:49:44 -05:00
  • 1e85894a0c Merge pull request #1274 from coralproject/account-history Kim Gardner 2018-01-11 15:49:26 -05:00
  • 9b4dcd8d32 Merge branch 'next' into account-history Kim Gardner 2018-01-11 15:34:50 -05:00
  • 54ec9ea9a6 Merge pull request #1275 from coralproject/flags-enh Kim Gardner 2018-01-11 15:34:18 -05:00
  • f51eda4f5e Merge branch 'next' into flags-enh Kim Gardner 2018-01-11 15:24:24 -05:00
  • be40594ecf Merge pull request #1273 from coralproject/selected-bug Kim Gardner 2018-01-11 15:24:09 -05:00
  • f340cdd4b7 Merge branch 'next' into selected-bug Kim Gardner 2018-01-11 15:10:09 -05:00
  • 24b6a4f16f Merge pull request #1272 from coralproject/fix-scrollbars Kim Gardner 2018-01-11 15:05:34 -05:00
  • f2e63b7621 Merge branch 'next' into fix-scrollbars Kim Gardner 2018-01-11 14:41:32 -05:00
  • 6d3d717ab3 Merge pull request #1271 from coralproject/fix-no-status-history Kim Gardner 2018-01-11 14:41:17 -05:00
  • 1dcf297a45 added email fixes Wyatt Johnson 2018-01-11 10:58:43 -07:00
  • 8cdc881f3d Merge branch 'next' into flags-enh Kiwi 2018-01-11 18:47:05 +01:00
  • 9187231737 Merge branch 'next' into account-history Belén Curcio 2018-01-11 14:45:23 -03:00
  • 2bc60b1211 fixes okbel 2018-01-11 14:44:53 -03:00
  • 90f1ef050b Change Flags to Reports and make a bit bigger Chi Vinh Le 2018-01-11 18:41:53 +01:00
  • eb5b736484 Merge branch 'next' into fix-no-status-history Kim Gardner 2018-01-11 12:27:37 -05:00
  • 92b506c85a Merge pull request #1270 from coralproject/suspect-label Kim Gardner 2018-01-11 12:17:38 -05:00
  • 2269c91244 Restore shortcut functionality Chi Vinh Le 2018-01-11 16:54:54 +01:00
  • 210b0ab907 Only show scrollbars when necessary Chi Vinh Le 2018-01-11 16:05:20 +01:00
  • 1337873adf Remove unwanted scroll in configure Chi Vinh Le 2018-01-11 16:05:02 +01:00
  • d922761f85 Merge branch 'next' into firefox-actionmenu-deselect Kim Gardner 2018-01-11 09:51:40 -05:00
  • 737b77a6ac Merge pull request #1269 from larrylizhao/feature/pluginTranslation Kim Gardner 2018-01-11 09:36:35 -05:00
  • 11b38f7ea0 Fix no status history error Chi Vinh Le 2018-01-11 13:55:09 +01:00
  • e5c3474455 dutch translation was not added yet without adding it to i18n.js - and refined a few translations. Bart Stroeken 2018-01-11 11:56:30 +01:00
  • f89a5013d2 Merge branch 'next' into suspect-label Kiwi 2018-01-11 11:20:04 +01:00
  • 139d319965 Merge branch 'next' into perm-fix Kiwi 2018-01-11 11:19:13 +01:00
  • 89c929f970 Fix suspect label Chi Vinh Le 2018-01-11 11:16:30 +01:00
  • 6e813e9663 Translations refinement for plugins liz 2018-01-11 17:16:26 +08:00
  • 1f2caada3f Finished drafting translations. Let's spin it up for a test run Bart Stroeken 2018-01-11 09:04:45 +01:00
  • 14dd9acd3b changed copy for error Wyatt Johnson 2018-01-10 16:49:40 -07:00
  • d35d0e354e Merge branch 'next' into firefox-actionmenu-deselect Wyatt Johnson 2018-01-10 15:35:27 -07:00
  • ec38b837aa Merge branch 'next' into perm-fix Wyatt Johnson 2018-01-10 14:48:08 -07:00
  • d055e0b28b Feature Button okbel 2018-01-10 17:51:21 -03:00
  • 1f6d38c4ad Updating copy okbel 2018-01-10 17:43:55 -03:00
  • eef2578e61 ignore user box over flow, fixed okbel 2018-01-10 17:41:18 -03:00
  • 7127aeaa87 Icon User Drawer okbel 2018-01-10 17:35:50 -03:00
  • 44648fa901 fixed perms issue Wyatt Johnson 2018-01-10 13:04:56 -07:00