ansuz
|
e22af80574
|
Merge branch 'deleteBlock' into staging
|
2021-03-04 17:23:39 +05:30 |
|
ansuz
|
d1cd310645
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2021-03-04 17:23:37 +05:30 |
|
ansuz
|
02b7ad7669
|
stop calling a function that hasn't existed for 4 months
|
2021-03-04 17:14:43 +05:30 |
|
yflory
|
54fcd3cf13
|
Fix account deletion form multiple password attempts
|
2021-03-04 12:42:46 +01:00 |
|
ansuz
|
1f61dbcc02
|
Merge branch 'staging' into deleteBlock
|
2021-03-04 17:04:17 +05:30 |
|
ansuz
|
483b9f687e
|
Merge branch 'checkup' into staging
|
2021-03-04 16:42:49 +05:30 |
|
yflory
|
da9cccca88
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2021-03-04 11:14:03 +01:00 |
|
yflory
|
3b3e06ac63
|
Fix error popup when dropping an image into oo
|
2021-03-04 11:13:10 +01:00 |
|
ansuz
|
adc2a63bd8
|
Merge pull request #647 from angdraug/pass-archivepath
Support non-writable working directory
|
2021-03-04 00:46:15 -05:00 |
|
ansuz
|
4e20639fa0
|
revert example config to current default, but provide a more detailed comment
|
2021-03-04 11:07:12 +05:30 |
|
ansuz
|
e62a378f9c
|
fix PR's whitespace
|
2021-03-04 11:01:25 +05:30 |
|
ansuz
|
561cf96c72
|
Merge branch 'main' of github.com:sisco0/cryptpad into task-migration-fix
|
2021-03-04 10:50:07 +05:30 |
|
ansuz
|
2dbbf972c9
|
Merge branch 'soon' into staging
|
2021-03-04 09:32:32 +05:30 |
|
Dmitry Borodaenko
|
f49c7221b7
|
Add decreePath to config.example.js
|
2021-03-03 11:31:08 -08:00 |
|
Dmitry Borodaenko
|
6cd2131f27
|
Pass archivePath to Store.create always
|
2021-03-03 11:31:08 -08:00 |
|
yflory
|
a6708b9abf
|
lint compliance
|
2021-03-03 18:29:32 +01:00 |
|
yflory
|
11959bef1b
|
Allow admins to reopen support tickets
|
2021-03-03 18:24:54 +01:00 |
|
yflory
|
beba9d084d
|
Open documentation when clicking on File>Help
|
2021-03-03 17:08:31 +01:00 |
|
yflory
|
b099db3ef1
|
Merge branch 'soon' into replace-help-menu
|
2021-03-03 17:05:09 +01:00 |
|
yflory
|
3808f414b6
|
Merge branch 'staging' into replace-help-menu
|
2021-03-03 16:57:29 +01:00 |
|
yflory
|
ddd0aa7195
|
lint compliance
|
2021-03-03 16:56:12 +01:00 |
|
yflory
|
e7a72896d5
|
Enable properties modal when the pad is not stored
|
2021-03-03 16:54:38 +01:00 |
|
yflory
|
a69fb1fae9
|
Disable autostore for owned pads
|
2021-03-03 16:54:25 +01:00 |
|
yflory
|
629eb48562
|
???
|
2021-03-03 16:48:25 +01:00 |
|
ansuz
|
9826a4f87d
|
Merge branch 'soon' into main
|
2021-03-03 18:16:04 +05:30 |
|
yflory
|
321f1d418f
|
Fix anonymous drive
|
2021-03-03 13:38:46 +01:00 |
|
ansuz
|
60979a1f5c
|
fix a bad copy-paste in the changelog
|
2021-03-03 17:54:58 +05:30 |
|
ansuz
|
022ecc3947
|
update changelog with final notes
|
2021-03-03 17:36:55 +05:30 |
|
ansuz
|
5a8bc88ac5
|
Merge branch 'soon' into staging
|
2021-03-03 17:02:04 +05:30 |
|
ansuz
|
5a71042568
|
remove XXX note
|
2021-03-03 17:00:28 +05:30 |
|
ansuz
|
bebb991b62
|
Merge branch 'd' into staging
|
2021-03-03 15:56:44 +05:30 |
|
ansuz
|
6f97827808
|
Merge branch 'register' into staging
|
2021-03-03 15:34:37 +05:30 |
|
ansuz
|
1ef6a96cd1
|
avoid duplicating CSP headers in production environments
|
2021-03-03 11:11:06 +05:30 |
|
ansuz
|
3c4b2ffad0
|
avoid setting headers for /api/config that will be duplicated by nginx
|
2021-03-03 09:59:04 +05:30 |
|
yflory
|
88c9589c49
|
lint compliance
|
2021-03-02 18:22:00 +01:00 |
|
yflory
|
8cc0f75f49
|
Fix user logged out after registration
|
2021-03-02 18:19:07 +01:00 |
|
yflory
|
40e9da566e
|
lint compliance
|
2021-03-02 17:48:38 +01:00 |
|
yflory
|
eb7f7aaa89
|
Delete block when deleting account
|
2021-03-02 17:47:05 +01:00 |
|
yflory
|
b0e0a8dc75
|
Add spinner to the checkup page and test websockets
|
2021-03-02 16:45:52 +01:00 |
|
yflory
|
d43cb509dc
|
Checkup: test sandbox domain and login block
|
2021-03-02 16:05:18 +01:00 |
|
David Benqué
|
9d6cc55642
|
Re-order elements in static pages navigation and footer
|
2021-03-02 11:27:49 +00:00 |
|
David Benqué
|
0ed5bb8a90
|
Minor edits to Changelog
|
2021-03-02 11:06:01 +00:00 |
|
ansuz
|
4147e8ce5e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2021-03-02 16:21:58 +05:30 |
|
ansuz
|
5afbfb6950
|
rewrite changelog with better description of changes
|
2021-03-02 16:21:40 +05:30 |
|
yflory
|
a13f4c6dfc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2021-03-02 10:45:23 +01:00 |
|
yflory
|
c70f3888e0
|
Fix spinner not removed when account deletio is canceled
|
2021-03-02 10:44:34 +01:00 |
|
ansuz
|
2d938f971e
|
prototype a replacement for the current help menu
|
2021-03-02 12:15:46 +05:30 |
|
ansuz
|
c691e6f49c
|
Merge branch 'server-index-fix' into staging
|
2021-03-02 09:00:42 +05:30 |
|
yflory
|
f77e68f1a9
|
Fix type error
|
2021-03-01 17:56:16 +01:00 |
|
yflory
|
96b2b00b24
|
Fix drive UI stuck offline
|
2021-03-01 17:55:39 +01:00 |