Commit Graph

6120 Commits (ede929f4e48daea3e5dac6fe11fe3e4aa3ac8048)

Author SHA1 Message Date
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
ansuz 9fe78dcc5f bump version from 2.5.0 to 2.6.0 2018-08-22 15:32:47 +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
ansuz bcb8e7e573
Merge pull request #268 from Wikinaut/patch-1
Update readme.md
2018-08-14 14:45:08 +02:00
Wikinaut 8a98ddfe23
Update readme.md
s/ChainPad/CryptPad/
2018-08-14 11:13:53 +03: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
Paul Libbrecht 6f1b269230 Update to latest translations version and more cleanup of Du/Dein. Paul 2018-08-07 23:46:31 +02:00
ansuz 912a9d569c Merge branch 'revised-german' into soon 2018-08-07 12:03:21 +02:00
ansuz a773e0c44c
Merge pull request #265 from atallahade/fix-typo
Fix an anchor link in the readme file
2018-08-07 11:54:56 +02:00
ansuz 88c43cfc5c address a linter error 2018-08-07 11:45:22 +02:00
ansuz dc122e424c Merge branch 'master' into soon 2018-08-07 11:41:37 +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
Paul Libbrecht 365d17e275
Merge branch 'master' into revised-german 2018-08-03 18:01:16 +02:00
Adel Atallah 6d4cf50fa8 Fix typo 2018-08-01 21:53:03 +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
Adel Atallah 3026a1bf9b Fix an anchor link in the readme file 2018-07-30 22:14:43 +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 37f22550fe Use the settings spinner in the loading screen 2018-07-25 15:00:02 +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 362579f79f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-19 17:52:07 +02:00
yflory d816a2ed9f Prevent timeout when restoring drive 2018-07-19 17:51:38 +02:00
ansuz 97142b2b32 add footer to homepage 2018-07-19 17:39:21 +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 ae17427e00 Shared Drive text & French translation 2018-07-19 11:42:54 +02:00
ansuz 6922bc1e08 lint compliance 2018-07-19 11:14:52 +02:00
yflory a95cf85f20 Fix shared folder creation using the wrong icon 2018-07-19 10:57:31 +02:00
ansuz fcc54a3c34 Merge branch 'docker-fix-rename' into staging 2018-07-19 10:33:23 +02:00
ansuz a090dc52db flow compliance 2018-07-19 10:33:01 +02:00