Commit graph

10422 commits

Author SHA1 Message Date
yflory
3ff54a4a71 Correctly set feedback and token when the drive is synced 2021-01-07 15:47:17 +01:00
yflory
a6f9031cd6 Fix typo in translation key 2021-01-07 12:58:41 +01:00
yflory
b71ce434ce lint compliance 2021-01-07 12:48:09 +01:00
yflory
1f98ad94cc Fix merge issues 2021-01-07 12:47:17 +01:00
ansuz
beb74b46d5 merge offlineCache and soon 2021-01-07 17:15:00 +05:30
David Benqué
ddf464ceab Clean up XXX notes 2021-01-07 09:17:39 +00:00
yflory
bf15530964 Use all required fonts 2021-01-06 18:34:02 +01:00
ansuz
f9f23fc464 Merge branch 'soon' into staging 2021-01-06 17:53:50 +05:30
ansuz
5bedff19b4 fix an undefined reference 2021-01-06 17:51:35 +05:30
ansuz
681b128b77 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2021-01-06 17:11:07 +05:30
ansuz
0696a339cb Merge branch 'soon' into staging 2021-01-06 17:10:48 +05:30
ansuz
ecdd1a3f43 replace cache XXX notes with ICE (in case of emergency) strings 2021-01-06 17:10:11 +05:30
ansuz
8cabe7ded8 clean up error serialization code a bit 2021-01-06 17:07:35 +05:30
David Benqué
7068b24f73 Use team favicon 2021-01-06 11:30:40 +00:00
David Benqué
f43f025a65 Update teams favicon 2021-01-06 11:00:40 +00:00
David Benqué
7606439b86 Add favicon for teams 2021-01-06 10:33:29 +00:00
ansuz
7ddeacc629 serialize localForage errors and add a safety net 2021-01-06 15:56:58 +05:30
yflory
0b82810bf3 Print fix for firefox 2021-01-05 18:40:04 +01:00
yflory
c3077ab427 Enable 'print' option in the onlyoffice menu 2021-01-05 18:20:23 +01:00
ansuz
7b1e3f6e84 Merge branch 'soon' into staging 2021-01-05 19:38:46 +05:30
ansuz
662629185d remove hardcoded translations for admin panel 2021-01-05 19:36:52 +05:30
yflory
f95af39995 lint compliance 2021-01-05 14:22:09 +01:00
Weblate
0ef6e537b5 Translated using Weblate (English)
Currently translated at 100.0% (1408 of 1408 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1407 of 1407 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1406 of 1406 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1405 of 1405 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1404 of 1404 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1403 of 1403 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1402 of 1402 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (1401 of 1401 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2021-01-05 14:21:20 +01:00
yflory
4977194121 Merge branch 'staging' into x2t 2021-01-05 14:18:33 +01:00
yflory
a5f95f1b34 Spreadsheet PDF export 2021-01-05 14:18:02 +01:00
ansuz
c462f5ab2a remove stubbed 'user app' 2021-01-05 14:44:09 +05:30
ansuz
6a7752dd41 Merge branch 'z-rebrand' into staging 2021-01-04 17:24:12 +05:30
ansuz
db5b825cc3 Merge branch 'staging' into soon 2021-01-04 17:14:17 +05:30
ansuz
c806b97076 resolve conflicts between rebrand and staging 2020-12-29 17:20:53 +05:30
ansuz
affd221eb7 lint compliance 2020-12-29 17:08:48 +05:30
ansuz
ad8a310132 Merge branch 'soon2' of github.com:xwiki-labs/cryptpad into soon 2020-12-29 14:30:49 +05:30
ansuz
20691b5817 Merge branch 'soon' into staging 2020-12-29 13:51:11 +05:30
ansuz
c5af371423 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-12-24 15:01:53 +05:30
ansuz
31b2a5e4fe update chainpad-crypto dependency to fetch via https 2020-12-24 15:01:38 +05:30
ansuz
fed04a025c display size of uploaded files upon completion 2020-12-23 17:21:06 +05:30
yflory
588955c1fe Fix type error 2020-12-23 12:00:40 +01:00
yflory
32669dc099 Fix type error 2020-12-23 12:00:17 +01:00
yflory
2dc7438cba Fix invalid LKH in roster 2020-12-23 11:56:28 +01:00
yflory
8cb19cdc76 Fix invalid LKH in roster 2020-12-23 11:55:54 +01:00
yflory
9f02df0b31 Correctly move tickets after closing them 2020-12-21 16:02:53 +01:00
yflory
7e1c7c481e Fix support panel UI issue 2020-12-21 15:15:08 +01:00
ansuz
b7ea099eab re-enable indexedDB cache for testing 2020-12-21 15:02:13 +05:30
ansuz
92055f2567 Merge branch 'soon' into staging 2020-12-21 14:23:44 +05:30
ansuz
3e2dd44d93
Merge pull request #667 from jwehmschulte/patch-1
Fixed link
2020-12-21 02:04:18 -05:00
jwehmschulte
6ac7d90ed4
Fixed link
Changed a link from an empty wiki-page to one I thought should be there. I'm assuming the contribute page changed at some point and someone forgot to fix the link?
2020-12-20 14:11:46 +01:00
ansuz
d44f1880a4 temporarily disable the document cache, wait to clear it before redirecting to login 2020-12-18 20:17:50 +05:30
ansuz
d5a704d3b9 Merge branch 'soon' into staging 2020-12-18 16:53:34 +05:30
yflory
e56083c809 Fix button style in login page 2020-12-17 13:11:56 +01:00
yflory
74230955ea Fix shared folders not reconnecting 2020-12-17 12:31:06 +01:00
yflory
9a2a11c778 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-12-17 11:58:04 +01:00