Commit graph

7566 commits

Author SHA1 Message Date
David Benqué
63c5fddf38 lint 2019-12-03 11:07:18 +00:00
David Benqué
2f087a392a clean up XXXes 2019-12-03 11:03:57 +00:00
David Benqué
d7b3a5ce67 adjust default avatar colors 2019-12-03 10:43:27 +00:00
David Benqué
5657793e9c use .large avatars in manage owners 2019-12-03 10:25:56 +00:00
David Benqué
26c681c3cb remove padding in prop modal
- caused a vertical scrollbar
- now constructed like the share modal (customModals inside tabs)
2019-12-03 10:11:52 +00:00
David Benqué
ee1371c8ba try to get rid of vertical scroll 2019-12-03 09:38:39 +00:00
yflory
198786ed90 Login from accounts 2019-12-03 10:37:47 +01:00
ansuz
ff67f8381b oops, I really should have linted before pushing... 2019-12-02 13:10:38 -05:00
ansuz
e7447008ce enable more mermaid modes 2019-12-02 13:08:33 -05:00
ansuz
aa6beebe6a address jquery version conflict 2019-12-02 11:56:29 -05:00
ansuz
e39257672c enable gantt chart rendering in rendered markdown 2019-12-02 11:27:13 -05:00
ansuz
308d255a25 update jquery to 2.2.4, closes #471 2019-12-02 11:11:31 -05:00
David Benqué
1da5e8ac3c usergrid avatar display and scrolling 2019-12-02 11:34:34 +00:00
yflory
d52acfa5d2 Change initial tab in the file share modal 2019-11-29 17:02:02 +01:00
yflory
e35b1712c3 Change initial tab in the share modal 2019-11-29 16:47:18 +01:00
yflory
e4231956a3 Fix integrity checks 2019-11-29 14:44:11 +01:00
yflory
71d2f8388d Rename a variable 2019-11-29 14:32:40 +01:00
yflory
cc4e6d9a1e Fix integrity checks 2019-11-29 14:30:12 +01:00
yflory
03701f02e0 Remove debug logs 2019-11-29 10:46:34 +01:00
yflory
f2363f59ca Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-28 12:47:24 +01:00
yflory
d6d92531ea Add finnish translation files 2019-11-28 12:46:12 +01:00
ansuz
d7bcb63f70 add our opencollective url to package.json for the new 'funding' api 2019-11-27 11:45:02 -05:00
yflory
8a0e0621fb Fast auth 2019-11-27 17:26:21 +01:00
yflory
3b6155ffce Change properties icon in the drive 2019-11-27 13:14:33 +01:00
yflory
50886b81da Update orgmode regex in codemirror #466 2019-11-27 11:31:49 +01:00
ansuz
1523a3107e update changelog to include 3.6.0 (GoldenFrog) 2019-11-26 17:35:26 -05:00
yflory
580731d560 Merge branch 'staging' into ooPassword 2019-11-26 16:13:41 +01:00
yflory
851437a05b Fix onlyoffice password change 2019-11-26 16:13:21 +01:00
David Benqué
66073804ee remove rounded corners on avatars 2019-11-26 11:50:34 +00:00
David Benqué
8fc08538a1 open share modal on ready 2019-11-26 11:21:58 +00:00
ansuz
b246fc73a7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 20:59:42 -05:00
ansuz
b5a05c1de3 clean up some dead code and do a quick optimizing pass 2019-11-25 20:37:04 -05:00
David Benqué
01d7d21754 Merge branch 'staging' into design_dialogs_usergrid 2019-11-25 17:05:00 +00:00
yflory
77ee1b02dc Add missing margin in usergrid 2019-11-25 17:58:33 +01:00
yflory
09fdfa2ad2 Fix usergrid UI issues 2019-11-25 17:54:22 +01:00
yflory
28308cb629 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 17:44:01 +01:00
yflory
bf6681c5e6 Better spacing between items in usergrid 2019-11-25 17:43:55 +01:00
yflory
89cff3c541 Remove invisible title in usergrid 2019-11-25 17:33:56 +01:00
ansuz
27793c6755 remove XXX 2019-11-25 11:09:54 -05:00
yflory
c1c000149b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 17:07:26 +01:00
ansuz
9efceb2234
Merge pull request #470 from xwiki-labs/design_dialogs_props
remove // XXX
2019-11-25 11:06:10 -05:00
David Benqué
53b29ced05 Merge branch 'design_dialogs' into design_dialogs_usergrid 2019-11-25 15:58:36 +00:00
David Benqué
ea79593444 Merge branch 'design_dialogs_props' into design_dialogs_usergrid 2019-11-25 15:58:27 +00:00
David Benqué
5be70f7673 remove // XXX 2019-11-25 15:56:39 +00:00
yflory
ff6de41bec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 16:54:55 +01:00
ansuz
79013b27fe
Merge pull request #469 from xwiki-labs/design_dialogs
remove // XXX
2019-11-25 10:54:49 -05:00
yflory
b9be93101e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-11-25 16:53:52 +01:00
yflory
d8df3fd034 Remove XXX 2019-11-25 16:53:47 +01:00
ansuz
a1f25d937c bump version to 3.6.0 (GoldenFrog) 2019-11-25 10:51:46 -05:00
yflory
c414bf1d5c Merge branch 'staging' into ooPassword 2019-11-25 16:51:06 +01:00