Commit Graph

3676 Commits (8b384d6bb362c8bb103b3f67b5cd54fe747251f4)

Author SHA1 Message Date
MTRNord 8b384d6bb3
fix jscolor picker for new kanban items and fix the code according to CI 2018-09-13 16:20:42 +02:00
MTRNord e7a1433a30
fix loading of the item color from saved state 2018-09-13 16:15:11 +02:00
MTRNord 2ef397a483
improve item color picker logic and UX 2018-09-13 16:08:27 +02:00
MTRNord 3c2417b479
fix more whitespace in jkanban.js 2018-09-13 14:46:41 +02:00
MTRNord 7e686a065e
Merge remote-tracking branch 'origin/fix-#254' into fix-#254 2018-09-13 14:40:12 +02:00
MTRNord 57ed2636ac
jkanban.js fix whitespace changes 2018-09-13 14:39:49 +02:00
Marcel 886451393e
Merge branch 'master' into fix-#254 2018-08-28 17:11:20 +02:00
yflory 5cd3cdc208 Don't handle drop events in the blockbase64 plugin 2018-08-27 14:57:16 +02:00
yflory 3f89dd9908 Disable pasting base64 images in ckeditor 2018-08-27 11:59:18 +02:00
yflory aa2a01174f lint compliance 2018-08-23 12:37:47 +02:00
yflory a117e329dc Add a Share entry in the drive's context menu 2018-08-23 12:34:44 +02:00
yflory e0b7f3f965 When importing a shared folder to the drive, open this folder directly 2018-08-23 11:55:14 +02:00
yflory 630a2dab78 Fix context menu issues with shared folders in the tree 2018-08-23 11:09:28 +02:00
yflory fddff11fae Rename shared drive to shared folder 2018-08-22 17:01:44 +02:00
yflory 61659c1252 Fix template icon not overriden by a thumbnail in the PCS 2018-08-22 16:32:44 +02:00
yflory ce08d7b650 Merge branch 'master' into soon 2018-08-22 15:34:06 +02:00
yflory b084b892bd Fix cache issues with workers in firefox 2018-08-22 15:26:42 +02:00
ansuz af40e140f9 safety net for call of undefined function in mergeDrive 2018-08-16 16:59:52 +02:00
ansuz 2259d1b6ac Merge branch 'soon' into staging 2018-08-16 13:33:09 +02:00
ansuz 8a113d742e
Merge pull request #245 from xwiki-labs/issue-169-anchors-should-output-anchors
#169: First anchor test and restore of the CKEditor anchor function.
2018-08-14 17:32:16 +02:00
ansuz fb9cf2c81e lint compliance 2018-08-14 17:11:08 +02:00
Paul Libbrecht 0dc1500784 This should solve issue #169: The test now completes with the insertion of a random anchor (menu-driven) and some text, the export is then checked to contain <a name="..." id="..."> as expected, then cleans up.
paul
2018-08-13 21:04:24 +02:00
ansuz 88c43cfc5c address a linter error 2018-08-07 11:45:22 +02:00
ansuz f5172fd05f Merge branch 'soon' into staging 2018-08-07 11:40:50 +02:00
ansuz 24c7ce57e1 apply the fix for password change recommended by @sairim 2018-08-07 11:40:21 +02:00
MTRNord 343e63f41b
Fix drag bug 2018-07-31 20:27:29 +02:00
MTRNord 1bf1253963
Add color picker to items 2018-07-31 20:08:06 +02:00
MTRNord 8df1dc19f2
Add Color picker for board title and let it have less space between boards. (Default colors are still working) 2018-07-31 19:27:13 +02:00
yflory a65e083fca Change PCS template icons 2018-07-28 11:38:22 +02:00
yflory 33fb48d59a Update shared folder icon in the drive 2018-07-28 09:10:11 +02:00
yflory 9a6fa4cbe2 Create a copy when uploading an owned file in a shared folder 2018-07-28 08:58:16 +02:00
yflory 55715748cc Fix typo in contacts app preventing new lines 2018-07-27 13:21:41 +02:00
yflory 20a9eee719 Disable shared folders creation by default 2018-07-20 18:41:14 +02:00
yflory f2baaf5b5b Fix shared folders issues including disappearing folders 2018-07-20 18:28:56 +02:00
yflory 4325ed4dde Fix small UI issues in drive 2018-07-20 12:29:18 +02:00
yflory bad1d7311a Fix drive tests 2018-07-20 12:04:42 +02:00
yflory 8ab786e7df Drive restore loading screen text 2018-07-19 18:49:14 +02:00
yflory d816a2ed9f Prevent timeout when restoring drive 2018-07-19 17:51:38 +02:00
yflory 2be78deb93 Fix Drive history 2018-07-19 17:07:14 +02:00
yflory 8b20b14184 Fix current path in toolbar reversing some names 2018-07-19 16:38:41 +02:00
yflory c08951dd91 Press enter to create a shared folder when typing its name 2018-07-19 15:33:20 +02:00
yflory 8c20c7823e Empty trash callback was missing 2018-07-19 15:32:45 +02:00
yflory 1e092f36ba Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-19 11:43:06 +02:00
yflory a95cf85f20 Fix shared folder creation using the wrong icon 2018-07-19 10:57:31 +02:00
Caleb James DeLisle 5527949c70 Make LessLoader flow properly, sorry about that 2018-07-18 16:22:44 +02:00
ansuz a181c09a68 Merge branch 'soon' into staging 2018-07-18 15:56:44 +02:00
ansuz c1eb6d6a01 Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2018-07-18 15:53:26 +02:00
ansuz e2600e4b36 display a loading screen while users are changing their passwords 2018-07-18 15:53:12 +02:00
yflory f97685cc15 lint compliance 2018-07-18 15:12:07 +02:00
yflory ef73cf89cd Merge branch 'soon' into staging 2018-07-18 15:10:23 +02:00