Commit Graph

  • 2a6afcc176 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2020-02-10 13:05:42 -0500
  • 1be01c07ee fix bad copypaste in the example nginx file ansuz 2020-02-10 13:04:58 -0500
  • 7fdf67b438 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-10 18:34:15 +0100
  • 44de8a41a1 Improve confirm modal keydown listeners yflory 2020-02-10 18:33:59 +0100
  • 4f9d0d71f9 Update translation files Weblate 2020-02-09 16:56:17 +0100
  • 8f06090626 Update translation files Weblate 2020-02-09 16:56:17 +0100
  • fbf1e287e9 Update translation files Weblate 2020-02-09 16:56:17 +0100
  • 985ed2505d Translated using Weblate (German) Weblate 2020-02-09 16:56:17 +0100
  • 80ae86cda3 Update translation files Weblate 2020-02-09 16:56:16 +0100
  • be929ecc8f Update translation files Weblate 2020-02-09 16:56:16 +0100
  • ac39a97a0f Update translation files Weblate 2020-02-09 16:56:16 +0100
  • 9c6109799e Update translation files Weblate 2020-02-09 16:56:16 +0100
  • b73ef31a2c Update translation files Weblate 2020-02-09 16:56:16 +0100
  • d372f436d8 Update translation files Weblate 2020-02-09 16:56:15 +0100
  • 67a837349b Update translation files Weblate 2020-02-09 16:56:15 +0100
  • c0e9e86a9e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-10 17:59:01 +0100
  • 532333d427 Fix keyboard shortcut in confirm yflory 2020-02-10 17:58:39 +0100
  • 0e9ba3a88d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2020-02-10 11:48:11 -0500
  • bc2febfb8b bump version, drop flow dependency, use newer chainpad-server ansuz 2020-02-10 11:47:55 -0500
  • a86469206e Fix horizontal scrollbar again yflory 2020-02-10 17:37:48 +0100
  • 26d05920c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-10 17:25:58 +0100
  • bf7f2e5bcd Fix upload table horizontal scrollbar + add autoscroll yflory 2020-02-10 17:25:50 +0100
  • 1231cacef1 remove XXX ansuz 2020-02-10 11:21:04 -0500
  • 0c2e5d14b3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2020-02-10 11:07:51 -0500
  • 63a36df39b push the pending upload table below the file upload dialog ansuz 2020-02-10 11:07:46 -0500
  • f9eea74b54 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-10 16:36:10 +0100
  • 6a365da3d8 Merge branch 'sidebarlayout' into staging yflory 2020-02-10 16:35:47 +0100
  • 38ac562de2 Merge branch 'sidebarlayout' of github.com:xwiki-labs/cryptpad into sidebarlayout yflory 2020-02-10 16:13:47 +0100
  • 3d2538c3ca Fix narrow sidebar in teams yflory 2020-02-10 16:13:29 +0100
  • cff663e876 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2020-02-10 10:01:06 -0500
  • 57be324850 remove some XXX notes ansuz 2020-02-10 10:01:02 -0500
  • 4cd39f4f32 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-10 15:45:03 +0100
  • 40b144f87b remove XXX yflory 2020-02-10 15:24:27 +0100
  • 1c9132adcb Merge remote-tracking branch 'origin/staging' into staging David Benqué 2020-02-10 14:20:41 +0000
  • a328dc6c08 fix text input color in team chat David Benqué 2020-02-10 14:20:14 +0000
  • a333531a36 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-10 15:11:48 +0100
  • b69261d119 Display the share modal after folder conversion to sf yflory 2020-02-10 15:10:36 +0100
  • 68a77885d4 suppress some routine server logs ansuz 2020-02-10 09:03:16 -0500
  • 830c401f50 Remove invalid option in context menu yflory 2020-02-10 14:54:35 +0100
  • d0f8458dd2 Fix openincode in anon shared folders yflory 2020-02-10 14:43:22 +0100
  • 7f22da0f57 fix use of incorrect key format in admin-rpc ansuz 2020-02-10 08:07:29 -0500
  • 86b9cc2de1 accidentally merge uncommitted work with staging, resolve merge conflicts ansuz 2020-02-10 08:05:43 -0500
  • 8afb0255c1 Fix team creation yflory 2020-02-10 13:27:07 +0100
  • 09076f39ff Fix and reenable folder to SF conversion yflory 2020-02-10 12:01:00 +0100
  • fbd8700a18 fix highlighting of support messages David Benqué 2020-02-10 10:58:17 +0000
  • 403867d4cd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-10 11:17:45 +0100
  • 7ca92526e7 Remove 'Owned pads' category from the drive yflory 2020-02-10 11:17:01 +0100
  • 243abc3e53 Change default settings for hidden hash yflory 2020-02-10 11:16:44 +0100
  • 6c23afdcc6 fix max-width David Benqué 2020-02-10 10:16:17 +0000
  • 961cb8e427 apply max-width only to settings David Benqué 2020-02-10 10:07:16 +0000
  • 4d2538c796 Make hidden hashes disabled by default yflory 2020-02-10 10:46:20 +0100
  • 7000be0e70 clean up historykeeper ansuz 2020-02-07 18:58:57 -0500
  • 802034616c centralize historykeeper-rpc interaction in rpc methods ansuz 2020-02-07 12:53:12 -0500
  • f23649c1ce remove obsolete keys David Benqué 2020-02-07 16:28:29 +0000
  • 1332f33a1a Translated using Weblate (French) Weblate 2020-02-07 17:25:22 +0100
  • 49294fc0c3 Translated using Weblate (English) Weblate 2020-02-07 17:25:22 +0100
  • 7d0dbe5d09 Remove XXX yflory 2020-02-07 14:10:50 +0100
  • 1a1620f76d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-02-07 13:37:06 +0100
  • ea5c6defe6 Fix import mediatag to the drive yflory 2020-02-07 13:36:54 +0100
  • fede44c8e5 remove XXXs related to translation keys David Benqué 2020-02-07 11:04:51 +0000
  • f9b101dcd9 use the same key to say 'don't show again' David Benqué 2020-02-07 10:59:50 +0000
  • 4cf834fb22 Translated using Weblate (English) Weblate 2020-02-07 11:55:57 +0100
  • 164e5d63d2 Translated using Weblate (French) Weblate 2020-02-07 11:55:57 +0100
  • 961f475dcd Translated using Weblate (Catalan) Weblate 2020-02-07 11:55:56 +0100
  • d9f2c90c25 fix color of expiration warning in sheets David Benqué 2020-02-07 09:40:17 +0000
  • 9ba786df4c Fix avatar in notification history yflory 2020-02-06 18:32:05 +0100
  • 0efbc77370 add max-width to settings David Benqué 2020-02-06 17:27:16 +0000
  • 9e60c8eb93 Show more than 5 entries in the upload table yflory 2020-02-06 17:42:54 +0100
  • 331054870f Better sidebar layout for mobile yflory 2020-02-06 16:06:09 +0100
  • 12a45377e7 Fix password change issues with read-only pads or from the drive yflory 2020-02-06 15:35:58 +0100
  • 086e500b8e Fix hidden hash error with password change yflory 2020-02-06 13:58:27 +0100
  • 872896543f Merge branch 'communities-trim' of github.com:xwiki-labs/cryptpad into communities-trim yflory 2020-02-06 12:03:19 +0100
  • 5d77857012 Merge branch 'staging' into communities-trim yflory 2020-02-06 12:01:48 +0100
  • 753fdbdc12 Display error for pad history trim yflory 2020-02-06 12:01:35 +0100
  • 8d01711244 Disable trim history is nothing to remove yflory 2020-02-06 12:00:12 +0100
  • b8ee120b49 lint compliance yflory 2020-02-06 11:58:11 +0100
  • 9c6ab86e4d Fix syntax error yflory 2020-02-06 11:57:50 +0100
  • fd095644a2 Merge branch 'staging' into communities-trim yflory 2020-02-06 11:55:07 +0100
  • 64c0f3a90d Add missing RPC command yflory 2020-02-06 11:54:46 +0100
  • d8199b8274 Update UI for trim history yflory 2020-02-06 11:34:52 +0100
  • 9a857ea058 Merge branch 'staging' into communities-trim yflory 2020-02-06 10:55:12 +0100
  • b96079cd44 Remove hidden hash XXX yflory 2020-02-06 10:49:02 +0100
  • b4172676f3 lint compliance ansuz 2020-02-05 18:12:09 -0500
  • 3e06c4bfe3 resolve conflict and lint compliance ansuz 2020-02-05 18:10:05 -0500
  • 3ab83826e6 WIP changelog ansuz 2020-02-05 18:06:40 -0500
  • 342aea705a not about a history-keeper anti-pattern ansuz 2020-02-05 18:06:18 -0500
  • f17d14fd99 simpler limit updates ansuz 2020-02-05 18:01:48 -0500
  • bde17a62a1 continue refactoring rpc ansuz 2020-02-05 17:31:44 -0500
  • d17e180420 add a short delay in the rpc test to give the server time to write metadata to the disk before checking it ansuz 2020-02-05 13:41:46 -0500
  • fa525817ba fix broken removePins RPC ansuz 2020-02-05 13:03:44 -0500
  • a00a9fd018 don't hang when reading unparseable lines from history ansuz 2020-02-05 13:03:11 -0500
  • 14a67b5600 fix broken removePins RPC ansuz 2020-02-05 13:03:44 -0500
  • b7ca39715d don't hang when reading unparseable lines from history ansuz 2020-02-05 13:03:11 -0500
  • 9395a1ef1a always write lines with a newline ansuz 2020-02-05 12:43:39 -0500
  • 1d56c08700 Merge branch 'staging' into communities-trim yflory 2020-02-05 18:23:10 +0100
  • 3741cbcbc0 rewrite trimmed history WITH newlines ansuz 2020-02-05 12:22:53 -0500
  • 4079f1bfdb Fix RPC command yflory 2020-02-05 18:12:10 +0100
  • 6655f493e0 Merge branch 'staging' into communities-trim yflory 2020-02-05 17:56:14 +0100
  • e6709f03aa Add trim history RPC command yflory 2020-02-05 17:55:25 +0100
  • 6db7fbac0f lint yflory 2020-02-05 17:55:04 +0100