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 |
|
ansuz
|
2337fbdc6b
|
update chainpad-server dependency
|
2019-06-06 15:51:48 +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
|
a2997c4d53
|
Fix cursor to pointer on theme/language buttons in pads
|
2019-06-06 10:47:07 +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 |
|
ansuz
|
1e1edf922c
|
Merge branch 'soon' into staging
|
2019-06-05 15:18:12 +02:00 |
|
ansuz
|
5477b83865
|
Merge branch 'master' into soon
|
2019-06-05 15:18:01 +02:00 |
|
ClemDee
|
e52acda334
|
Set cursor to pointer on help-close element in pads
|
2019-06-05 15:12:42 +02:00 |
|
ansuz
|
8d38f144b0
|
update ws dependency
|
2019-06-05 15:10:26 +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
|
5640d41b79
|
add missing file
|
2019-06-04 16:58:21 +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 |
|
ansuz
|
e7b65c5fca
|
remove duplicated word
|
2019-06-04 14:20:13 +02:00 |
|
ansuz
|
416a4a2446
|
address some issues in the readme's team section
|
2019-06-04 14:17:34 +02:00 |
|
Ludovic Dubost
|
36228c0479
|
Updated team and contributing section
Updated readme with a team section and an updated contributing section
|
2019-06-04 14:10:25 +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 |
|
ansuz
|
4c18289b40
|
Merge pull request #347 from BundesIT/slim-docker
optimize Dockerfile
|
2019-06-03 17:23:56 +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 |