Commit Graph

  • 13738abc03 remove an incorrect comment ansuz 2019-06-14 11:37:34 +02:00
  • 7b8ac3d8c8 Merge branch 'soon' into staging ansuz 2019-06-14 10:45:25 +02:00
  • 3e4ee75137 Fix race condition with pins yflory 2019-06-14 10:03:52 +02:00
  • 58cee9e13d remove an XXX because the code looks safe ansuz 2019-06-13 16:48:12 +02:00
  • a2c8ec963c archive files deleted by 'removeOwnedChannel' if the admin has configured that behaviour ansuz 2019-06-13 16:44:27 +02:00
  • 6aa6b706a4 don't release until you think about this XXX a bit more ansuz 2019-06-13 16:36:22 +02:00
  • ac3a58cc38 fix a deadlock by returning the lock after clearing ephemeral channels ansuz 2019-06-13 15:03:36 +02:00
  • a2eee153b1 Merge branch 'soon' into staging ansuz 2019-06-13 12:24:00 +02:00
  • ddf4a6a784 pass the correct path to 'listChannels' for 'listArchivedChannels' ansuz 2019-06-13 12:07:35 +02:00
  • 7e455e6fce drop unnecessary code, restore instead of remove archived files in restoration script, change restore archived name ansuz 2019-06-13 12:03:46 +02:00
  • cb0c4ee944 don't continue iterating in listChannels until a the current task has called back ansuz 2019-06-13 11:54:42 +02:00
  • 2605d27e3f fix a completely wrong function signature ansuz 2019-06-13 11:24:01 +02:00
  • 5a1c25a0df fix a race condition, shutdown the log when you're done ansuz 2019-06-13 11:22:20 +02:00
  • c0d908af4d implement 'unarchiveChannel' ansuz 2019-06-13 11:20:53 +02:00
  • 4fd490f07f leave some notes for later ansuz 2019-06-12 16:35:08 +02:00
  • 11976b262e add a note for later ansuz 2019-06-12 16:34:25 +02:00
  • dd375a2a22 every type of storage should have its own nested directory within the archive ansuz 2019-06-12 16:33:52 +02:00
  • 8ed725f566 update the example config to support cold storage ansuz 2019-06-12 16:33:14 +02:00
  • ede929f4e4 implement inactive channel archival and archival expiration ansuz 2019-06-12 16:18:58 +02:00
  • 17ce25b666 add a warning to delete-inactive, which we know has bugs ansuz 2019-06-12 16:18:04 +02:00
  • 7647f7c68a implement four new storage APIs ansuz 2019-06-12 16:05:18 +02:00
  • 634b051d42 Add expand/collapse all feature in drive tree ClemDee 2019-06-13 11:51:38 +02:00
  • fc9a438f27 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-13 11:18:10 +02:00
  • d903aed496 Add README for our custom icons font yflory 2019-06-13 11:18:04 +02:00
  • dd7fc83867 Store the blob metadata the first time yflory 2019-06-13 11:17:43 +02:00
  • 73c2964241 Update collapsed folders when renaming/moving/deleting folder in Drive ClemDee 2019-06-12 17:38:48 +02:00
  • 3a2dd5e0a8 Renaming current folder now keep current folder opened ClemDee 2019-06-12 15:46:42 +02:00
  • 98f68da7f3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ClemDee 2019-06-12 11:36:19 +02:00
  • 537a310f4c Fix stuck tooltips bug ClemDee 2019-06-12 11:36:08 +02:00
  • 21300bb030 Add temporary folder custom color in drive ClemDee 2019-06-11 17:40:13 +02:00
  • 89264758d2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-11 12:31:54 +02:00
  • be43aad04c Add a palette icon to our custom font yflory 2019-06-11 12:31:24 +02:00
  • b546dd4033 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ClemDee 2019-06-07 16:05:57 +02:00
  • 63cb8e8f66 Fix chat history bug in other workers ClemDee 2019-06-07 16:04:52 +02:00
  • 02c765b085 lint compliance yflory 2019-06-07 15:50:00 +02:00
  • 73e068dacc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-07 15:48:44 +02:00
  • d924cee747 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ClemDee 2019-06-07 15:47:29 +02:00
  • f6cc3aa8c3 Fix bug chat history not deleted ClemDee 2019-06-07 15:43:24 +02:00
  • 23e48a6b4f Fix messenger unable to send messages yflory 2019-06-07 13:44:52 +02:00
  • 32a3ed6842 Make the clickable area to dismiss notifications bigger yflory 2019-06-07 11:47:50 +02:00
  • e77207dfee Merge remote-tracking branch 'origin/padsTheme' into staging yflory 2019-06-07 11:23:26 +02:00
  • db84b41225 Merge branch 'shareModal' into staging yflory 2019-06-07 11:16:41 +02:00
  • dab63c70c2 Merge branch 'cryptDriveTree' into staging yflory 2019-06-07 11:15:35 +02:00
  • f37bc78eaf Merge branch 'cryptDriveToolbar' into staging yflory 2019-06-07 11:15:13 +02:00
  • 473cbcd1b6 Fix drive toolbar new line bug yflory 2019-06-07 11:13:46 +02:00
  • 770af27b02 Merge branch 'cryptDriveToolbar' of github.com:xwiki-labs/cryptpad into cryptDriveToolbar yflory 2019-06-07 11:05:32 +02:00
  • 26ef1e5769 Fix infinite loop when trying to display an invalid category in the drive yflory 2019-06-07 11:05:15 +02:00
  • 639407056a Fix toolbar collapse for shared folders ClemDee 2019-06-07 10:55:54 +02:00
  • 60a8fb3932 Merge branch 'soon' into staging yflory 2019-06-06 16:50:20 +02:00
  • 2337fbdc6b update chainpad-server dependency ansuz 2019-06-06 15:51:44 +02:00
  • ae9caecc52 fix race condition 2 yflory 2019-06-06 15:40:08 +02:00
  • 62c96d562f Fix race condition with nthen yflory 2019-06-06 15:33:08 +02:00
  • 16477bd15b Fix toolbar collapse in drive ClemDee 2019-06-06 11:41:35 +02:00
  • b7b64a7c90 Disable friend migration while testing on alpha yflory 2019-06-06 11:35:14 +02:00
  • b35be86145 Bump drive version after migration yflory 2019-06-06 11:22:51 +02:00
  • a2997c4d53 Fix cursor to pointer on theme/language buttons in pads ClemDee 2019-06-06 10:47:07 +02:00
  • 6302d9a730 Allow user to change theme in slide ClemDee 2019-06-06 10:45:02 +02:00
  • 2a1502a25e lint compliance yflory 2019-06-05 18:25:00 +02:00
  • 9b5104c59e Update the friends when changing the username or avatar yflory 2019-06-05 18:23:15 +02:00
  • 250d9f3bc6 Fix friend migration and handle UPDATE_DATA mails yflory 2019-06-05 16:05:00 +02:00
  • 592544819e Fix unfriend bug yflory 2019-06-05 15:32:32 +02:00
  • 1e1edf922c Merge branch 'soon' into staging ansuz 2019-06-05 15:18:12 +02:00
  • 5477b83865 Merge branch 'master' into soon ansuz 2019-06-05 15:18:01 +02:00
  • e52acda334 Set cursor to pointer on help-close element in pads ClemDee 2019-06-05 15:12:42 +02:00
  • 8d38f144b0 update ws dependency ansuz 2019-06-05 15:10:26 +02:00
  • dc7f397072 Add language overview on hover ClemDee 2019-06-05 15:08:24 +02:00
  • 3dbced46f1 Add theme overview on hover ClemDee 2019-06-05 14:28:06 +02:00
  • 8a9f60e477 Fix tree panel resizing on mobile resolution ClemDee 2019-06-05 12:22:15 +02:00
  • a1163798de History button now close history panel when it is open in drive ClemDee 2019-06-05 12:00:05 +02:00
  • 0c66c19466 Add pathname collapse for long path in drive ClemDee 2019-06-05 10:36:58 +02:00
  • 6de97cac14 Migrate friends yflory 2019-06-04 18:44:55 +02:00
  • 38c3ca9f54 Fix UI issues yflory 2019-06-04 17:13:19 +02:00
  • 5640d41b79 add missing file yflory 2019-06-04 16:58:21 +02:00
  • a3a2c92c0c Share a pad, a file or a folder with friends yflory 2019-06-04 16:19:47 +02:00
  • c154d020b2 Share with friends from sframe and drive yflory 2019-06-04 15:57:39 +02:00
  • e7b65c5fca remove duplicated word ansuz 2019-06-04 14:20:13 +02:00
  • 416a4a2446 address some issues in the readme's team section ansuz 2019-06-04 14:17:34 +02:00
  • 36228c0479 Updated team and contributing section Ludovic Dubost 2019-06-04 14:10:25 +02:00
  • 41c3b38a11 lint compliance yflory 2019-06-04 11:23:38 +02:00
  • 39d2496330 Implement UI to share a pad with a friend yflory 2019-06-04 11:22:38 +02:00
  • 5e62cc2245 Merge branch 'soon' into staging ansuz 2019-06-03 17:24:39 +02:00
  • 4c18289b40 Merge pull request #347 from BundesIT/slim-docker ansuz 2019-06-03 17:23:56 +02:00
  • eb12178fe7 Notifications in the admin panel yflory 2019-06-03 11:58:49 +02:00
  • 8e7858e6ae New share modal in all the apps yflory 2019-06-03 11:57:55 +02:00
  • 4017dd7db9 Set cursor to pointer when hovering toolbar button ClemDee 2019-06-03 11:37:28 +02:00
  • 2513f33aa9 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-03 11:31:19 +02:00
  • 8f2596f722 Catalan translation yflory 2019-06-03 11:31:12 +02:00
  • 3ead07a6d4 Translated using Weblate (Spanish) Weblate 2019-06-03 09:24:56 +00:00
  • fd9fcaa964 Translated using Weblate (Russian) Weblate 2019-06-03 09:24:56 +00:00
  • ffca6417a8 Add path feedback on hover ClemDee 2019-06-03 11:12:26 +02:00
  • 54030da485 Add Telugu json file ClemDee 2019-06-03 10:59:37 +02:00
  • 961d385895 Merge pull request #373 from zimbatm/nix-packaging ansuz 2019-06-03 10:34:49 +02:00
  • 6041e1ae7c Merge pull request #367 from adlerweb/patch-1 ansuz 2019-06-03 10:32:48 +02:00
  • fb0827107b Secure share modal yflory 2019-05-29 19:00:20 +02:00
  • 8b07596d78 Add support for Telugu translation ClemDee 2019-05-29 14:20:14 +02:00
  • e7b0cec121 Fix broken link to weblate documentation ansuz 2019-05-29 13:52:32 +02:00
  • bfba5ff33b Add chat scroll to bottom when opening it ClemDee 2019-05-29 12:22:18 +02:00
  • 62eb623f49 Fix Chat scroll bug (issue #374) ClemDee 2019-05-29 10:19:42 +02:00
  • 980e3f964a changelog for v2.23.0 ansuz 2019-05-28 15:26:37 +02:00
  • 9aceb339ef Update UI for pending friend request yflory 2019-05-28 14:38:13 +02:00