Commit graph

2505 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
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
537a310f4c Fix stuck tooltips bug 2019-06-12 11:36:08 +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
f37bc78eaf Merge branch 'cryptDriveToolbar' into staging 2019-06-07 11:15:13 +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
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
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
a1163798de History button now close history panel when it is open in drive 2019-06-05 12:00:05 +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
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
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