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

4345 commits

Author SHA1 Message Date
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
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
ClemDee
634b051d42 Add expand/collapse all feature in drive tree 2019-06-13 11:51:38 +02:00
yflory
fc9a438f27 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-13 11:18:10 +02:00
yflory
dd7fc83867 Store the blob metadata the first time 2019-06-13 11:17:43 +02:00
ClemDee
73c2964241 Update collapsed folders when renaming/moving/deleting folder in Drive 2019-06-12 17:38:48 +02:00
ClemDee
3a2dd5e0a8 Renaming current folder now keep current folder opened 2019-06-12 15:46:42 +02:00
ClemDee
537a310f4c Fix stuck tooltips bug 2019-06-12 11:36:08 +02:00
ClemDee
21300bb030 Add temporary folder custom color in drive 2019-06-11 17:44:36 +02:00
ClemDee
b546dd4033 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-07 16:05:57 +02:00
ClemDee
63cb8e8f66 Fix chat history bug in other workers 2019-06-07 16:04:52 +02:00
yflory
02c765b085 lint compliance 2019-06-07 15:50:00 +02:00
yflory
73e068dacc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-07 15:48:44 +02:00
ClemDee
d924cee747 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-07 15:47:29 +02:00
ClemDee
f6cc3aa8c3 Fix bug chat history not deleted 2019-06-07 15:43:24 +02:00
yflory
23e48a6b4f Fix messenger unable to send messages 2019-06-07 13:44:52 +02:00
yflory
32a3ed6842 Make the clickable area to dismiss notifications bigger 2019-06-07 11:47:50 +02:00
yflory
e77207dfee Merge remote-tracking branch 'origin/padsTheme' into staging 2019-06-07 11:23:26 +02:00
yflory
db84b41225 Merge branch 'shareModal' into staging 2019-06-07 11:16:41 +02:00
yflory
dab63c70c2 Merge branch 'cryptDriveTree' into staging 2019-06-07 11:15:35 +02:00
yflory
f37bc78eaf Merge branch 'cryptDriveToolbar' into staging 2019-06-07 11:15:13 +02:00
yflory
473cbcd1b6 Fix drive toolbar new line bug 2019-06-07 11:13:46 +02:00
yflory
770af27b02 Merge branch 'cryptDriveToolbar' of github.com:xwiki-labs/cryptpad into cryptDriveToolbar 2019-06-07 11:05:32 +02:00
yflory
26ef1e5769 Fix infinite loop when trying to display an invalid category in the drive 2019-06-07 11:05:15 +02:00
ClemDee
639407056a Fix toolbar collapse for shared folders 2019-06-07 10:55:54 +02:00
yflory
60a8fb3932 Merge branch 'soon' into staging 2019-06-06 16:50:20 +02:00
yflory
ae9caecc52 fix race condition 2 2019-06-06 15:40:08 +02:00
yflory
62c96d562f Fix race condition with nthen 2019-06-06 15:33:08 +02:00
ClemDee
16477bd15b Fix toolbar collapse in drive 2019-06-06 11:41:35 +02:00
yflory
b7b64a7c90 Disable friend migration while testing on alpha 2019-06-06 11:35:14 +02:00
yflory
b35be86145 Bump drive version after migration 2019-06-06 11:22:51 +02:00
ClemDee
6302d9a730 Allow user to change theme in slide 2019-06-06 10:45:02 +02:00
yflory
2a1502a25e lint compliance 2019-06-05 18:25:00 +02:00
yflory
9b5104c59e Update the friends when changing the username or avatar 2019-06-05 18:23:15 +02:00
yflory
250d9f3bc6 Fix friend migration and handle UPDATE_DATA mails 2019-06-05 16:05:00 +02:00
yflory
592544819e Fix unfriend bug 2019-06-05 15:32:32 +02:00
ClemDee
dc7f397072 Add language overview on hover 2019-06-05 15:08:24 +02:00
ClemDee
3dbced46f1 Add theme overview on hover 2019-06-05 14:28:06 +02:00
ClemDee
8a9f60e477 Fix tree panel resizing on mobile resolution 2019-06-05 12:22:15 +02:00
ClemDee
a1163798de History button now close history panel when it is open in drive 2019-06-05 12:00:05 +02:00
ClemDee
0c66c19466 Add pathname collapse for long path in drive 2019-06-05 10:36:58 +02:00
yflory
6de97cac14 Migrate friends 2019-06-04 18:44:55 +02:00
yflory
38c3ca9f54 Fix UI issues 2019-06-04 17:13:19 +02:00
yflory
a3a2c92c0c Share a pad, a file or a folder with friends 2019-06-04 16:19:47 +02:00
yflory
c154d020b2 Share with friends from sframe and drive 2019-06-04 15:57:39 +02:00
yflory
41c3b38a11 lint compliance 2019-06-04 11:23:38 +02:00
yflory
39d2496330 Implement UI to share a pad with a friend 2019-06-04 11:22:38 +02:00
ansuz
5e62cc2245 Merge branch 'soon' into staging 2019-06-03 17:24:39 +02:00
yflory
eb12178fe7 Notifications in the admin panel 2019-06-03 11:58:49 +02:00
yflory
8e7858e6ae New share modal in all the apps 2019-06-03 11:57:55 +02:00
yflory
2513f33aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-03 11:31:19 +02:00
yflory
8f2596f722 Catalan translation 2019-06-03 11:31:12 +02:00
Weblate
3ead07a6d4 Translated using Weblate (Spanish) 
Currently translated at 60.5% (588 of 972 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/es/
 2019-06-03 09:24:56 +00:00
Weblate
fd9fcaa964 Translated using Weblate (Russian) 
Currently translated at 40.2% (391 of 972 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
 2019-06-03 09:24:56 +00:00
ClemDee
ffca6417a8 Add path feedback on hover 2019-06-03 11:12:26 +02:00
ClemDee
54030da485 Add Telugu json file 2019-06-03 10:59:37 +02:00
yflory
fb0827107b Secure share modal 2019-05-29 19:00:20 +02:00
ClemDee
bfba5ff33b Add chat scroll to bottom when opening it 2019-05-29 12:22:18 +02:00
ClemDee
62eb623f49 Fix Chat scroll bug (issue #374) 2019-05-29 10:19:42 +02:00
yflory
9aceb339ef Update UI for pending friend request 2019-05-28 14:38:13 +02:00
yflory
d317053db4 Increase tab/worker timeout value 2019-05-28 14:14:09 +02:00
yflory
728c2716b4 Merge branch 'unfriend' into staging 2019-05-28 10:59:02 +02:00
yflory
cc44fe846a Update userlist when receiving unfriend 2019-05-28 10:56:13 +02:00
Weblate
8890fd2ce2 Translated using Weblate (Russian) 
Currently translated at 37.9% (368 of 972 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ru/
 2019-05-28 08:40:56 +00:00
Weblate
bad136fee5 Translated using Weblate (German) 
Currently translated at 100.0% (972 of 972 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2019-05-28 08:40:56 +00:00
yflory
9d8433d104 Unfriend via mailbox 2019-05-27 18:58:35 +02:00
yflory
5512d1fab7 Remove test code 2019-05-27 17:55:28 +02:00
yflory
2e96f13d0c lint compliance 2019-05-27 17:52:49 +02:00
yflory
c3e9b51f76 Realtime update of the friendship status in the profile 2019-05-27 17:51:55 +02:00
yflory
6370c0eeae Update the profile page when receiving a answer for a friend request 2019-05-27 16:03:10 +02:00
yflory
36aa07adab Fix friend request from profile 2019-05-27 15:57:10 +02:00
yflory
61161c034c Fix profile not updating the user name 2019-05-27 15:45:26 +02:00
yflory
8641eca34b Fix bad translation key in profile 2019-05-27 15:33:40 +02:00
yflory
28c8834fa4 Remove the 'enablePinning' config property 2019-05-27 15:29:36 +02:00
yflory
bf0fd64a70 lint compliance 2019-05-27 15:07:11 +02:00
yflory
ccff67cf42 Fix missing name in notifications 2019-05-27 15:06:30 +02:00
yflory
727470d9ed Add missing file 2019-05-27 14:59:08 +02:00
yflory
6404e5c430 Fix duplicate notications 2019-05-27 14:03:15 +02:00
yflory
8dd557a0f6 Remove the ACCEPT or DECLINE friend request messages instantly 2019-05-27 11:18:53 +02:00
yflory
d514854724 Fix undefined name 2019-05-24 17:50:40 +02:00
Weblate
48b6df2120 Translated using Weblate (French) 
Currently translated at 100.0% (972 of 972 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
 2019-05-24 15:47:13 +00:00
Weblate
4a407809aa 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% (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/
 2019-05-24 15:47:13 +00:00
yflory
6f520dae77 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-05-24 17:45:13 +02:00
yflory
df7a2f35fb Profile refactoring with friend request 2019-05-24 17:45:03 +02:00
Weblate
e265f5ec70 Translated using Weblate (German) 
Currently translated at 98.7% (957 of 970 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
 2019-05-24 14:43:15 +00:00
Weblate
efceb0940a Translated using Weblate (French) 
Currently translated at 100.0% (970 of 970 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
 2019-05-24 14:43:14 +00:00
Weblate
7ccb73cc6f 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/

Translated using Weblate (English)

Currently translated at 100.0% (967 of 967 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
 2019-05-24 14:43:14 +00:00
yflory
64b0a8c5e3 Re-join the mailboxes channels when reconnecting 2019-05-24 10:29:42 +02:00
yflory
ac5060d5dd Fix incorrect message when declining a friend request 2019-05-24 10:29:00 +02:00
yflory
e1b8d0bc6c Fix friend request issue 2019-05-23 16:13:51 +02:00
yflory
cb16a2e7e4 Notifications in the contacts app 2019-05-23 16:12:39 +02:00
yflory
5331eebb3e Enable notifications everywhere 2019-05-23 16:09:04 +02:00
yflory
4240d1c0d5 Fix empty username when declining a friend request 2019-05-23 16:02:21 +02:00
yflory
caf36cb3bf lint compliance 2019-05-23 15:51:50 +02:00