Commit Graph

9459 Commits

Author SHA1 Message Date
okbel bd21d9a1a1 fix b 2018-05-01 14:19:43 -03:00
Kim Gardner 9c809f99c5 Merge branch 'master' into gdpr-email 2018-05-01 12:51:05 -04:00
Kim Gardner 71cdd146fa Merge pull request #1554 from coralproject/change-config-tab-copy
Update copy for stream Configure tab
2018-05-01 11:39:33 -04:00
Andrew Losowsky 8d1d96884e small wording change
changed 'Customize' for 'Change' (more plain English)
2018-05-01 09:08:58 -04:00
okbel bbd02dda81 Finished with crossed steps 2018-04-30 23:14:47 -03:00
okbel f5563c80b1 Merge branch 'gdpr-username' of github.com:coralproject/talk into gdpr-email
* 'gdpr-username' of github.com:coralproject/talk:
  ChangeUsername instead of setUsername
2018-04-30 22:04:18 -03:00
okbel 4cd7ad9c33 ChangeUsername instead of setUsername 2018-04-30 20:20:58 -03:00
okbel 227e52c16e Merge branch 'gdpr-username' of github.com:coralproject/talk into gdpr-email
* 'gdpr-username' of github.com:coralproject/talk:
  Adding translations
  Catching if username cant be updated
  fixes for tests
  fixed tests
  Fixed bug in mutation
2018-04-30 20:14:15 -03:00
okbel 5dbf379bde Merge branch 'gdpr-username' of github.com:coralproject/talk into gdpr-username
* 'gdpr-username' of github.com:coralproject/talk:
  fixes for tests
  fixed tests
2018-04-30 20:04:09 -03:00
okbel cdb392cd0e Adding translations 2018-04-30 20:03:01 -03:00
okbel ad342c4bb3 Catching if username cant be updated 2018-04-30 19:56:53 -03:00
Kim Gardner 4212f0b014 Update copy 2018-04-30 18:22:35 -04:00
Wyatt Johnson b42d325cb0 fixes for tests 2018-04-30 16:13:48 -06:00
Wyatt Johnson 7a0c9c85bc fixed tests 2018-04-30 15:59:35 -06:00
Wyatt Johnson 31f0cb12b3 Fixed bug in mutation 2018-04-30 15:43:12 -06:00
Wyatt Johnson 457f305062 Merge branch 'master' into gdpr-email 2018-04-30 14:10:52 -06:00
Kim Gardner b31b01bc50 Merge branch 'master' into gdpr-username 2018-04-30 16:01:58 -04:00
Kim Gardner 743327a53b Merge pull request #1543 from coralproject/remove-profile-settings-refs
Remove refs to talk-plugin-profile-settings
2018-04-30 16:01:35 -04:00
okbel 691bfa4e30 Passing Dialog content 2018-04-30 16:53:05 -03:00
okbel 58108f257f Addin g withUpdateEmailAddress 2018-04-30 16:28:08 -03:00
Wyatt Johnson ec8f42496d Merge branch 'master' into remove-profile-settings-refs 2018-04-30 13:21:04 -06:00
okbel 35e8c005f3 WIP: Steps 2018-04-30 16:20:09 -03:00
Wyatt Johnson a5f94360b3 Merge pull request #1546 from jerodb/plugin-auth-translation
Added translation for the talk-plugin-auth's password error
2018-04-30 13:18:46 -06:00
okbel 1574dabd69 Merge branch 'gdpr-email' of github.com:coralproject/talk into gdpr-email
* 'gdpr-email' of github.com:coralproject/talk:
  fixed typo
  nightwatchjs.org doesn't support HTTPS
  added viewing and sorting spanish translations
  Added email.password_reset.subject translation
2018-04-30 16:04:44 -03:00
okbel be86b70b24 WIP: Steps 2018-04-30 16:01:35 -03:00
Belén Curcio 05a6399638 Merge branch 'master' into gdpr-email 2018-04-30 15:44:46 -03:00
Belén Curcio dbb9686074 Merge branch 'master' into remove-profile-settings-refs 2018-04-30 14:45:14 -03:00
Kim Gardner 4e10a23ad0 Merge branch 'master' into plugin-auth-translation 2018-04-30 13:43:57 -04:00
Kim Gardner e48f07f4dd Merge pull request #1548 from jerodb/password_reset-subject-translation
Added translation for email's subject
2018-04-30 13:19:27 -04:00
Kim Gardner 1143f74ba8 Merge branch 'master' into password_reset-subject-translation 2018-04-30 12:58:54 -04:00
Kim Gardner bc5a045886 Merge pull request #1549 from jerodb/viewing-sorting-translations-es
Changed spanish translations for the viewing options list
2018-04-30 12:58:20 -04:00
okbel 8df9a1e66e wip 2018-04-30 13:47:15 -03:00
Kim Gardner 4130ad5217 Merge branch 'master' into viewing-sorting-translations-es 2018-04-30 12:43:48 -04:00
Wyatt Johnson 1e8c3de221 Merge pull request #1550 from theel0ja/patch-1
nightwatchjs.org doesn't support HTTPS
2018-04-30 10:23:55 -06:00
Kim Gardner fdf5ca1d7a Merge branch 'master' into patch-1 2018-04-30 11:15:36 -04:00
Kim Gardner 612230ad0c Merge pull request #1551 from theel0ja/patch-2
fixed typo
2018-04-30 11:15:03 -04:00
okbel e67d68267c Adding Change Email 2018-04-29 22:00:42 -03:00
okbel 9419b67fff Merge branch 'gdpr-username' of github.com:coralproject/talk into gdpr-email
* 'gdpr-username' of github.com:coralproject/talk: (36 commits)
  performing mutation
  Spanish translations
  More translations
  No empty username, no same username
  Decrease font-size and padding in Flag Comment popup a bit.
  Translations
  Adding translations
  Adding translations
  InputField refactor
  wip more validations
  Full functionality, needs translation
  Adding Dialog, styles and more
  Use email vs e-mail
  Small fix
  Adding withChangeUsername to plugin hocs, wip and more
  Introducing profileHeader slot
  Adding a notification after saving
  Fix lint
  Add missing ctx arg for CLI users create
  final refactor, done.
  ...
2018-04-29 20:29:54 -03:00
Elias Ojala edbd21f25f fixed typo 2018-04-28 23:02:29 +03:00
Elias Ojala f42e9dab4c nightwatchjs.org doesn't support HTTPS 2018-04-28 12:27:15 +03:00
Jero 90c235d9d1 Added the password error translation 2018-04-27 10:52:38 -03:00
Jero 3dbe59fd27 Translation for talk-plugin-auth password_error added 2018-04-27 10:25:59 -03:00
Jero 885f186e39 added viewing and sorting spanish translations 2018-04-26 19:19:06 -03:00
Kim Gardner 12d48d6248 Merge branch 'master' into gdpr-username 2018-04-26 18:02:13 -04:00
Jero 878cbb9195 Added email.password_reset.subject translation 2018-04-26 18:35:45 -03:00
okbel a7e09352ef performing mutation 2018-04-26 18:09:27 -03:00
okbel 0a0bbbb3ce Spanish translations 2018-04-26 17:55:44 -03:00
okbel ad5c51c486 More translations 2018-04-26 17:53:02 -03:00
okbel ab02b1b6ca No empty username, no same username 2018-04-26 17:00:08 -03:00
Kim Gardner 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