Commit graph

7910 commits

Author SHA1 Message Date
ansuz
50ea551b36 Merge branch 'staging' into trim-history 2020-01-16 14:26:43 -05:00
ansuz
66c857d61e tiny optimization which saves a little bit of memory usage for a little bit of time 2020-01-16 14:26:23 -05:00
ansuz
9de073c269 finally get around to reorganizing the messiest part of history keeper 2020-01-16 14:26:12 -05:00
ansuz
8c5c643a25 finally get around to reorganizing the messiest part of history keeper 2020-01-16 14:25:00 -05:00
ansuz
4418f6a113 tiny optimization which saves a little bit of memory usage for a little bit of time 2020-01-16 14:24:07 -05:00
David Benqué
d1b8d8668e linting 2020-01-16 16:59:31 +00:00
yflory
cbe407084d Remove XXX 2020-01-16 17:57:25 +01:00
yflory
cb6f0513a2 Fix extension selector in pad export 2020-01-16 17:51:02 +01:00
yflory
47768112b4 Merge branch 'staging' into communities-oo 2020-01-16 14:52:37 +01:00
yflory
b80d3cf24f Ability to provide a dropdown container to a text input. Applied to framework export. 2020-01-16 14:52:04 +01:00
yflory
9db30aff1f Improve UI 2020-01-16 13:33:19 +01:00
yflory
663fa9b474 Fix race condition with images 2020-01-16 12:59:18 +01:00
yflory
50a039b40b Hide unused tabs 2020-01-16 11:41:07 +01:00
yflory
b14f6e4030 Fix image upload 2020-01-16 11:35:17 +01:00
yflory
9abeada1f0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-01-16 10:45:15 +01:00
ansuz
6a52b97cd8 Merge branch 'staging' into trim-history 2020-01-15 15:46:35 -05:00
ansuz
ff40538ee7 sketch our two new RPCs for trimming history 2020-01-15 15:11:45 -05:00
ansuz
15ca855f22 start using the scheduler for all relevant database methods
...and describe the rationale for using particular scheduler semantics
2020-01-15 15:09:30 -05:00
ansuz
7072fe4fa4 implement and test a complex constrained scheduler 2020-01-15 13:32:52 -05:00
yflory
9e1f49c177 Enable spreadsheets for anonymous users 2020-01-15 15:33:52 +01:00
yflory
aa27eabff1 lint compliance 2020-01-14 14:41:43 +01:00
yflory
a1a2e6659e retab + jshint 2020-01-14 14:33:44 +01:00
yflory
4e537e6ddc retab 2020-01-14 14:04:26 +01:00
ansuz
ccf123337d
Merge pull request #488 from Craeckie/master
Added missing curl
2020-01-13 12:57:17 -05:00
David Benqué
33fe090dcf Merge branch 'bar' into staging 2020-01-13 16:32:07 +00:00
David Benqué
332f9e37aa Merge remote-tracking branch 'origin/bar' into bar 2020-01-13 16:29:29 +00:00
David Benqué
9e9a2dafaa fix warning paragraph spacing 2020-01-13 16:29:09 +00:00
yflory
884350f8f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-01-13 17:07:39 +01:00
yflory
bd90df9d1e Merge branch 'bar' into staging 2020-01-13 17:07:12 +01:00
yflory
e5865f8653 Merge branch 'bar' of github.com:xwiki-labs/cryptpad into bar 2020-01-13 17:06:59 +01:00
yflory
d02092eb76 Fix cache and storage issues in share and filepicker iframes 2020-01-13 17:06:49 +01:00
yflory
73af078e4a Hide share modal when pad is deleted 2020-01-13 16:44:11 +01:00
ansuz
47fdf9de9f add a note to fix some odd behaviour 2020-01-13 10:32:31 -05:00
ansuz
c89595c7bb handle all the simple cases where operations on channels should be queued 2020-01-13 10:32:06 -05:00
ansuz
10eed5c46d drop unmaintained flow annotations 2020-01-13 10:28:28 -05:00
David Benqué
df03ddcca0 temporary translation keys 2020-01-13 15:26:57 +00:00
yflory
1e6e9fd288 Remove deleted pad from the drive 2020-01-13 15:58:46 +01:00
yflory
09da8ac6a2 Warn the owners when deleting a BAR pad 2020-01-13 15:11:45 +01:00
David Benqué
ba43bb9f07 adjust font size of password 2020-01-13 12:05:41 +00:00
David Benqué
e3aa814c0a style of loading screen messages and password form 2020-01-13 10:53:48 +00:00
David Benqué
ddb204def4 Change temporary text 2020-01-13 10:32:22 +00:00
root
2116e46cdd Added missing curl 2020-01-11 13:45:24 +01:00
ansuz
b5b3e99e56 use correct function signature for Pinned.load 2020-01-10 12:29:57 -05:00
ansuz
3ff753d1e9
Merge pull request #486 from promasu/master
Update Node to v12 in Dockerfile
2020-01-10 11:29:58 -05:00
yflory
9f8f6399d8 Add finnish translation 2020-01-10 16:16:11 +01:00
Adrian Nöthlich
145d0c1d79 Update Node to v12 in Dockerfile
Signed-off-by: Adrian Nöthlich <git@promasu.tech>
2020-01-10 16:00:12 +01:00
yflory
bdd338902b Hide radio buttons in share modal when no contacts 2020-01-10 15:53:02 +01:00
David Benqué
f1d1690cf8 access rights buttons 2020-01-10 13:11:16 +00:00
David Benqué
7042b9c2d7 style loading screen message 2020-01-10 13:07:52 +00:00
David Benqué
5ee12f8da7 hard coded keys for testing 2020-01-10 13:07:31 +00:00