Commit Graph

8963 Commits (41a14d39ba14c0a8a6395c6f04d410350cc26802)

Author SHA1 Message Date
ansuz 41a14d39ba Merge branch 'soon' into staging 2020-05-25 12:49:41 -04:00
ansuz 4c660d5e89 Merge branch 'master' into soon 2020-05-25 12:49:28 -04:00
ansuz 52058bfcfc Merge branch 'staging' into toolbarUI-premerge 2020-05-25 12:14:45 -04:00
ansuz acf8dc45f1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into jkanban 2020-05-25 12:13:28 -04:00
yflory e17612ad79 lint compliance 2020-05-25 17:30:42 +02:00
yflory 5441a499ba Fix share and burn buttons in drive toolbar 2020-05-25 17:29:13 +02:00
yflory 806175f582 Add missing file 2020-05-25 17:22:12 +02:00
yflory bc3d827ce0 Remove the X in the drive tree 2020-05-25 17:21:55 +02:00
yflory e28d4695c5 Fix notifications button title in top bar 2020-05-25 17:08:12 +02:00
yflory 21423a47dd Better background-color for notifications and user menu 2020-05-25 17:02:34 +02:00
yflory 39120c689a Fix margin issues in the top bar 2020-05-25 16:37:14 +02:00
yflory 6e8ed7529f Fix issue when renaming a shared folder in the drive 2020-05-25 16:07:58 +02:00
yflory b9bd141b24 Fix tag search issues 2020-05-25 15:55:07 +02:00
yflory 96fcc852d6 Add a timeout for file upload if we can't make a thumbnail 2020-05-25 15:29:18 +02:00
yflory b881b459c0 Pull dragula from bower and lint compliance for our jkanban 2020-05-25 15:15:36 +02:00
yflory 5e8fc41b06 Fix item deletion in kanban #551 2020-05-25 14:16:37 +02:00
yflory ebf76fc5aa Merge branch 'master' into staging 2020-05-25 11:59:13 +02:00
yflory 5e9da3f652 Fix spreadsheet issues 2020-05-25 11:45:39 +02:00
yflory f4daddd6b1 Merge branch 'toolbarUI' of github.com:xwiki-labs/cryptpad into toolbarUI 2020-05-15 17:55:58 +02:00
yflory 5136a023f1 Fix issues with the file path in the search results 2020-05-15 17:55:44 +02:00
ansuz c714db561e Merge branch 'soon' into staging 2020-05-15 11:02:04 -04:00
ansuz 920c645500 Merge branch 'master' into soon 2020-05-15 11:01:57 -04:00
ansuz edb7618ce4 Merge branch 'staging' into toolbarUI 2020-05-15 10:35:45 -04:00
yflory ee291bc0c9 Add script to fix fork issues 2020-05-15 16:32:43 +02:00
yflory 606dea38aa Fix type error in oo 2020-05-15 16:32:25 +02:00
yflory 094edfc272 Fix type error in oo 2020-05-15 16:28:52 +02:00
yflory 43f53a93fd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2020-05-15 16:22:22 +02:00
yflory 0567547250 Add script to fix fork issues 2020-05-15 16:22:10 +02:00
yflory ad9a10701d Fix tag link in drive 2020-05-15 16:14:07 +02:00
yflory 0265103cd1 Bump drive version at registration 2020-05-15 15:34:51 +02:00
yflory 03ba45dd77 Merge branch 'toolbarUI' of github.com:xwiki-labs/cryptpad into toolbarUI 2020-05-15 15:31:34 +02:00
yflory de684edfe2 Todo migration 2020-05-15 15:27:55 +02:00
David Benqué a023e84731 change color of admin, notifications, support apps 2020-05-15 14:16:11 +01:00
David Benqué 9ae625e04a Merge remote-tracking branch 'origin/toolbarUI' into toolbarUI 2020-05-15 13:10:39 +01:00
David Benqué e6112d27ee change icons for files in drive 2020-05-15 13:09:56 +01:00
yflory fb10d65a4f Remove context button in the drive toolbar 2020-05-15 13:56:33 +02:00
yflory de9d771427 Remove resize handle in the chat box 2020-05-15 13:52:41 +02:00
yflory 47f679bf8b Add missing notification bell in the file app 2020-05-15 13:51:23 +02:00
yflory 303d4fdd3a Fix colors for the help, chat and userlist boxes 2020-05-15 13:50:36 +02:00
yflory 706ecc67f9 Fix UI issue sin the file app 2020-05-15 12:02:27 +02:00
yflory f2ca9b5d65 Merge branch 'toolbarUI' of github.com:xwiki-labs/cryptpad into toolbarUI 2020-05-15 11:43:26 +02:00
yflory b449ae9f8b Fix history colors 2020-05-15 11:43:14 +02:00
yflory 9ad1477d1b Fix collapse button 2020-05-15 11:35:20 +02:00
David Benqué ac7f30738d Merge remote-tracking branch 'origin/toolbarUI' into toolbarUI 2020-05-15 10:24:31 +01:00
yflory e68ad7cf5f Fix drive UI issues and add path 2020-05-15 11:16:57 +02:00
ansuz eb9edcb6f1 Merge branch 'master' into soon 2020-05-14 18:43:17 -04:00
David Benqué 70593429f5 Merge remote-tracking branch 'origin/toolbarUI' into toolbarUI 2020-05-14 17:00:50 +01:00
David Benqué b262deb78a minimal theme for Todo 2020-05-14 17:00:29 +01:00
yflory 1433eed246 lint compliance 2020-05-14 13:24:11 +02:00
yflory 6427413c7f Use default toolbar in drive 2020-05-14 13:20:29 +02:00