696 Commits

Author SHA1 Message Date
ansuz
24c7ce57e1 apply the fix for password change recommended by @sairim 2018-08-07 11:40:21 +02:00
Paul Libbrecht
365d17e275
Merge branch 'master' into revised-german 2018-08-03 18:01:16 +02:00
yflory
f2baaf5b5b Fix shared folders issues including disappearing folders 2018-07-20 18:28:56 +02:00
yflory
8ab786e7df Drive restore loading screen text 2018-07-19 18:49:14 +02:00
yflory
1e092f36ba Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-19 11:43:06 +02:00
yflory
ae17427e00 Shared Drive text & French translation 2018-07-19 11:42:54 +02:00
ansuz
a181c09a68 Merge branch 'soon' into staging 2018-07-18 15:56:44 +02:00
ansuz
58332a9ce3 add french translation for password change loading screen 2018-07-18 15:56:13 +02:00
ansuz
e2600e4b36 display a loading screen while users are changing their passwords 2018-07-18 15:53:12 +02:00
yflory
aafcb1bc02 Merge branch 'sharedfolder' into staging 2018-07-18 14:18:30 +02:00
yflory
08005a709e Add a share icon in the drive when displaying a shared folder 2018-07-17 16:38:20 +02:00
ansuz
ee16b3ab15 modified english translations 2018-07-17 16:07:08 +02:00
yflory
9157403946 Update French translation 2018-07-17 16:06:12 +02:00
yflory
6143bceabb Fix XXX 2018-07-17 15:38:23 +02:00
ansuz
4bf741e959 fix typo in translations 2018-07-17 14:54:54 +02:00
yflory
ecb9f039b1 Fix pad password change not reloading with the correct URL 2018-07-17 12:27:23 +02:00
ansuz
05a41ad7f1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-16 16:51:12 +02:00
ansuz
7348eca1d5 revise english translations which have been marked for review 2018-07-16 16:51:06 +02:00
yflory
930bd32f70 lint compliance 2018-07-16 16:44:25 +02:00
yflory
3830935dd9 French translation 2018-07-16 16:43:45 +02:00
ansuz
adc54434fd update english translation as prompted by german translation PR 2018-07-16 11:24:18 +02:00
ilu33
9b37d58f95
Total revision of german translation
Corrected lots of typos, grammar and incomprehensible (machine?) translation. Things can still be improved but at least most of the strangeness should be gone. I also added all strings from messages.js that were not included before.

Somebody needs to check that I did not mess up code/formatting.
2018-07-11 08:03:42 +02:00
yflory
4b86ed2dec Shared folders UI 2018-07-10 14:41:37 +02:00
ansuz
57d0738f32 Merge branch 'modern-users' into staging 2018-06-28 15:30:10 +02:00
ansuz
7aa7b82c60 merge staging 2018-06-28 13:33:54 +02:00
ansuz
c85a551546
Merge pull request #249 from xwiki-labs/de-translation-pl
Translating one extra line.
2018-06-28 13:30:23 +02:00
yflory
0160ef30b7 Fix pad password change 2018-06-25 12:08:06 +02:00
yflory
a146f6acc9 Change user account password function 2018-06-22 10:37:54 +02:00
yflory
36d1ae0f6c Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users 2018-06-20 16:39:52 +02:00
yflory
71b085ba23 Owned drive migration UI 2018-06-20 16:39:01 +02:00
yflory
a5b207d57b Password change UI 2018-06-20 10:02:56 +02:00
yflory
29f577dfc6 Improve history to load it chunk by chunk 2018-06-19 17:02:16 +02:00
yflory
54d63df1cf Ability to change the password of a pad 2018-06-14 17:18:32 +02:00
yflory
01a3c13a8c Fix CSP issues for missing files (404) 2018-06-12 15:15:46 +02:00
yflory
4304079c70 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-12 14:02:13 +02:00
yflory
f72e14b1b9 Add/fix translatons keys for the features "table" 2018-06-12 14:01:57 +02:00
ansuz
06582e06dc update markup in de translation 2018-06-12 12:03:25 +02:00
ansuz
aa51463a9a Merge branch 'soon' into staging 2018-06-12 12:00:51 +02:00
ansuz
4701a7f415 Merge branch 'features-page' into staging 2018-06-12 11:48:43 +02:00
ansuz
8def11bea3 define style by class instead of structure 2018-06-12 11:21:12 +02:00
yflory
c803b70a1a Fix translations 2018-06-11 18:24:20 +02:00
yflory
4dec2cca5c Translations for new version detected 2018-06-11 18:18:39 +02:00
ansuz
5ae7cdb1e6 add missing key for french translation 2018-06-08 14:56:11 +02:00
ansuz
b0039e35d0 add missing translation key for kanban 2018-06-08 14:38:44 +02:00
yflory
2e15d59081 Fix typo 2018-06-07 10:21:45 +02:00
yflory
8586d0c944 Merge branch 'staging' into donkey 2018-05-31 13:28:14 +02:00
yflory
ba0e000808 Add a file upload modal 2018-05-31 13:27:44 +02:00
yflory
fe202a92b4 Fix UI issues in kanban 2018-05-30 15:15:50 +02:00
yflory
3af997db2b Kanban translation 2018-05-30 10:36:26 +02:00
yflory
66655b4a23 Upload a file with a password 2018-05-28 17:50:28 +02:00