Commit Graph
1226 Commits
Author SHA1 Message Date
okbel b4e7dd54cf Merge branch 'master' of github.com:coralproject/talk into reject-username
* 'master' of github.com:coralproject/talk: (33 commits)
  apply @cvle suggestion for fix
  Take karma into account when doing e2e
  Bump version to 4.4.2
  move placeholder right behind contentEditable
  added pivotal tracker ref
  moved event handler to bundle
  Update stream.njk
  disable CSP until we can work on configuration + webpack issues
  added missing translation
  Remove redundant period. It's in the translation strings already.
  Remove redundancy
  One more missing German translation
  Add missing translations (en/de) for plugins ignore-user and local-auth.
  text-replace error
  support the __webpack_nonce__ parameter
  csp fixes
  added comment
  `karma` -> `karmaThresholds`
  name changes
  Fix Touch issues on IOS Safari (iPad)
  ...
2018-05-28 11:23:34 -03:00
Kim Gardner 6411c1cf0d Merge branch 'master' into reject-username 2018-05-25 14:16:02 -04:00
Wyatt Johnson 64c16a1805 support the __webpack_nonce__ parameter 2018-05-24 15:02:08 -06:00
Wyatt Johnson 8f51b07388 Merge branch 'master' into karma 2018-05-24 13:28:03 -06:00
Wyatt Johnson 945ab9a1b6 Added support for forcing languages 2018-05-24 12:32:06 -06:00
Belén Curcio 0f16d0a7a3 Merge branch 'master' into reject-username 2018-05-24 13:31:59 -03:00
Kim Gardner 6548df971c Merge branch 'master' into karma 2018-05-23 15:19:32 -04:00
Wyatt Johnson 10a786f84d simplified language negotiation 2018-05-22 14:21:32 -06:00
Belén Curcio 5ebbc24264 Merge branch 'master' into karma 2018-05-18 13:09:07 -03:00
Wyatt Johnson f5362f445a Merge branch 'master' into withremovetag-typo 2018-05-17 20:48:33 -06:00
Wyatt Johnson 887f7e17f4 server side 2018-05-17 11:38:00 -06:00
okbel 6444e8c2ab Karma 2018-05-17 13:48:30 -03:00
Leandro 0339e97b37 fix optimisticResponse typo 2018-05-17 16:39:04 +02:00
Wyatt Johnson 1a29f374a5 Merge branch 'master' into reject-username 2018-05-16 11:20:28 -06:00
Kim Gardner fca6603b38 Merge branch 'master' into admin-auth 2018-05-15 18:13:05 -04:00
Chi Vinh Le 5a190839d1 Show username already exists error 2018-05-14 20:44:30 +02:00
Kim Gardner 400890237c Merge branch 'master' into admin-auth 2018-05-11 18:06:53 -04:00
Wyatt Johnson 33be00a540 Added support for external signins on Admin 2018-05-10 16:44:19 -06:00
Wyatt Johnson 2e37f78705 Email Attach Fixes 2018-05-10 13:31:00 -06:00
Kim Gardner a008503b52 Merge branch 'master' into user-detail-enh 2018-05-04 09:14:06 -04:00
okbel f3a3746d6b Merge branch 'email-auth-gdpr' of github.com:coralproject/talk into email-auth-gdpr
* 'email-auth-gdpr' of github.com:coralproject/talk: (51 commits)
  JWT_Audience is listed twice in the docs under required keys
  moved settings loading into try/catch block
  Grammar
  fix
  Fix email subject variables
  Update email copy
  Styling
  Styling
  Updating InputField
  Updating InputField
  added emails around account deletion
  moving mutations to /hocs folder
  typo
  cleaned up config as js instead of json file
  added space
  added durations to configuration file
  Update copy to reflect ability to take action up until account is deleted
  translations
  copy fixes
  added email to final step
  ...
2018-05-04 09:41:22 -03:00
Kim Gardner e51736040f Merge branch 'master' into user-detail-enh 2018-05-03 20:27:16 -04:00
Wyatt Johnson c783d15df3 Merge branch 'master' into gdpr-email 2018-05-03 15:18:22 -06:00
Wyatt Johnson e9fdaa1b5a Merge branch 'master' into email-auth-gdpr 2018-05-03 15:13:13 -06:00
okbel 438c515d2f moving mutations to /hocs folder 2018-05-03 16:06:28 -03:00
okbel 8a9af89699 withUpdateEmailAddress in the plugins hoc 2018-05-03 15:12:23 -03:00
Wyatt Johnson ee0f734705 cleaned up download mutations 2018-05-03 09:13:44 -06:00
Wyatt Johnson 87d0c99558 moved hoc's into plugin 2018-05-03 08:59:26 -06:00
okbel fff6e1c231 Review changes 2018-05-03 10:24:43 -03:00
okbel 478770f6c6 Changes 2018-05-02 20:41:32 -03:00
okbel b04fc1faf8 wip 2018-05-02 18:15:04 -03:00
okbel c7db780582 Updating the cache with data from the fragment 2018-05-02 16:46:20 -03:00
Wyatt Johnson ddaa8eb858 Merge branch 'master' into gdpr-delete 2018-05-02 09:58:04 -06:00
Kim Gardner 17a63c0bf9 Merge branch 'master' into gdpr-email 2018-05-01 17:50:27 -04:00
okbel ff7ee2aefc Updating cache 2018-05-01 17:18:58 -03:00
okbel 3bb91f6833 Adding withRequestAccountDeletion, withRequestDownloadLink, withCancelAccountDeletion 2018-05-01 15:43:10 -03:00
Kim Gardner 92d32aaa8d Merge branch 'master' into user-detail-enh 2018-05-01 13:41:10 -04:00
Kim Gardner 3145411921 Merge branch 'master' into configure-enh 2018-05-01 13:23:14 -04:00
Chi Vinh Le b2988e540e Move mutation logic to coral-admin 2018-05-01 16:48:52 +02:00
Chi Vinh Le 9310a4734d Fix viewing/editing empty org contact email 2018-05-01 16:16:41 +02: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 ad342c4bb3 Catching if username cant be updated 2018-04-30 19:56:53 -03: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
Kim Gardner c60ed59a75 Merge branch 'master' into reject-username 2018-04-24 17:12:41 -04:00
Kim Gardner 89711b2010 Merge branch 'master' into gdpr-password 2018-04-23 12:07:52 -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
Kim Gardner 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