Commit Graph
266 Commits
Author SHA1 Message Date
Wyatt Johnson ddaa8eb858 Merge branch 'master' into gdpr-delete 2018-05-02 09:58:04 -06:00
okbel ff7ee2aefc Updating cache 2018-05-01 17:18:58 -03:00
Kim Gardner 06682225c8 Fix error message 2018-05-01 13:25:33 -04:00
Andrew LosowskyandGitHub 8d1d96884e small wording change
changed 'Customize' for 'Change' (more plain English)
2018-05-01 09:08:58 -04:00
Kim Gardner 4212f0b014 Update copy 2018-04-30 18:22:35 -04:00
Kim GardnerandGitHub 1143f74ba8 Merge branch 'master' into password_reset-subject-translation 2018-04-30 12:58:54 -04:00
Elias OjalaandGitHub edbd21f25f fixed typo 2018-04-28 23:02:29 +03:00
Jero 878cbb9195 Added email.password_reset.subject translation 2018-04-26 18:35:45 -03:00
Kim Gardner 2bc6687957 Use email vs e-mail 2018-04-25 11:09:54 -04:00
Wyatt JohnsonandGitHub ea0be250c1 Merge branch 'master' into gdpr-delete 2018-04-20 12:07:10 -06:00
Wyatt JohnsonandGitHub aa80f47b1c Merge branch 'master' into gdpr-password 2018-04-20 12:03:59 -06:00
Wyatt JohnsonandGitHub e0ebbf5119 Merge branch 'master' into gdpr-delete 2018-04-20 10:30:29 -06:00
Wyatt Johnson 8e34fd1925 implemented tombstoning 2018-04-18 17:22:39 -06:00
Kim GardnerandGitHub 31a8de852c Merge branch 'master' into organization-contact 2018-04-18 17:01:13 -04:00
Kim GardnerandGitHub 06c2f328d1 Merge branch 'master' into fix-view-context-system-withheld 2018-04-18 16:44:08 -04:00
Kim GardnerandGitHub 3e8abf554e Merge branch 'master' into 155910162 2018-04-18 15:35:21 -04:00
Clint Brown 3ae1051148 Add system withheld status to InactiveCommentLabel 2018-04-18 07:55:11 +10:00
Wyatt Johnson ce291448f1 Added some change to mutators 2018-04-16 12:45:17 -06:00
Wyatt Johnson 8dbfa8f274 Merge branch 'organization-contact' into gdpr-password 2018-04-16 12:32:09 -06:00
Wyatt Johnson 0fcb0be360 Password Change Graph Support 2018-04-16 12:29:37 -06:00
Wyatt Johnson 12bb886032 itterated on copy 2018-04-13 18:24:46 -06:00
Wyatt JohnsonandGitHub 6553096bc7 Merge branch 'master' into organization-contact 2018-04-12 13:11:35 -06:00
Wyatt JohnsonandGitHub 88d9cd193b Merge branch 'master' into MissingFrench 2018-04-10 10:57:30 -06:00
cecile 254033a294 FrenchCorrections 2018-04-10 09:40:22 -07:00
okbel 1ceb1b4014 Save, and edit changes 2018-04-10 11:46:32 -03:00
Ville Kauppi 80987a1e46 New version of the translation 2018-04-10 13:21:52 +03:00
cecile e9e70f7e75 added missing translations 2018-04-09 21:20:23 -07:00
cecile ffde113a74 add missing strings in fr locale 2018-04-09 17:53:07 -07:00
okbel 91aa95d3f2 Merge branch 'master' of github.com:coralproject/talk into organization-contact
* 'master' of github.com:coralproject/talk: (36 commits)
  Fixes #1505
  PropTypes
  Removin actions, using routes, and continuing the transition when the user makes an action
  fixes related to external auth
  Adding size, and proptypes
  IfSlotIsNotEmpty Bug
  Style and translations
  allow plugin code from clients to be parsed by webpack
  SaveChangesDialog
  Spanish translations
  Adding translations
  alert route hook ready!
  Removing plugin
  Restore Links
  Removing plugin
  Save changes / discard changes dialohg
  router and state lifted
  routes
  renaming slot :D
  renaming
  ...
2018-04-09 16:51:06 -03:00
Ville Kauppi a6518b183f Add Finnish translation 2018-04-08 15:05:49 +03:00
okbel 1a39727e38 account history to user history 2018-04-03 10:29:07 -03:00
okbel e4358ac3a1 Style and translations 2018-04-02 16:09:47 -03:00
okbel 81509b660e Spanish translations 2018-04-02 14:19:25 -03:00
okbel 4ed04d1c39 Adding translations 2018-04-02 14:12:02 -03:00
okbel 6c815c1132 Working on the admin side 2018-03-28 10:39:50 -03:00
okbel 6a22cd54ec Adding OrganizationDetails 2018-03-28 10:04:14 -03:00
okbel 480428b4a2 PropTypes and adding field 2018-03-28 09:44:02 -03:00
Wyatt Johnson 34fa2fb891 Verification link copy 2018-03-22 12:50:37 -06:00
Chi Vinh Le ce70c9c925 Merge branch 'master' into better-graph 2018-03-14 09:59:50 +01:00
Chi Vinh Le 9ad92e38c0 Move profile settings to core 2018-03-13 17:48:54 +01:00
Melhem Fawaz 820153429f Added most Arabic translations in 'ar' locale 2018-03-11 16:48:08 +04:00
Melhem Fawaz 969b3dbcd5 Registered AR locale in i18n framework service 2018-03-11 16:27:28 +04:00
Kim GardnerandGitHub 2979b16462 Merge branch 'master' into Danish-translation 2018-03-08 14:56:48 -05:00
Chi Vinh Le c2406df46f comment history blank state 2018-03-08 15:59:12 +01:00
Morten Nissen 4ce2e6f691 Update danish translation 2018-03-08 10:06:21 +01:00
Kim Gardner 7e41619732 Update new translation keys 2018-02-23 14:54:45 -05:00
Wyatt Johnson 8b4fe46120 added support for new system icon 2018-02-23 12:32:49 -07:00
Wyatt Johnson 139d036b42 changed styles + added translations 2018-02-22 17:32:37 -07:00
Kim GardnerandGitHub de094ee948 Merge branch 'master' into auth-refactor 2018-02-13 13:07:42 -05:00
Chi Vinh Le c7ee8307e6 Merge branch 'master' into auth-refactor 2018-02-13 16:33:17 +01:00