Commit Graph

  • 2a3a31111b Translated using Weblate (German) Weblate 2019-06-20 09:05:58 +0000
  • 1facb74926 Translated using Weblate (French) Weblate 2019-06-20 09:05:57 +0000
  • 9e75259143 Disable Telugu translation (still at 0%) yflory 2019-06-20 10:57:56 +0200
  • f3dd85a7af Fix infinite loading screen yflory 2019-06-20 10:54:15 +0200
  • b2972d5707 Add rename F2 shortcut in drive ClemDee 2019-06-20 10:21:42 +0200
  • 9e544ce68a Brightened the no-color icon in palette ClemDee 2019-06-19 17:23:25 +0200
  • c6ae7dccae Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ClemDee 2019-06-19 17:20:17 +0200
  • 439596d0d2 Change no-color icon in color palette ClemDee 2019-06-19 17:20:08 +0200
  • 9a04f748b5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-19 16:31:16 +0200
  • 6dd8615cab New icon yflory 2019-06-19 16:31:05 +0200
  • 3635d1305a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ClemDee 2019-06-19 15:47:29 +0200
  • 1b6b9c2126 Fix infinite recursive loop _findFileInRoot ClemDee 2019-06-19 15:47:22 +0200
  • 6c10210d29
    Merge pull request #393 from xwiki-labs/foldersColor ansuz 2019-06-19 15:10:53 +0200
  • 4d752c9933 Small fixes ClemDee 2019-06-19 15:08:30 +0200
  • 7bfb62d5ae Fix default color check in palette ClemDee 2019-06-19 14:35:56 +0200
  • 0d3a9b5e40 Please jslint ClemDee 2019-06-19 14:21:26 +0200
  • 76e2f63c5a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ClemDee 2019-06-19 14:06:14 +0200
  • dd9959b264 Don't collapse folders after moving ClemDee 2019-06-19 14:05:53 +0200
  • 0cb3a13aca lint compliance ansuz 2019-06-19 12:10:14 +0200
  • b59969f48b archive channels at expiration time if configured to prefer archiving ansuz 2019-06-19 11:52:20 +0200
  • e0a79928f4 Change color picker to palette ClemDee 2019-06-19 11:47:32 +0200
  • 46ed3e5e98 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-18 17:25:23 +0200
  • f434233288 Translated using Weblate (German) Weblate 2019-06-18 15:25:04 +0000
  • c9b139313b Make drive drag&select more responsive yflory 2019-06-18 17:22:19 +0200
  • 1901127534 Fix palette icon of context menu in drive ClemDee 2019-06-18 16:55:42 +0200
  • 2c661310c7 Merge branch 'staging' into foldersColor yflory 2019-06-18 15:36:22 +0200
  • 7c15076300 Merge branch 'staging' into cryptDriveTree yflory 2019-06-18 14:28:00 +0200
  • b0ef3d6021 Fix UI issues with the new share modal and notifications yflory 2019-06-18 14:23:48 +0200
  • a43fc5efef Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-18 12:06:32 +0200
  • 30a884b80a Update translation files Weblate 2019-06-18 10:06:19 +0000
  • a2ebe43085 Update translation files Weblate 2019-06-18 10:06:19 +0000
  • a82377c18f Update translation files Weblate 2019-06-18 10:06:19 +0000
  • e4e9c1d30b Update translation files Weblate 2019-06-18 10:06:19 +0000
  • ea2c5014fc Update translation files Weblate 2019-06-18 10:06:19 +0000
  • 22931155ae Update translation files Weblate 2019-06-18 10:06:19 +0000
  • 162dcae910 Translated using Weblate (German) Weblate 2019-06-18 10:06:19 +0000
  • e584b1ae93 Translated using Weblate (French) Weblate 2019-06-18 10:06:18 +0000
  • c6191616da Translated using Weblate (English) Weblate 2019-06-18 10:06:18 +0000
  • 9bded76873 Update translation files Weblate 2019-06-18 10:06:18 +0000
  • 0df7cd67a9 Fix translation key yflory 2019-06-18 12:06:17 +0200
  • 1f5eb66fe0 Merge branch 'soon' into staging yflory 2019-06-18 11:27:57 +0200
  • eaa389fcb8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-18 11:10:56 +0200
  • 07775d6e13 Use shared folders events to pin and unpin pads yflory 2019-06-18 11:10:46 +0200
  • e9598de655 Add folder metadata and folder color ClemDee 2019-06-18 10:44:27 +0200
  • 04d8578f4e Shared folder history yflory 2019-06-17 14:13:06 +0200
  • ba877ba459 Display the channel ID of a shared folder to be able to restore it yflory 2019-06-14 14:12:43 +0200
  • d19b704bb8 fix an inverted boolean ansuz 2019-06-14 13:38:09 +0200
  • f5a2627d86 implement script to diagnose conflicts between the production database and the archive ansuz 2019-06-14 11:48:15 +0200
  • 1e5248ff9d implement methods for checking if a file exists in the database or the archive ansuz 2019-06-14 11:38:16 +0200
  • 13738abc03 remove an incorrect comment ansuz 2019-06-14 11:37:34 +0200
  • 7b8ac3d8c8 Merge branch 'soon' into staging ansuz 2019-06-14 10:45:25 +0200
  • 3e4ee75137 Fix race condition with pins yflory 2019-06-14 10:03:52 +0200
  • 58cee9e13d remove an XXX because the code looks safe ansuz 2019-06-13 16:48:12 +0200
  • a2c8ec963c archive files deleted by 'removeOwnedChannel' if the admin has configured that behaviour ansuz 2019-06-13 16:44:27 +0200
  • 6aa6b706a4 don't release until you think about this XXX a bit more ansuz 2019-06-13 16:36:22 +0200
  • ac3a58cc38 fix a deadlock by returning the lock after clearing ephemeral channels ansuz 2019-06-13 15:03:36 +0200
  • a2eee153b1 Merge branch 'soon' into staging ansuz 2019-06-13 12:24:00 +0200
  • ddf4a6a784 pass the correct path to 'listChannels' for 'listArchivedChannels' ansuz 2019-06-13 12:07:35 +0200
  • 7e455e6fce drop unnecessary code, restore instead of remove archived files in restoration script, change restore archived name ansuz 2019-06-13 12:03:46 +0200
  • cb0c4ee944 don't continue iterating in listChannels until a the current task has called back ansuz 2019-06-13 11:54:42 +0200
  • 2605d27e3f fix a completely wrong function signature ansuz 2019-06-13 11:24:01 +0200
  • 5a1c25a0df fix a race condition, shutdown the log when you're done ansuz 2019-06-13 11:22:20 +0200
  • c0d908af4d implement 'unarchiveChannel' ansuz 2019-06-13 11:20:53 +0200
  • 4fd490f07f leave some notes for later ansuz 2019-06-12 16:35:08 +0200
  • 11976b262e add a note for later ansuz 2019-06-12 16:34:25 +0200
  • dd375a2a22 every type of storage should have its own nested directory within the archive ansuz 2019-06-12 16:33:52 +0200
  • 8ed725f566 update the example config to support cold storage ansuz 2019-06-12 16:33:14 +0200
  • ede929f4e4 implement inactive channel archival and archival expiration ansuz 2019-06-12 16:18:58 +0200
  • 17ce25b666 add a warning to delete-inactive, which we know has bugs ansuz 2019-06-12 16:18:04 +0200
  • 7647f7c68a implement four new storage APIs ansuz 2019-06-12 16:05:18 +0200
  • 634b051d42 Add expand/collapse all feature in drive tree ClemDee 2019-06-13 11:51:38 +0200
  • fc9a438f27 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-13 11:18:10 +0200
  • d903aed496 Add README for our custom icons font yflory 2019-06-13 11:18:04 +0200
  • dd7fc83867 Store the blob metadata the first time yflory 2019-06-13 11:17:43 +0200
  • 73c2964241 Update collapsed folders when renaming/moving/deleting folder in Drive ClemDee 2019-06-12 17:38:48 +0200
  • 3a2dd5e0a8 Renaming current folder now keep current folder opened ClemDee 2019-06-12 15:46:42 +0200
  • 98f68da7f3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ClemDee 2019-06-12 11:36:19 +0200
  • 537a310f4c Fix stuck tooltips bug ClemDee 2019-06-12 11:36:08 +0200
  • 21300bb030 Add temporary folder custom color in drive ClemDee 2019-06-11 17:40:13 +0200
  • 89264758d2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-11 12:31:54 +0200
  • be43aad04c Add a palette icon to our custom font yflory 2019-06-11 12:31:24 +0200
  • b546dd4033 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ClemDee 2019-06-07 16:05:57 +0200
  • 63cb8e8f66 Fix chat history bug in other workers ClemDee 2019-06-07 16:04:52 +0200
  • 02c765b085 lint compliance yflory 2019-06-07 15:50:00 +0200
  • 73e068dacc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging yflory 2019-06-07 15:48:44 +0200
  • d924cee747 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging ClemDee 2019-06-07 15:47:29 +0200
  • f6cc3aa8c3 Fix bug chat history not deleted ClemDee 2019-06-07 15:43:24 +0200
  • 23e48a6b4f Fix messenger unable to send messages yflory 2019-06-07 13:44:52 +0200
  • 32a3ed6842 Make the clickable area to dismiss notifications bigger yflory 2019-06-07 11:47:50 +0200
  • e77207dfee Merge remote-tracking branch 'origin/padsTheme' into staging yflory 2019-06-07 11:23:26 +0200
  • db84b41225 Merge branch 'shareModal' into staging yflory 2019-06-07 11:16:41 +0200
  • dab63c70c2 Merge branch 'cryptDriveTree' into staging yflory 2019-06-07 11:15:35 +0200
  • f37bc78eaf Merge branch 'cryptDriveToolbar' into staging yflory 2019-06-07 11:15:13 +0200
  • 473cbcd1b6 Fix drive toolbar new line bug yflory 2019-06-07 11:13:46 +0200
  • 770af27b02 Merge branch 'cryptDriveToolbar' of github.com:xwiki-labs/cryptpad into cryptDriveToolbar yflory 2019-06-07 11:05:32 +0200
  • 26ef1e5769 Fix infinite loop when trying to display an invalid category in the drive yflory 2019-06-07 11:05:15 +0200
  • 639407056a Fix toolbar collapse for shared folders ClemDee 2019-06-07 10:55:54 +0200
  • 60a8fb3932 Merge branch 'soon' into staging yflory 2019-06-06 16:50:20 +0200
  • 2337fbdc6b update chainpad-server dependency ansuz 2019-06-06 15:51:44 +0200
  • ae9caecc52 fix race condition 2 yflory 2019-06-06 15:40:08 +0200