Commit Graph
9388 Commits
Author SHA1 Message Date
Kim GardnerandGitHub 4130ad5217 Merge branch 'master' into viewing-sorting-translations-es 2018-04-30 12:43:48 -04:00
Wyatt JohnsonandGitHub 1e8c3de221 Merge pull request #1550 from theel0ja/patch-1
nightwatchjs.org doesn't support HTTPS
2018-04-30 10:23:55 -06:00
Kim GardnerandGitHub fdf5ca1d7a Merge branch 'master' into patch-1 2018-04-30 11:15:36 -04:00
Kim GardnerandGitHub 612230ad0c Merge pull request #1551 from theel0ja/patch-2
fixed typo
2018-04-30 11:15:03 -04:00
Elias OjalaandGitHub edbd21f25f fixed typo 2018-04-28 23:02:29 +03:00
Elias OjalaandGitHub f42e9dab4c nightwatchjs.org doesn't support HTTPS 2018-04-28 12:27:15 +03:00
Jero 885f186e39 added viewing and sorting spanish translations 2018-04-26 19:19:06 -03:00
Kim GardnerandGitHub 2d6a6d652e Merge pull request #1545 from conversario/popupmenu-style
Decrease font-size and padding in Report comment popup
2018-04-26 13:36:26 -04:00
Kim GardnerandGitHub 287d0bf538 Merge branch 'master' into popupmenu-style 2018-04-26 12:47:56 -04:00
Fabian Neumann 8643b1fbf2 Decrease font-size and padding in Flag Comment popup a bit. 2018-04-26 17:52:03 +02:00
Kim GardnerandGitHub 2048a2cc7f Merge pull request #1541 from coralproject/docs-formatting
Small docs fix
2018-04-25 12:33:47 -04:00
Belén CurcioandGitHub 358d56c2cf Merge branch 'master' into docs-formatting 2018-04-25 13:10:55 -03:00
Belén CurcioandGitHub 6376fe21cb Merge pull request #1542 from coralproject/grammar-fixes
Use email vs e-mail
2018-04-25 13:10:29 -03:00
Kim Gardner 2bc6687957 Use email vs e-mail 2018-04-25 11:09:54 -04:00
Kim Gardner 3bd2d0b3fc Small fix 2018-04-24 17:17:57 -04:00
Kim GardnerandGitHub d483b13aa8 Merge pull request #1539 from clintabrown/fix-cli-user-create
Fix CLI users create task
2018-04-24 14:12:08 -04:00
Kim GardnerandGitHub 47a860c09d Merge branch 'master' into fix-cli-user-create 2018-04-24 13:07:38 -04:00
Kim GardnerandGitHub 7f506f3fea Merge pull request #1532 from coralproject/gdpr-password
[GDPR] Password Change
2018-04-24 12:55:14 -04:00
okbel f910d7023c Merge branch 'master' of github.com:coralproject/talk into gdpr-password
* 'master' of github.com:coralproject/talk:
  Fix typo
  added direct download mutation
  adjusted download to include all comments
2018-04-24 13:43:24 -03:00
okbel 37919a11ab Adding a notification after saving 2018-04-24 13:39:13 -03:00
Clint Brown f83d6246cb Fix lint 2018-04-24 17:34:14 +10:00
Clint BrownandGitHub ea96b7b7ce Merge branch 'master' into fix-cli-user-create 2018-04-24 17:23:57 +10:00
Clint Brown a444d98733 Add missing ctx arg for CLI users create 2018-04-24 17:17:48 +10:00
okbel eaf0df9573 final refactor, done. 2018-04-24 00:45:51 -03:00
okbel 5e3fc2b22a Adding translations, en, es, more 2018-04-24 00:20:10 -03:00
okbel 1d2be0cef0 Validation finished 2018-04-23 23:56:54 -03:00
okbel 493c4689c2 as InputField 2018-04-23 23:34:16 -03:00
Kim GardnerandGitHub 51e4bcfef9 Merge pull request #1493 from coralproject/gdpr-download
[GDPR] Download My Comments
2018-04-23 14:39:18 -04:00
okbel 76ede5c541 fix for large icons, reorder of styles 2018-04-23 15:32:21 -03:00
okbel f4f0400c4d Merge branch 'gdpr-password' of github.com:coralproject/talk into gdpr-password
* 'gdpr-password' of github.com:coralproject/talk:
  Renamed nl to nlTA. Sorted ta.register calls
  Added NL translation for Moment. Also, sorted locale imports alphabetically.
2018-04-23 15:23:14 -03:00
okbel 9bb3a9f7cb changes 2018-04-23 15:22:50 -03:00
Kim GardnerandGitHub 89711b2010 Merge branch 'master' into gdpr-password 2018-04-23 12:07:52 -04:00
Kim GardnerandGitHub 61ec6c886c Merge branch 'master' into gdpr-download 2018-04-23 11:00:53 -04:00
Kim GardnerandGitHub 6dd0dd41e0 Merge pull request #1535 from sanoma/master
Fix Dutch locale for Moment.JS
2018-04-23 11:00:38 -04:00
Kim Gardner c936a6ff2c Fix typo 2018-04-23 10:59:23 -04:00
D. Luijten 18e8f9c3dc Merge branch 'hotfix/fix_dutch_moment_locale'
* hotfix/fix_dutch_moment_locale:
  Renamed nl to nlTA. Sorted ta.register calls
2018-04-23 16:47:08 +02:00
D. Luijten c103a0c481 Renamed nl to nlTA.
Sorted ta.register calls
2018-04-23 16:46:42 +02:00
okbel 21f942a219 validations 2018-04-23 11:43:40 -03:00
Kim GardnerandGitHub 89546c4066 Merge branch 'master' into master 2018-04-23 10:23:57 -04:00
okbel b5dd63aec1 Adding withChangePassword to mutations and plugins API, styles 2018-04-23 10:32:56 -03:00
okbel bc71366fd5 Frontend for Change Password 2018-04-20 18:23:46 -03:00
Wyatt JohnsonandGitHub aa80f47b1c Merge branch 'master' into gdpr-password 2018-04-20 12:03:59 -06:00
Wyatt JohnsonandGitHub 84ebd1b66f Merge branch 'master' into gdpr-download 2018-04-20 12:00:22 -06:00
Wyatt JohnsonandGitHub 2a3b8e511c Merge pull request #1496 from coralproject/organization-contact
Organization Email Contact
2018-04-20 11:58:53 -06:00
Wyatt Johnson 80f219513b fixed e2e 2018-04-20 11:39:34 -06:00
Wyatt JohnsonandGitHub 7d4102e3aa Merge branch 'master' into organization-contact 2018-04-20 10:57:47 -06:00
Wyatt Johnson 3b657e120f fix for logger 2018-04-20 10:52:03 -06:00
Wyatt JohnsonandGitHub a477af3b4f Merge branch 'master' into gdpr-download 2018-04-20 10:33:29 -06:00
Wyatt JohnsonandGitHub d4fdb20436 Merge branch 'master' into master 2018-04-20 10:31:32 -06:00
Wyatt JohnsonandGitHub 5a88fda511 Merge pull request #1537 from sanoma/fix_translation_staff
Added translation to staff label in comment stream.
2018-04-20 10:31:15 -06:00