web/cryptpad
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Commit Graph

  • 20a564975f Add Jenkinsfile master Julien Cabillot 2020-01-08 14:39:44 -05:00
  • e58dfbabd4 Merge branch 'master' of github.com:xwiki-labs/cryptpad yflory 2020-04-23 15:08:24 +02:00
  • 13e1d1267d Add chat ID in the console yflory 2020-04-23 15:08:13 +02:00
  • c860819eb1 guard against coercing undefined to a string ansuz 2020-04-22 15:09:27 -04:00
  • cf8841cdfa Remove cba on non-owned pads yflory 2020-04-22 10:44:16 +02:00
  • e5f1fa7ef0 Fix color by author automatically enabled for non-owned pads yflory 2020-04-22 10:37:46 +02:00
  • b0b4029556 modify changelog with updated instructions for author colors ansuz 2020-04-21 12:45:47 -04:00
  • e05891184e fix regression in maxWorkers ansuz 2020-04-21 12:23:48 -04:00
  • 2695b51b0d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-04-21 16:40:34 +02:00
  • 440980c4af Display preview with a single click yflory 2020-04-21 16:40:19 +02:00
  • 7bdd367d88 remove log statements ansuz 2020-04-21 09:15:42 -04:00
  • 89de5869c5 Fix cursor and scroll position in codemirror after undo yflory 2020-04-21 14:42:49 +02:00
  • aeb81fdfad lint compliance yflory 2020-04-21 13:35:36 +02:00
  • 872e636ac5 Fix access modal in drive yflory 2020-04-21 12:13:52 +02:00
  • 97f9244efd Merge branch 'soon' into staging yflory 2020-04-21 12:05:16 +02:00
  • c2e0ed0d59 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-04-21 12:05:13 +02:00
  • 1d0feeb323 Fix cba reset on join. Change how the cba state is stored yflory 2020-04-21 12:04:24 +02:00
  • ac2cb29cf7 Translated using Weblate (French) Weblate 2020-04-21 11:17:49 +02:00
  • 65c8c043d5 Translated using Weblate (German) Weblate 2020-04-21 11:17:49 +02:00
  • 0544c31bea Translated using Weblate (English) Weblate 2020-04-21 11:17:49 +02:00
  • 7e334d0e3a add cursors to media-tags and mermaid in markdown preview ansuz 2020-04-20 14:41:37 -04:00
  • a8c8b85f0c add an XXX note for the 3.16.0 release ansuz 2020-04-20 14:31:02 -04:00
  • a04461f7c2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2020-04-20 14:26:28 -04:00
  • 9efbe59361 force a page reload for patch version changes ansuz 2020-04-20 14:25:43 -04:00
  • b8d13328cb Translated using Weblate (German) Weblate 2020-04-20 20:07:31 +02:00
  • d8855ed5f7 Remove XXX yflory 2020-04-20 18:32:13 +02:00
  • f4f4e0011f don't merge this, it's very wrong ansuz 2020-04-20 12:32:07 -04:00
  • 593011a657 Merge branch 'cba' into staging yflory 2020-04-20 18:31:08 +02:00
  • 8896b2eae2 Fix mediatag preview yflory 2020-04-20 18:19:21 +02:00
  • df6e12877b update changelog for 3.16.0 ansuz 2020-04-20 12:15:46 -04:00
  • 22a2b85fae Fix broken share modal yflory 2020-04-20 18:14:38 +02:00
  • f2641bc0ee Fix initial marker yflory 2020-04-20 17:57:25 +02:00
  • 6d84fc5b8a Add initial marker to fix errors while 'joining' markers yflory 2020-04-20 17:32:45 +02:00
  • 723549c0ba Translated using Weblate (English) Weblate 2020-04-20 17:00:10 +02:00
  • 9656abcade Translated using Weblate (French) Weblate 2020-04-20 17:00:10 +02:00
  • c6cb9876a7 Fix secure iframe conflict with cba button yflory 2020-04-20 16:47:04 +02:00
  • 49eacf752b Fix markers errors yflory 2020-04-20 16:37:40 +02:00
  • 0ca779dbd1 Fix 'enable cba' button in properties yflory 2020-04-20 16:20:46 +02:00
  • b208ca367d Merge branch 'staging' into cba yflory 2020-04-20 15:38:47 +02:00
  • 9f5f4a4d52 Fix possible duplicate author id yflory 2020-04-20 15:38:27 +02:00
  • cb04bec348 Merge branch 'soon' into staging ansuz 2020-04-20 08:57:36 -04:00
  • 41c0704ad8 Page mode by default in rich text yflory 2020-04-20 11:56:12 +02:00
  • ca9f874afb Redraw mermaid on preview yflory 2020-04-20 11:09:46 +02:00
  • 14b4411110 Translated using Weblate (German) Weblate 2020-04-18 18:41:04 +02:00
  • f03f70345a remove an XXX note ansuz 2020-04-17 17:05:14 -04:00
  • b56c73be6e delegate more work from getOlderHistory to the worker ansuz 2020-04-17 17:01:47 -04:00
  • fd169ff39c close streams after 2 minutes instead of 5 ansuz 2020-04-17 15:05:48 -04:00
  • f42c8e35b1 update version to 3.16.0 (Quagga) ansuz 2020-04-17 14:58:16 -04:00
  • 1e9b9913c5 Better debug function and fix marker error yflory 2020-04-17 18:18:16 +02:00
  • d6d4c4c70b Merge branch 'soon' into staging ansuz 2020-04-17 11:44:30 -04:00
  • 18c5d48474 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ansuz 2020-04-17 11:44:08 -04:00
  • bac8ef3c6e lint compliance ansuz 2020-04-17 11:43:54 -04:00
  • 19e565a7dc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-04-17 17:38:22 +02:00
  • adae4b690b outer.css cache busting yflory 2020-04-17 17:38:15 +02:00
  • ef1d5bd706 Merge branch 'ckeditor-default-size' into staging ansuz 2020-04-17 11:37:12 -04:00
  • d0c3f0fa84 remove XXX notes ansuz 2020-04-17 11:36:48 -04:00
  • 8009c01f70 Translated using Weblate (French) Weblate 2020-04-17 17:22:13 +02:00
  • fab1fcdb33 Translated using Weblate (Dutch) Weblate 2020-04-17 17:06:07 +02:00
  • 5807f3680b Translated using Weblate (German) Weblate 2020-04-17 17:06:07 +02:00
  • 8b0006fba7 Translated using Weblate (French) Weblate 2020-04-17 17:06:07 +02:00
  • 78afbaa6a8 Translated using Weblate (English) Weblate 2020-04-17 17:06:07 +02:00
  • 9ba2d11cd5 Guard against a type error yflory 2020-04-17 16:50:41 +02:00
  • d27dc768f3 Fix missing button to enable cba yflory 2020-04-17 15:56:17 +02:00
  • 283f739be5 lint compliance yflory 2020-04-17 15:30:27 +02:00
  • dd814713dd Merge branch 'staging' into cba yflory 2020-04-17 15:17:24 +02:00
  • f03713e60a Fix small issues, clean debugging logs and add known issues yflory 2020-04-17 15:16:49 +02:00
  • 92738828ff Merge branch 'debugtime' into cba yflory 2020-04-17 10:31:42 +02:00
  • 1d3f0ded81 Fix more markers errors yflory 2020-04-17 10:31:37 +02:00
  • 4e57e390da write tasks inside of workers ansuz 2020-04-16 16:37:24 -04:00
  • c39adb9bff configure ckeditor to allow unsetting font size ansuz 2020-04-16 14:59:40 -04:00
  • ba6faca02e make the number of workers configurable ansuz 2020-04-16 13:53:45 -04:00
  • 0465f31a45 add a FIXME note ansuz 2020-04-16 13:02:27 -04:00
  • 04ab7f538a recover from worker faults and unify worker types ansuz 2020-04-16 13:02:07 -04:00
  • e0a6852b79 correctly serialize an error log ansuz 2020-04-16 10:45:18 -04:00
  • 38acd01b35 Fix issues with falsy values yflory 2020-04-16 16:24:09 +02:00
  • b74a4b6bb4 Fix more cba issues and add debugging data yflory 2020-04-16 16:03:17 +02:00
  • 026bf6a425 Fix obvious issues in cba yflory 2020-04-16 11:20:18 +02:00
  • 9c5f0c0d6f Use rgba instead of #RRGGBBAA for the author markers yflory 2020-04-16 10:36:51 +02:00
  • 9ed82640bf Merge branch 'worker-queue' into staging ansuz 2020-04-15 19:32:42 -04:00
  • e8b1fcf710 solve some cases where crashing workers could result in an invalid state for the queue ansuz 2020-04-15 13:59:54 -04:00
  • 9ed26cfeb0 lint compliance ansuz 2020-04-15 12:40:18 -04:00
  • cdcb01623d Merge branch 'q' into staging yflory 2020-04-15 17:03:02 +02:00
  • 7890342ae1 Add cba hint yflory 2020-04-15 16:49:38 +02:00
  • fd2ee0fced Add comment yflory 2020-04-15 16:23:36 +02:00
  • 1dee2fd13c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2020-04-15 16:07:29 +02:00
  • f83179cb62 Fix mediatag cache preventing preview modal yflory 2020-04-15 16:07:18 +02:00
  • dc0460780f Merge branch 'soon' into staging ansuz 2020-04-15 09:44:30 -04:00
  • c46561e98d Merge branch 'master' into soon ansuz 2020-04-15 09:44:23 -04:00
  • 22186ccb62 Merge branch 'mermaid-styles2' into staging ansuz 2020-04-15 09:43:53 -04:00
  • 94c9e47d32 Remember the state of cba per user in their owned pads yflory 2020-04-15 15:36:37 +02:00
  • 87fc1f8daf Show/hide and enable/disable cba yflory 2020-04-15 15:20:04 +02:00
  • 88760fde6a Clean the code yflory 2020-04-15 13:22:46 +02:00
  • 74567e0cf4 return process memory usage in GET CACHE STATS RPC ansuz 2020-04-14 15:53:58 -04:00
  • 713fa9ef9a
         Merge pull request #525 from ma-neumann/master ansuz 2020-04-14 15:47:44 -04:00
  • 9a7681dc5d add a note about handling syntax errors in mermaid ansuz 2020-04-14 15:18:20 -04:00
  • ca2dc85b34 reduce eye-bleed with gentler styles for mermaid charts ansuz 2020-04-14 15:17:41 -04:00
  • d41c362d46 Fix more errors after ot yflory 2020-04-14 17:11:47 +02:00
  • 5fe7f55f51 Fix share with a team when we don't have contacts yet yflory 2020-04-14 10:47:53 +02:00
  • e3f42cbc20 Allow config.defaultStorageLimit to be zero bytes Martin Alexander Neumann 2020-04-11 20:45:28 +02:00
  • a70233d492 Fix OT errors yflory 2020-04-10 14:41:51 +02:00