Commit Graph

74 Commits

Author SHA1 Message Date
Kim Gardner d923857eda Merge branch 'master' into delete-modal-iphone 2018-05-25 13:36:01 -04:00
Mendel Konikov 92420ae827 Fix hr line on older devices 2018-05-23 17:42:40 -04:00
Mendel Konikov a6ec021bd1 Explicitly set opacity to 1 for iPhone 2018-05-23 17:25:09 -04:00
Kim Gardner 55998a67da Merge branch 'master' into csp 2018-05-21 16:18:46 -04:00
Kiwi 2c9d30bfd2 Small modification
Removed obsolete line and add todo
2018-05-21 17:09:36 -03:00
Kim Gardner 763833783d Merge branch 'master' into disabled-download-button 2018-05-21 15:22:51 -04:00
Kim Gardner 30f03f5fb8 Merge branch 'master' into disabled-download-button 2018-05-21 11:07:59 -04:00
Kim Gardner ced9d2ea4b Merge branch 'master' into translations-de-4.4.1 2018-05-21 11:06:17 -04:00
Wyatt Johnson 000d9ae56a Merge branch 'master' into csp 2018-05-18 15:28:26 -06:00
Mendel Konikov ffa6b99d09 Wrap els in div 2018-05-18 12:32:24 -04:00
Fabian Neumann 8ee90387f6 German translations for v4.4.1 2018-05-18 16:03:30 +02:00
Mendel Konikov 5f410276c6 Show overflow text on download comments button when disabled 2018-05-17 20:41:59 -04:00
Wyatt Johnson c84a9716a1 added support for csp 2018-05-17 18:37:50 -06:00
Mendel Konikov d83c2fd566 Only display paragraph if delete requested 2018-05-17 20:03:12 -04:00
Wyatt Johnson 95072be97e switched ejs for nunjucks 2018-05-17 15:59:49 -06:00
Mendel Konikov 2d1b675234 Update download page copy 2018-05-10 21:01:26 -04:00
okbel 0ded5c72e9 adding media 2018-05-09 14:23:22 -03:00
Wyatt Johnson 1815bd4d75 fix translation copy 2018-05-08 15:30:12 -06:00
Wyatt Johnson 7b86ec7d0a Update translations.yml 2018-05-08 12:06:52 -06:00
Wyatt Johnson 2b1108cd88 Settings Cache Refactor 2018-05-07 14:27:00 -06:00
Wyatt Johnson 413b6a2a60 Merge branch 'master' into copy-changes 2018-05-05 09:40:50 -06:00
Kim Gardner ce92765218 Swap DeletedOn and DeletedFor 2018-05-04 17:40:10 -04:00
Kim Gardner 8b5cb9d96d Copy tweaks 2018-05-04 17:36:05 -04:00
Kim Gardner 7cf991d672 Change copy 2018-05-04 17:03:22 -04:00
Wyatt Johnson fa66f07db6 standardized styles, fixed mutation bug 2018-05-03 15:58:52 -06:00
Wyatt Johnson ea71b779d2 password patches 2018-05-03 15:51:50 -06:00
Wyatt Johnson b5958d5879 fixed merge error 2018-05-03 15:45:43 -06:00
Kim Gardner 35cefd5570 Fix build fail 2018-05-03 17:42:47 -04:00
Wyatt Johnson c783d15df3 Merge branch 'master' into gdpr-email 2018-05-03 15:18:22 -06:00
Wyatt Johnson 2e7bad3508 moved settings loading into try/catch block 2018-05-03 14:57:11 -06:00
Kim Gardner 3e9d835eb2 Grammar 2018-05-03 16:37:19 -04:00
Kim Gardner d9806c0ecc Fix email subject variables 2018-05-03 16:23:47 -04:00
Kim Gardner 903b74cb31 Update email copy 2018-05-03 15:43:22 -04:00
okbel 65aa90904a Styling 2018-05-03 16:00:25 -03:00
okbel 140ef3eb5e Styling 2018-05-03 15:57:00 -03:00
okbel 467aecf0ee Merge branch 'gdpr-delete' of github.com:coralproject/talk into gdpr-delete
* 'gdpr-delete' of github.com:coralproject/talk:
  added emails around account deletion
2018-05-03 15:48:49 -03:00
okbel 10dbce55ba Updating InputField 2018-05-03 15:45:19 -03:00
okbel 6cfebb408f Updating InputField 2018-05-03 15:42:28 -03:00
Wyatt Johnson 690e6752ee added emails around account deletion 2018-05-03 12:29:05 -06:00
okbel 687d0555c8 moving mutations to /hocs folder 2018-05-03 15:18:09 -03:00
okbel bc9e76c889 Merge branch 'gdpr-delete' of github.com:coralproject/talk into gdpr-delete
* 'gdpr-delete' of github.com:coralproject/talk:
  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
  added docs
  Added TALK_ prefix to constants RECAPTCHA_WINDOW and RECAPTCHA_INCORRECT_TRIGGER
  RECAPTCHA_WINDOW and RECAPTCHA_INCORRECT_TRIGGER now can be set with env vars
2018-05-03 15:17:04 -03:00
okbel f173f495a5 moving mutations to /hocs folder 2018-05-03 15:15:58 -03:00
Kim Gardner 64cb665124 typo 2018-05-03 14:00:07 -04:00
Wyatt Johnson df29e610b3 cleaned up config as js instead of json file 2018-05-03 11:40:55 -06:00
Wyatt Johnson 20c5804559 added space 2018-05-03 11:38:23 -06:00
Wyatt Johnson 06b08756e7 added durations to configuration file 2018-05-03 11:36:34 -06:00
Kim Gardner 287cff289b Update copy to reflect ability to take action up until account is deleted 2018-05-03 13:04:05 -04:00
okbel 3b5a45ec01 translations 2018-05-03 13:45:33 -03:00
okbel f6d3f4cb14 translations 2018-05-03 13:32:52 -03:00
Wyatt Johnson 375f1bb6b1 copy fixes 2018-05-03 10:09:36 -06:00