blitzwing/cryptpad
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
6328 commits 72 branches 132 tags 541 MiB
Commit graph

6328 commits

This branch
This branch
All branches
Author SHA1 Message Date
ClemDee
7bfb62d5ae Fix default color check in palette 2019-06-19 14:35:56 +02:00
ClemDee
0d3a9b5e40 Please jslint 2019-06-19 14:21:26 +02:00
ClemDee
76e2f63c5a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-19 14:06:14 +02:00
ClemDee
dd9959b264 Don't collapse folders after moving 2019-06-19 14:05:53 +02:00
ansuz
0cb3a13aca lint compliance 2019-06-19 12:10:14 +02:00
ansuz
b59969f48b archive channels at expiration time if configured to prefer archiving 2019-06-19 11:52:20 +02:00
ClemDee
e0a79928f4 Change color picker to palette 2019-06-19 11:47:32 +02:00
yflory
46ed3e5e98 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-18 17:25:23 +02:00
Weblate
f434233288 Translated using Weblate (German) 
Currently translated at 100.0% (980 of 980 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/

Translated using Weblate (German)

Currently translated at 100.0% (978 of 978 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2019-06-18 15:25:04 +00:00
yflory
c9b139313b Make drive drag&select more responsive 2019-06-18 17:22:19 +02:00
ClemDee
1901127534 Fix palette icon of context menu in drive 2019-06-18 16:55:42 +02:00
yflory
2c661310c7 Merge branch 'staging' into foldersColor 2019-06-18 15:36:22 +02:00
yflory
7c15076300 Merge branch 'staging' into cryptDriveTree 2019-06-18 14:34:22 +02:00
yflory
b0ef3d6021 Fix UI issues with the new share modal and notifications 2019-06-18 14:23:48 +02:00
yflory
a43fc5efef Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-18 12:06:32 +02:00
Weblate
30a884b80a Update translation files 
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/

Translated using Weblate (Spanish)

Currently translated at 61.5% (598 of 972 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
 2019-06-18 10:06:19 +00:00
Weblate
a2ebe43085 Update translation files 
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
 2019-06-18 10:06:19 +00:00
Weblate
a82377c18f Update translation files 
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
 2019-06-18 10:06:19 +00:00
Weblate
e4e9c1d30b Update translation files 
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
 2019-06-18 10:06:19 +00:00
Weblate
ea2c5014fc Update translation files 
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/

Translated using Weblate (Italian)

Currently translated at 46.1% (448 of 972 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
 2019-06-18 10:06:19 +00:00
Weblate
22931155ae Update translation files 
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
 2019-06-18 10:06:19 +00:00
Weblate
162dcae910 Translated using Weblate (German) 
Currently translated at 98.9% (967 of 978 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
 2019-06-18 10:06:19 +00:00
Weblate
e584b1ae93 Translated using Weblate (French) 
Currently translated at 100.0% (978 of 978 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/

Update translation files

Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/
 2019-06-18 10:06:18 +00:00
Weblate
c6191616da Translated using Weblate (English) 
Currently translated at 100.0% (978 of 978 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (977 of 977 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (976 of 976 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (975 of 975 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (974 of 974 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (973 of 973 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (972 of 972 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (971 of 971 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (970 of 970 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (969 of 969 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (968 of 968 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
 2019-06-18 10:06:18 +00:00
Weblate
9bded76873 Update translation files 
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/

Translated using Weblate (Catalan)

Currently translated at 50.0% (486 of 972 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ca/
 2019-06-18 10:06:18 +00:00
yflory
0df7cd67a9 Fix translation key 2019-06-18 12:06:17 +02:00
yflory
1f5eb66fe0 Merge branch 'soon' into staging 2019-06-18 11:27:57 +02:00
yflory
eaa389fcb8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-18 11:10:56 +02:00
yflory
07775d6e13 Use shared folders events to pin and unpin pads 2019-06-18 11:10:46 +02:00
ClemDee
e9598de655 Add folder metadata and folder color 2019-06-18 10:44:27 +02:00
yflory
04d8578f4e Shared folder history 2019-06-17 14:13:06 +02:00
yflory
ba877ba459 Display the channel ID of a shared folder to be able to restore it 2019-06-14 14:12:43 +02:00
ansuz
d19b704bb8 fix an inverted boolean 2019-06-14 13:38:09 +02:00
ansuz
f5a2627d86 implement script to diagnose conflicts between the production database and the archive 2019-06-14 11:48:15 +02:00
ansuz
1e5248ff9d implement methods for checking if a file exists in the database or the archive 2019-06-14 11:38:16 +02:00
ansuz
13738abc03 remove an incorrect comment 2019-06-14 11:37:34 +02:00
ansuz
7b8ac3d8c8 Merge branch 'soon' into staging 2019-06-14 10:45:25 +02:00
yflory
3e4ee75137 Fix race condition with pins 2019-06-14 10:03:52 +02:00
ansuz
58cee9e13d remove an XXX because the code looks safe 2019-06-13 16:48:12 +02:00
ansuz
a2c8ec963c archive files deleted by 'removeOwnedChannel' if the admin has configured that behaviour 2019-06-13 16:44:27 +02:00
ansuz
6aa6b706a4 don't release until you think about this XXX a bit more 2019-06-13 16:36:22 +02:00
ansuz
ac3a58cc38 fix a deadlock by returning the lock after clearing ephemeral channels 2019-06-13 15:03:36 +02:00
ansuz
a2eee153b1 Merge branch 'soon' into staging 2019-06-13 12:24:00 +02:00
ansuz
ddf4a6a784 pass the correct path to 'listChannels' for 'listArchivedChannels' 2019-06-13 12:16:23 +02:00
ansuz
7e455e6fce drop unnecessary code, restore instead of remove archived files in restoration script, change restore archived name 2019-06-13 12:16:23 +02:00
ansuz
cb0c4ee944 don't continue iterating in listChannels until a the current task has called back 2019-06-13 12:16:23 +02:00
ansuz
2605d27e3f fix a completely wrong function signature 2019-06-13 12:16:23 +02:00
ansuz
5a1c25a0df fix a race condition, shutdown the log when you're done 2019-06-13 12:16:23 +02:00
ansuz
c0d908af4d implement 'unarchiveChannel' 2019-06-13 12:16:23 +02:00
ansuz
4fd490f07f leave some notes for later 2019-06-13 12:16:23 +02:00