Commit Graph

8753 Commits (1d2b838b05e1e1591c3ae3ce04b65749adce7f53)

Author SHA1 Message Date
ansuz 8d509fd6d5 Merge branch 'staging' into small-config 2020-02-27 15:25:39 -05:00
ansuz c26560e3f9 commit stashed admin-rpc refactor 2020-02-27 15:00:31 -05:00
ansuz 02fc343727 Merge branch 'staging' into small-config 2020-02-27 13:54:15 -05:00
ansuz 5eefc6d0aa Merge branch 'bigger-uploads' into staging 2020-02-27 13:49:35 -05:00
ansuz 74771f13f5 implement caching for /api/config responses 2020-02-27 13:48:19 -05:00
ansuz 0989595358 lint compliance 2020-02-27 13:40:48 -05:00
ansuz d2bae175c4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-27 13:26:36 -05:00
ansuz 3df47a1415 continued WIP config reorganization 2020-02-27 13:24:19 -05:00
ansuz 294a444603 WIP removing defaults from the example config file 2020-02-27 13:09:12 -05:00
ansuz 08941fa85b remove log statements from login process 2020-02-27 12:53:14 -05:00
yflory e18c224db4 Faster sort function in drive 2020-02-27 13:33:26 +01:00
yflory e84503bd52 fixFiles optimizations 2020-02-27 13:21:10 +01:00
ansuz 59ad80d7f1 support larger upload sizes for users with premium accounts 2020-02-26 13:09:11 -05:00
ansuz 87ef2b0899 Merge branch 'user-admin-logout-everywhere' into staging 2020-02-25 11:37:26 -05:00
ansuz 3f2ebb773b merge master back to staging 2020-02-25 11:20:20 -05:00
ansuz 542150b775 merge server components from staging 2020-02-25 10:09:35 -05:00
ansuz f951951077 merge communities-allow-list and lint compliance 2020-02-25 09:48:41 -05:00
yflory 43693b45f0 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2020-02-25 15:13:25 +01:00
yflory ca10f15fe4 Merge branch 'soon' 2020-02-25 15:13:12 +01:00
yflory 4f9862de71 Fix trim history when owned by a team 2020-02-25 15:12:54 +01:00
ansuz f0e5fc7614 merge some missing code from communities-allow-list 2020-02-25 09:09:16 -05:00
ansuz ad08fe0c08 silence a few more routine websocket errors 2020-02-25 08:01:25 -05:00
ansuz 9c4693365a logout-everywhere from the userAdmin menu 2020-02-24 18:36:53 -05:00
ansuz 492e9496c8 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2020-02-24 14:33:02 -05:00
ansuz 21cf2b70c5 update changelog for v3.12.0 (Megaloceros) 2020-02-24 14:32:53 -05:00
David Benqué e328ae97fd change owner icon
- badge icon for owned pads
- no icons for pads owned by someone else or without an owner
2020-02-24 16:42:28 +00:00
yflory 8eaf197b5b Disable 'make a copy' for spreadsheets in the drive 2020-02-24 16:40:23 +01:00
yflory 99f04c3d6f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-24 16:32:35 +01:00
yflory f103a0fb08 Fix dropping files in non-ROOT categories in the drive 2020-02-24 16:32:18 +01:00
Weblate 20b591a39c Translated using Weblate (German)
Currently translated at 100.0% (1215 of 1215 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-02-24 15:47:18 +01:00
yflory 6e6ba73eca Remove XXX 2020-02-24 14:55:29 +01:00
yflory c6deabe79c Fix order of 'copy' button in the toolbar 2020-02-24 14:53:52 +01:00
yflory 59d23ef5ff Fix issues with trim history button 2020-02-24 11:28:30 +01:00
ansuz 6f742fc295 WIP changelog 2020-02-21 15:22:51 -05:00
ansuz 021a6b361f remove a bogus XXX note 2020-02-21 14:33:28 -05:00
ansuz e871e1f1e2 bump footer version to 3.12.0 (Megaloceros) 2020-02-21 14:31:11 -05:00
ansuz 033bd361f9 add backwards compatibility with older servers 2020-02-21 13:58:21 -05:00
ansuz cac114bb52 merge staging into pending allow-list work 2020-02-21 13:52:10 -05:00
ansuz 668ea95de2 Merge branch 'soon' into staging 2020-02-21 13:47:03 -05:00
ansuz e8142d983b fix an invalid use of dropChannel 2020-02-21 13:46:48 -05:00
ansuz 386add7c58 fix an invalid use of dropChannel 2020-02-21 13:46:11 -05:00
ansuz 76d369bc83 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-02-21 13:39:07 -05:00
ansuz 33c12c27a1 ignore successive metadata errors with the same message 2020-02-21 13:38:56 -05:00
ansuz 7ee8778210 kick unauthorized users from restricted channels
and update dependencies
2020-02-21 13:05:24 -05:00
Weblate 78c292bc2e Translated using Weblate (Italian)
Currently translated at 41.3% (501 of 1213 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/it/
2020-02-21 17:16:56 +01:00
Weblate e292a0b295 Translated using Weblate (French)
Currently translated at 100.0% (1215 of 1215 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/fr/
2020-02-21 17:16:56 +01:00
Weblate 01ba2c4d40 Translated using Weblate (English)
Currently translated at 100.0% (1215 of 1215 strings)

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

Translated using Weblate (English)

Currently translated at 100.0% (1214 of 1214 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/
2020-02-21 17:16:56 +01:00
Weblate 316d2a4689 Translated using Weblate (German)
Currently translated at 100.0% (1213 of 1213 strings)

Translation: CryptPad/App
Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/
2020-02-21 17:16:55 +01:00
yflory ff97c2cf63 Add (copy) to the title for copied pads 2020-02-21 17:10:50 +01:00
ansuz 77785e79af Merge branch 'communities-allow-list' of github.com:xwiki-labs/cryptpad into communities-allow-list 2020-02-21 10:59:26 -05:00