Commit Graph

3655 Commits (2259d1b6ac4694810283266856c49498a0283da5)

Author SHA1 Message Date
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
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
yflory 8eccffd8e4 Don't remove migrated read-only pads 2018-07-18 14:56:49 +02:00
yflory 64b51f3a80 jshint compliance 2018-07-18 14:25:48 +02:00
yflory ebfa2c2dc3 Merge branch 'less-less' into staging 2018-07-18 14:18:37 +02:00
yflory aafcb1bc02 Merge branch 'sharedfolder' into staging 2018-07-18 14:18:30 +02:00
Caleb James DeLisle 8d95efa144 Reference the relevant line in alertify.js 2018-07-18 13:22:27 +02:00
Caleb James DeLisle a57a8e51a1 Prevent alertify.js from overriding styles 2018-07-18 13:20:16 +02:00
ansuz e110f20397 support blocks on remote domains 2018-07-17 17:41:30 +02:00
yflory e59aec0a45 Try...catch on testworker.js 2018-07-17 16:46:24 +02:00
yflory 3a7d1e5beb Fix 'save to drive' icon displayed for anonymous users in whiteboard 2018-07-17 16:41:50 +02:00
yflory 08005a709e Add a share icon in the drive when displaying a shared folder 2018-07-17 16:38:20 +02:00
ansuz 1629d7bb1d provide a SANE default in case httpUnsafeOrigin is not provided 2018-07-17 16:31:15 +02:00
ansuz bcbec0144c provide a default in case httpUnsafeOrigin is not provided 2018-07-17 16:20:40 +02:00
yflory 6143bceabb Fix XXX 2018-07-17 15:38:23 +02:00
ansuz a2fd32d6a3 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-17 14:49:19 +02:00
ansuz e6d4bced18 clean up extraneous variables and log statements 2018-07-17 14:34:25 +02:00
yflory b4c294565e Hide shared folder creation links when inside a shared folder 2018-07-17 14:00:28 +02:00
yflory ecb9f039b1 Fix pad password change not reloading with the correct URL 2018-07-17 12:27:23 +02:00
yflory c9ac3c7c2b Fix search in shared folders 2018-07-17 11:22:01 +02:00
yflory fc91cf606b Disable moveToTrash button for pads in shared folders 2018-07-16 18:05:23 +02:00
ansuz ed881840cd remove XXX label from non-blocking feature 2018-07-16 17:08:16 +02:00
yflory 9c58dc216f Remove option to move a shared folder to the trash 2018-07-16 16:17:34 +02:00