Commit Graph
100 Commits
Author SHA1 Message Date
yflory 65d76a9241 Merge branch 'request' into staging 2019-07-16 14:37:03 +02:00
yflory 16c54652cd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-07-16 14:32:25 +02:00
yflory a169b4c3b3 Display a notification when there is a new message from the support team 2019-07-16 14:31:57 +02:00
yflory f111be72e6 Clean the support UI code 2019-07-16 11:58:54 +02:00
yflory f5c8d8566d Fix pads and files not displayed in the drive when logging in 2019-07-16 11:24:29 +02:00
yflory 60bea6b33b Request capabilities part 2 2019-07-13 11:47:58 +02:00
yflory 2ba6e40161 Fix issue with merging anon drive 2019-07-13 10:07:04 +02:00
yflory 4156b1988f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-07-11 14:16:31 +02:00
yflory 6f1e281cf8 request capabilities temp 2019-07-11 14:16:04 +02:00
yfloryandansuz ffd630455f Fix scrollbar issue in spreadsheets 2019-07-11 09:56:53 +02:00
yfloryandGitHub 9f2355e95b Fix scrollbar issue in spreadsheets 2019-07-10 13:34:55 +02:00
yflory 9d476ce9cd Fix error in the console 2019-07-05 17:06:02 +02:00
yflory df5090eaef Fix missing pad title in notifications 2019-07-04 15:51:29 +02:00
yflory d41b314e4d Fix invisible share modal stuck 2019-07-04 15:35:35 +02:00
yflory e728b5aeeb Merge branch 'cryptDriveStuff' into staging 2019-07-04 14:04:18 +02:00
yflory 954dcb5145 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-07-04 13:56:34 +02:00
yflory 3ccc8f63e4 Merge branch 'notifications' of github.com:xwiki-labs/cryptpad into notifications 2019-07-04 11:47:42 +02:00
yflory b92075b78b Fix support link 2019-07-04 11:47:36 +02:00
yflory 9360bed187 Missing trailing slash 2019-07-04 11:15:04 +02:00
yflory f067cd7d42 Merge branch 'support' into notifications 2019-07-04 10:56:46 +02:00
yflory b548d30afe Merge branch 'staging' into notifications 2019-07-04 10:56:43 +02:00
yflory 9e0fb966bf Fix cyclic object value 2019-07-04 10:47:08 +02:00
yflory abf8ef6276 Pin admin mailbox 2019-07-04 10:37:05 +02:00
yflory 3f5d3315a9 Merge branch 'support' into notifications 2019-07-03 16:46:23 +02:00
yflory 7e9e7c1aec Add more metadata to the support messages 2019-07-03 16:46:08 +02:00
yflory 1f384c2a4a update version 2019-07-03 16:36:04 +02:00
yflory 22b2d78a55 Change date format 2019-07-03 16:32:26 +02:00
yflory baa0e7080a Merge branch 'staging' into notifications 2019-07-03 16:30:33 +02:00
yflory 8182041526 Remove ES6 code not working on IE 2019-07-03 16:29:45 +02:00
yflory 087af34004 Update translation key 2019-07-03 16:20:22 +02:00
yflory 5bd2f83ebd Revert "Make sidebar-layout responsive"
This reverts commit bb5104dc0c.
2019-07-03 15:58:06 +02:00
yflory 4b54bd220a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-07-03 15:56:38 +02:00
yflory c281b3afa6 lint compliance 2019-07-03 15:55:24 +02:00
yflory eba32fe994 Remove unnecessary code 2019-07-03 15:54:03 +02:00
yflory b74e28fed3 Merge branch 'staging' into cryptDriveStuff 2019-07-03 15:42:43 +02:00
yflory 9cff6b0f3b Fix typo 2019-07-03 15:42:36 +02:00
yflory e62aee7df2 Update translation keys 2019-07-02 18:57:38 +02:00
yflory 134d18f966 Merge branch 'support' into notifications 2019-07-02 18:34:56 +02:00
yflory 91b2b8a77d Remove console.log 2019-07-02 18:32:25 +02:00
yflory 8da33c3c72 Fix support UI issues 2019-07-02 15:26:34 +02:00
yflory 77e893c3ea Merge branch 'staging' into support 2019-07-02 14:46:36 +02:00
yflory 7a4895757f Remove XXX 2019-07-02 14:45:50 +02:00
yflory 3f500cfd5c lint compliance 2019-07-01 18:19:54 +02:00
yflory 520655856b Don't ask for password when receiving a pad from the notifications 2019-07-01 18:19:38 +02:00
yflory 7a0f30488c Hide duplicates when receiving access to a pad via notifications 2019-07-01 18:07:40 +02:00
yflory 9aebeb216e Add the password when sharing a pad with a friend 2019-07-01 18:06:16 +02:00
yflory 6fe76dd7f8 Support UI 2019-07-01 13:43:12 +02:00
yflory 2e8e6e6de2 Return th timestamp in mailbox history 2019-07-01 13:42:40 +02:00
yflory d57d5962f4 Add support link to the user menu 2019-06-28 17:08:11 +02:00
yflory f70396a0f8 Translation keys 2019-06-28 17:05:26 +02:00
yflory 75e0b68f51 Add mailbox history 2019-06-27 18:21:54 +02:00
yflory 93b4dac8bb Support mailbox in the support and admin apps 2019-06-27 17:08:23 +02:00
yflory 22c9af6961 Support page 2019-06-25 16:39:15 +02:00
yflory 2d881caaeb Fix accounts href in limit popup 2019-06-25 15:07:43 +02:00
yflory 59d5723f3e Fix read-only spreadsheets 2019-06-24 18:17:42 +02:00
yflory 905bbef823 Add FIXME comments 2019-06-24 18:15:53 +02:00
yflory bba3e355d0 Invalid ID fix 2019-06-24 12:28:49 +02:00
yflory c39de38500 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2019-06-24 12:17:17 +02:00
yflory f5858f524d Fix invalid file ID in the drive 2019-06-24 12:17:08 +02:00
yflory bd190dc73b Fix thumbnails 2019-06-20 16:11:12 +02:00
yflory 9959f73b61 Fix share modal 2019-06-20 16:07:02 +02:00
yflory ee735c3aa4 Fix the 'share a folder' button in the drive 2019-06-20 15:15:41 +02:00
yflory 0a639851bb Fix share modal auto-close bug 2019-06-20 14:50:55 +02:00
yflory 8ae97f8c7e Remove XXX from onlyoffice code 2019-06-20 11:53:29 +02:00
yflory 457a04e39a lint 2019-06-20 11:51:47 +02:00
yflory 0a66224222 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-20 11:50:34 +02:00
yflory 1a4e42f28d Tippy fix 2019-06-20 11:50:14 +02:00
yflory 9e75259143 Disable Telugu translation (still at 0%) 2019-06-20 10:57:56 +02:00
yflory f3dd85a7af Fix infinite loading screen 2019-06-20 10:54:15 +02:00
yflory 9a04f748b5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-19 16:31:16 +02:00
yflory 6dd8615cab New icon 2019-06-19 16:31:05 +02:00
yflory 46ed3e5e98 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-18 17:25:23 +02:00
yflory c9b139313b Make drive drag&select more responsive 2019-06-18 17:22:19 +02:00
yflory 2c661310c7 Merge branch 'staging' into foldersColor 2019-06-18 15:36:22 +02:00
yflory 7c15076300 Merge branch 'staging' into cryptDriveTree 2019-06-18 14:34:22 +02:00
yflory b0ef3d6021 Fix UI issues with the new share modal and notifications 2019-06-18 14:23:48 +02:00
yflory a43fc5efef Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-18 12:06:32 +02:00
yflory 0df7cd67a9 Fix translation key 2019-06-18 12:06:17 +02:00
yflory 1f5eb66fe0 Merge branch 'soon' into staging 2019-06-18 11:27:57 +02:00
yflory eaa389fcb8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-18 11:10:56 +02:00
yflory 07775d6e13 Use shared folders events to pin and unpin pads 2019-06-18 11:10:46 +02:00
yflory 04d8578f4e Shared folder history 2019-06-17 14:13:06 +02:00
yflory ba877ba459 Display the channel ID of a shared folder to be able to restore it 2019-06-14 14:12:43 +02:00
yflory 3e4ee75137 Fix race condition with pins 2019-06-14 10:03:52 +02:00
yflory fc9a438f27 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-13 11:18:10 +02:00
yflory d903aed496 Add README for our custom icons font 2019-06-13 11:18:04 +02:00
yflory dd7fc83867 Store the blob metadata the first time 2019-06-13 11:17:43 +02:00
yflory 89264758d2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-11 12:31:54 +02:00
yflory be43aad04c Add a palette icon to our custom font 2019-06-11 12:31:24 +02:00
yflory 02c765b085 lint compliance 2019-06-07 15:50:00 +02:00
yflory 73e068dacc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-06-07 15:48:44 +02:00
yflory 23e48a6b4f Fix messenger unable to send messages 2019-06-07 13:44:52 +02:00
yflory 32a3ed6842 Make the clickable area to dismiss notifications bigger 2019-06-07 11:47:50 +02:00
yflory e77207dfee Merge remote-tracking branch 'origin/padsTheme' into staging 2019-06-07 11:23:26 +02:00
yflory db84b41225 Merge branch 'shareModal' into staging 2019-06-07 11:16:41 +02:00
yflory dab63c70c2 Merge branch 'cryptDriveTree' into staging 2019-06-07 11:15:35 +02:00
yflory f37bc78eaf Merge branch 'cryptDriveToolbar' into staging 2019-06-07 11:15:13 +02:00
yflory 473cbcd1b6 Fix drive toolbar new line bug 2019-06-07 11:13:46 +02:00
yflory 770af27b02 Merge branch 'cryptDriveToolbar' of github.com:xwiki-labs/cryptpad into cryptDriveToolbar 2019-06-07 11:05:32 +02:00
yflory 26ef1e5769 Fix infinite loop when trying to display an invalid category in the drive 2019-06-07 11:05:15 +02:00