Commit graph

8614 commits

Author SHA1 Message Date
yflory
9c5f0c0d6f Use rgba instead of #RRGGBBAA for the author markers 2020-04-16 10:36:51 +02:00
yflory
7890342ae1 Add cba hint 2020-04-15 16:49:38 +02:00
yflory
fd2ee0fced Add comment 2020-04-15 16:23:36 +02:00
yflory
94c9e47d32 Remember the state of cba per user in their owned pads 2020-04-15 15:36:37 +02:00
yflory
87fc1f8daf Show/hide and enable/disable cba 2020-04-15 15:20:04 +02:00
yflory
88760fde6a Clean the code 2020-04-15 13:27:25 +02:00
yflory
d41c362d46 Fix more errors after ot 2020-04-14 17:11:47 +02:00
yflory
a70233d492 Fix OT errors 2020-04-10 14:41:51 +02:00
yflory
62fde59a89 temp 2020-04-09 16:06:04 +02:00
yflory
cba8f5fce6 Merge branch 'staging' into stoppegp-code-authorcolors-PR 2020-04-08 17:03:30 +02:00
yflory
ee3adccafc Merge branch 'code-authorcolors-PR' of https://github.com/stoppegp/cryptpad into stoppegp-code-authorcolors-PR 2020-04-08 17:03:09 +02:00
ansuz
7fac997e93 increase some file storage timeouts related to streams 2020-04-08 09:38:48 -04:00
ansuz
95965c1dee keep a parallel implementation of the pin loader to validate the new one 2020-04-07 20:03:41 -04:00
stoppegp
272c1007db authorcolor storage optimizations 2020-04-07 20:49:36 +02:00
stoppegp
56031a5c14 authorcolor storage optimization, add undefined checks before access, code styling 2020-04-07 20:30:55 +02:00
stoppegp
79325b8cca bugfix authorcolors: wrong end position on multiline edit 2020-04-07 19:07:12 +02:00
stoppegp
5f7bc9fca5 fix remove author color button when nothing is selected 2020-04-07 17:14:57 +02:00
stoppegp
8696ecc692 add 'remove authorcolors' button 2020-04-07 16:52:38 +02:00
stoppegp
45b5eb7cac add basic author colors to code app 2020-04-07 16:08:28 +02:00
ansuz
dca2707ae3 guard against incorrect types in /auth/ 2020-04-07 09:45:21 -04:00
yflory
e5bcaeedce Fix regression in the access modal 2020-04-07 15:38:16 +02:00
ansuz
e1069b0abb 3.15.0 changelog 2020-04-06 20:02:33 -04:00
ansuz
2e290a6667 last minute fixes and notes 2020-04-06 18:21:07 -04:00
ansuz
a57bf94058 remove XXX note 2020-04-06 11:31:31 -04:00
ansuz
9ef755c07b update minor version and codename 2020-04-06 11:26:34 -04:00
yflory
a834d653aa Fix download button size in mediatag preview 2020-04-06 16:48:42 +02:00
David Benqué
bee2a44c5a Merge remote-tracking branch 'origin/staging' into staging 2020-04-06 15:43:21 +01:00
David Benqué
f95c385c82 filepicker button 2020-04-06 15:42:26 +01:00
David Benqué
e1be241406 filepicker thumbnail style 2020-04-06 15:42:14 +01:00
ansuz
7434c344f5 Merge branch 'soon' into staging 2020-04-06 10:29:19 -04:00
ansuz
7027033ed1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-06 10:29:01 -04:00
Weblate
3f126f1bec Translated using Weblate (German)
Currently translated at 100.0% (1246 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-04-06 16:27:15 +02:00
Weblate
6ea958c7bd Translated using Weblate (Finnish)
Currently translated at 72.2% (899 of 1246 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fi/
2020-04-06 16:27:15 +02:00
yflory
f5de72dcb2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-06 16:27:12 +02:00
yflory
15d86c9bd1 Merge branch 'pcs' into staging 2020-04-06 16:26:38 +02:00
yflory
8370f3121c Remove XXX 2020-04-06 16:26:29 +02:00
ansuz
d802173325 remove an invalid line 2020-04-06 10:18:11 -04:00
ansuz
90518224fe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-04-06 10:16:12 -04:00
ansuz
5196440e65 guard against a typeError when httpSafeOrigin is not defined 2020-04-06 10:16:02 -04:00
yflory
3aefc3a893 Fix icon size in the new pad modal 2020-04-06 16:13:51 +02:00
yflory
0f21f3118b Fix lightbox errors 2020-04-06 16:00:01 +02:00
yflory
c29b7d3389 Fix reference error 2020-04-06 15:52:13 +02:00
yflory
20111e8416 Drop support for external URL as avatar 2020-04-06 13:22:56 +02:00
yflory
9da47ebac9 lint compliance 2020-04-06 13:22:22 +02:00
yflory
033b784576 Add max file size in whiteboard 2020-04-06 13:21:08 +02:00
yflory
175ee492a5 Merge branch 'staging' into lightbox 2020-04-06 11:43:13 +02:00
yflory
35394476a6 Improve scrollbars and modal size 2020-04-06 11:42:47 +02:00
ansuz
2b3f6e3464 Merge branch 'soon' into staging 2020-04-03 10:49:51 -04:00
ansuz
9a137e0025 Merge branch 'master' into soon 2020-04-03 10:49:44 -04:00
ansuz
aace3c006c Merge branch 'csp-issue' into staging 2020-04-03 10:37:37 -04:00