Commit Graph

4348 Commits (fd43da2dbf786a1f4496ba155c7f3f8f3fa95e94)

Author SHA1 Message Date
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
yflory d2c1ed5eff Implement reconnect function in the messenger 2018-09-13 15:44:48 +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
yflory 1b2f47c0c0 Try a new status indicator in messaging 2018-09-13 11:49:01 +02:00
yflory 1cd1542d19 Update messaging info displayed before entering a room 2018-09-13 11:45:32 +02:00
yflory 10823fc124 Add toolbar notification when the messenger is closed 2018-09-12 15:07:50 +02:00
yflory 5276dc0bf6 lint compliance 2018-09-12 14:53:55 +02:00
yflory 621fc9a897 Ability to disable messenger at a global level 2018-09-12 14:51:37 +02:00
yflory c38eb6588e Fix small issues with the messenger 2018-09-12 11:55:26 +02:00
yflory 8b05b1acaf Fix scrolling issue in pad when the userlist or the messenger was too big 2018-09-11 18:16:36 +02:00
yflory 42ffe0ee30 Fix initial history rules 2018-09-11 17:57:15 +02:00
yflory 6c6ce7b7a8 Fix messenger bugs 2018-09-11 17:42:00 +02:00
yflory 19da04664a other typo 2018-09-11 17:17:59 +02:00
yflory b62aa9224e Fix typo 2018-09-11 17:11:13 +02:00
yflory ac989a1e73 lint compliance 2018-09-11 16:48:44 +02:00
yflory f3c36bfd57 Improve messenger initial history 2018-09-11 16:47:52 +02:00
yflory 26055e5e55 Messenger messages UI 2018-09-11 15:19:47 +02:00
yflory 40c7cdd7c8 Fix an issue with messenger while opening the same tab twice 2018-09-10 18:16:24 +02:00
yflory 216c94b1f0 Fix messenger notifications 2018-09-10 17:50:36 +02:00
yflory 382690e5c8 Don't open other pads' chat in the current pad's messenger 2018-09-10 17:43:19 +02:00
yflory 3acf202830 Test UI 2018-09-10 17:04:23 +02:00
yflory 56c30fc02e lint compliance 2018-09-10 15:33:24 +02:00
yflory 8f6d0b1c3a Merge branch 'staging' into chat 2018-09-10 15:32:39 +02:00
yflory 9eb4e2e0dc Reorder the chat rooms in the list based on the time of the last message 2018-09-10 15:32:07 +02:00
yflory cdce69e677 Improve messenger UI in apps 2018-09-10 13:20:01 +02:00
yflory d4dd58e7df Add a pad room when the messenger is active in a pad 2018-09-07 19:35:06 +02:00
yflory 9e27f111cb lint compliance 2018-09-06 18:45:53 +02:00
yflory e6743887fc Refactor contacts/messenger so that it is usable directly in the apps 2018-09-06 18:41:22 +02:00
ansuz 0e70961074 password-protected shared folders aren't urgent. dropping the XXX 2018-09-04 09:14:13 -04:00
yflory 5b6aa4ba0a Reorder autostore options in Settings 2018-09-04 14:49:22 +02:00
yflory 2f3576f90e Fix image preview not resized correctly in the mediatag dialog 2018-09-04 10:50:34 +02:00
yflory ab07554d0b Fix initial size of the image preview in the mediatag dialog 2018-09-04 10:45:18 +02:00
yflory 525703e7d8 Fix autostore popup displayed for dropped files 2018-09-04 10:36:19 +02:00
yflory 855612e98b Make oo work with hashes v2 2018-09-03 11:20:32 +02:00
yflory bf9cf95292 Merge branch 'staging' into oo2 2018-09-03 10:49:12 +02:00
yflory ee1027ceb9 Ability to import mediatags to the drive 2018-08-31 15:41:08 +02:00
yflory 2bb7e68792 Remember previous values in the file upload modal 2018-08-30 12:14:37 +02:00
yflory 475301477f Progress bar for loading a pad (framework only) 2018-08-30 12:07:21 +02:00
yflory 264f7dc6a1 Move base64 migration prompt to corner and only when the pad is stored 2018-08-30 11:21:33 +02:00
yflory 7b06626581 Merge branch 'autostore' into staging 2018-08-30 10:26:19 +02:00
yflory 90c96bfb70 Prompt users to migrate base64 images to mediatags in the pad app 2018-08-29 18:20:34 +02:00
yflory b1f2d287b4 Add warning for chrome 68 users on Mac 2018-08-28 17:44:15 +02:00
Marcel 886451393e
Merge branch 'master' into fix-#254 2018-08-28 17:11:20 +02:00
yflory 256b7b5bb4 Phantom viewers potential fix 2018-08-28 16:28:32 +02:00
yflory 0e1c525c30 Fix an issue with new shared folder added to drive from another session 2018-08-28 14:29:13 +02:00
yflory d201e9a0cd Disable some toolbar features not available if the pad is not stored 2018-08-28 12:12:47 +02:00
yflory 9ebb598467 Make automatic pad storage configurable 2018-08-28 11:42:48 +02:00
yflory e8a5244362 Autostore base 2018-08-27 14:58:09 +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
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
ansuz 2c22232a47 check if a user is logged in strictly by User_hash 2018-07-16 15:45:45 +02:00
ansuz 848a918eda remove out of date comments 2018-07-16 15:45:19 +02:00
yflory 668b7425a8 Make sure we won't move pads from a shared folder to the trash 2018-07-16 15:39:34 +02:00
yflory 5b48eff78c Remove owned pads deleted from the server in shared folders 2018-07-16 14:05:36 +02:00
ansuz b9c4aa43b5 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-16 11:25:11 +02:00
ansuz 3d95e6088a leave a FIXME note 2018-07-16 11:24:58 +02:00
Caleb James DeLisle 792f7bcc64 show how long less takes to compile 2018-07-14 15:21:45 +02:00
Caleb James DeLisle 6c49318ac7 Show how long it takes to parse less 2018-07-14 15:19:39 +02:00
Caleb James DeLisle 0d5ac05866 refactoring of the less infrastructure 2018-07-14 15:15:23 +02:00
yflory b5c2eb8a9c Automatically refresh the drive when a change occurs in a shared folder 2018-07-13 19:24:49 +02:00
yflory 4706b8a9de Store newly created pads in the correct (shared) folder 2018-07-13 15:01:23 +02:00
yflory 6a80f49fe0 Don't load expired or deleted shared folders 2018-07-13 14:47:53 +02:00
Caleb James DeLisle 507e5b18e9 Remove all less includes where no mixin or variable is used after 2018-07-12 19:22:32 +02:00
Caleb James DeLisle a6d3dbf94f Wrapped modal.less into a mixin which gets rid of the last file which emitted CSS 2018-07-12 19:13:04 +02:00
Caleb James DeLisle 4a352f2ed8 Use import (reference) whenever the less file supposedly emits no CSS 2018-07-12 18:43:17 +02:00
yflory 7d89026d83 Fix more issues with shared folders 2018-07-12 17:27:16 +02:00
Caleb James DeLisle c5105d7b84 Merge branch 'check-for-css-variables' into staging 2018-07-12 17:16:21 +02:00
Caleb James DeLisle a440359bc7 Commit patches provided to me by someone who Seemed Trustworthy At The Time
(should fix false negatives in shared-worker detection)
2018-07-12 16:59:36 +02:00
Caleb James DeLisle cb8888ea1a Yes, so it turns out that making a small asthetic change after testing on every browser does actually break it :| 2018-07-12 16:51:48 +02:00
Caleb James DeLisle fabdbc3b61 Add a feedback test for checking for CSS variables, so we won't use a feature which is not implemented by the vast majority of the people using CryptPad... 2018-07-12 16:02:46 +02:00
yflory 8516587ece lint compliance 2018-07-11 15:28:34 +02:00
yflory 9787f5304a Don't unpin channels that are still in another proxy 2018-07-11 15:28:24 +02:00
ansuz 3fb6cb3d00 lint compliance 2018-07-11 11:35:44 +02:00
ansuz ca409e5eaa support import/export in kanban 2018-07-11 10:50:42 +02:00
yflory 321c7d5512 Move pin/unpin outside of userObject 2018-07-10 18:23:16 +02:00
ansuz 8574128efd unstub password change function 2018-07-10 16:44:24 +02:00
ansuz 25b0d764ed pass initialState variable when copying your drive in the changeUserPassword function
because the hardest problems to debug are always fixed with one line changes
2018-07-10 16:42:11 +02:00
ansuz 54bc29f28c WIP maybe I missed something 2018-07-10 15:16:43 +02:00
yflory 66a494cbd2 temp 2018-07-10 15:10:07 +02:00
yflory 4b86ed2dec Shared folders UI 2018-07-10 14:41:37 +02:00
ansuz 0a9ea95796 always set userHash in localStorage even with modern users 2018-07-10 13:11:22 +02:00
yflory bc7524c134 Fix tippy 2018-07-10 10:39:21 +02:00
yflory 6312dadb60 Fix shared folders names in the drive 2018-07-09 18:11:04 +02:00
ansuz ce7ebf0326 don't stop users from registering if they cancel out of a prompt 2018-07-09 15:31:20 +02:00
yflory e0cc1a6eb6 Display a shared folder in the drive 2018-07-09 14:36:55 +02:00
ansuz a15e232469 complete modern user registration/login. general cleanup 2018-07-09 14:20:38 +02:00
ansuz d79064a4c5 Merge branch 'staging' into modern-users2 2018-07-06 11:37:50 +02:00
ansuz 4ef2cfa88d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-06 11:37:00 +02:00
ansuz 57a39258c3 WIP big commit 2018-07-06 11:36:48 +02:00
ansuz 0c3b898000 simple one line fixes 2018-07-06 10:28:41 +02:00
yflory 0c9dfc1fb5 Add proxy manager inner 2018-07-05 16:33:46 +02:00
yflory bd6a199dca Add missing functions to the proxy manager 2018-07-05 13:56:16 +02:00
yflory a25a72b5db Add a proxy manager to handle operations between shared folders 2018-07-05 10:37:06 +02:00
yflory 66591a3654 Merge branch 'rohref' into sharedfolder 2018-07-02 14:12:06 +02:00
ansuz a3e0e765b5 derive block URI and URL in dedicated functions 2018-07-02 11:11:50 +02:00
yflory a99e5a3aaa Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-07-02 11:03:58 +02:00
yflory af5cc30381 Fix undefined function when calling error() in the drive 2018-07-02 11:02:43 +02:00
yflory 071c34d4fa Fix undefined secret with password-protected files (#250) 2018-07-02 10:51:43 +02:00
yflory 27797c0520 Fix undefined secret with password-protected files (#250) 2018-07-02 10:50:30 +02:00
yflory 425ac8ea57 Migration for read-only links + fix issues with read-only pads 2018-06-29 18:16:04 +02:00
yflory 0f9a71686e Add support for read-only href stored in filesData 2018-06-28 18:16:38 +02:00
yflory 34914785eb lint compliance 2018-06-28 16:15:38 +02:00
yflory a537f7de8b Fix infinite loading screen caused by some browser settings 2018-06-28 16:13:52 +02:00
yflory 470f404a24 temp 2018-06-28 15:31:30 +02:00
ansuz cc6f3dc0e4 lint compliance 2018-06-28 15:25:22 +02:00
ansuz cfc81e8c96 allocate blockSeed as Uint8Array 2018-06-28 15:21:13 +02:00
yflory 554b4a978d Load shared folders in the store 2018-06-28 14:15:30 +02:00
ansuz 7aa7b82c60 merge staging 2018-06-28 13:33:54 +02:00
yflory 6dc7e7eff4 Disable WebWorkers by default 2018-06-26 14:15:25 +02:00
yflory bfb850554d Fix the contacts app with workers 2018-06-25 18:08:47 +02:00
yflory 87dc528a99 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-25 16:59:52 +02:00
yflory 6d8693ff8c Fix history mode UI 2018-06-25 16:59:40 +02:00
ansuz 7dc393a2d2 remove debug log 2018-06-25 15:33:54 +02:00
ansuz d76f3dceab remove comment 2018-06-25 14:30:41 +02:00
ansuz fb5553f918 fix typo 2018-06-25 14:25:37 +02:00
yflory 76bc82ac13 lint compliance 2018-06-25 13:42:17 +02:00
yflory 0160ef30b7 Fix pad password change 2018-06-25 12:08:06 +02:00
yflory 355dc5c993 Hide account password change form in settings 2018-06-25 11:13:02 +02:00
yflory fbe940c024 Fallback to async store in self.crypto doesn't exist in webworkers (ie/edge) 2018-06-22 19:43:07 +02:00
ansuz 01614c4256 verify old user password before proceeding to change passwords 2018-06-22 15:34:50 +02:00
ansuz e03b9fe630 remove login-block dependency from settings 2018-06-22 11:46:08 +02:00
ansuz 85bcaa51f7 export a constant for the number of required bytes at login time
allocate bytes for blockSeed when changing passwords
2018-06-22 11:41:10 +02:00
ansuz da35d94f73 don't require Block in /settings/ 2018-06-22 10:58:46 +02:00
yflory a146f6acc9 Change user account password function 2018-06-22 10:37:54 +02:00
ansuz 6fde027a6c add some TODOs 2018-06-21 10:26:46 +02:00
ansuz 9a7abe0b1e Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users 2018-06-21 10:16:25 +02:00
ansuz c2014c5906 a bit of cleanup, bug fixes, and lint compliance 2018-06-21 10:16:16 +02:00
yflory 36d1ae0f6c Merge branch 'modern-users' of github.com:xwiki-labs/cryptpad into modern-users 2018-06-20 16:39:52 +02:00
yflory 71b085ba23 Owned drive migration UI 2018-06-20 16:39:01 +02:00
ansuz c3741f847d resolve conflicts from merge with staging 2018-06-20 14:29:13 +02:00
ansuz d03339f20b check for the presence of a blockHash in localStorage when logging in 2018-06-20 14:27:44 +02:00
yflory a5b207d57b Password change UI 2018-06-20 10:02:56 +02:00
ansuz 3ba0ad3cf1 get, set, and clear blocks from localStorage 2018-06-19 18:08:14 +02:00
ansuz cb5fa72dba implement removeLoginBlock rpc 2018-06-19 17:17:56 +02:00
yflory 7948fe2b70 Merge branch 'soon' into staging 2018-06-19 17:02:26 +02:00
yflory 29f577dfc6 Improve history to load it chunk by chunk 2018-06-19 17:02:16 +02:00
ansuz 577dea4c75 clientside implementation of block signing and encryption 2018-06-19 16:38:49 +02:00
yflory c802b761c7 Fix pads not stored in the correct folder the first time 2018-06-19 11:04:39 +02:00
yflory 60db53a993 Use framework in the whiteboard app 2018-06-18 12:14:16 +02:00
yflory d37aa0646e Change account password (clientside RPC) 2018-06-14 18:18:53 +02:00
yflory 54d63df1cf Ability to change the password of a pad 2018-06-14 17:18:32 +02:00
yflory d1e8baca68 Lint compliance 2018-06-12 18:26:21 +02:00
yflory 4896fe81fe Merge branch 'serviceworker' into staging 2018-06-12 18:24:19 +02:00
yflory 1b49020753 Add support for async store when WebWorker is not available 2018-06-12 18:20:48 +02:00
ansuz ff25929c18 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-06-12 15:50:53 +02:00
ansuz 54b52d681c fix broken share menu resulting from adblock plus triggered by 'share' 2018-06-12 15:50:41 +02:00
yflory d558b9e3e8 Fix 404 issues in media-tag 2018-06-12 15:21:57 +02:00
yflory 01a3c13a8c Fix CSP issues for missing files (404) 2018-06-12 15:15:46 +02:00
yflory 9fbf507cda Fix new version detection 2018-06-12 14:23:54 +02:00
ansuz aa51463a9a Merge branch 'soon' into staging 2018-06-12 12:00:51 +02:00
yflory 4dec2cca5c Translations for new version detected 2018-06-11 18:18:39 +02:00
yflory 089e0361b6 Detect new version 2018-06-11 16:52:26 +02:00
yflory da396b6528 Remove XXX 2018-06-11 15:40:36 +02:00
yflory aeaf7d1950 Fix mediatag... 2018-06-11 15:06:43 +02:00
yflory 054ad9e741 Fix 404 in thumbnails creation with corrupted data in the drive 2018-06-11 11:46:27 +02:00
yflory 8f28621bb0 Remove unnecessary logs when logging in 2018-06-11 11:23:11 +02:00
yflory e39c77e162 Merge branch 'staging' into serviceworker 2018-06-11 10:59:01 +02:00
yflory 921e6eb3c3 Fix wrong pad title in drive 2018-06-11 10:58:44 +02:00
yflory 996245ec3d Merge branch 'staging' into serviceworker 2018-06-11 10:17:50 +02:00
yflory 47dee664da Add support for login & logout while keeping the same shared worker 2018-06-08 17:35:44 +02:00
ansuz 756681211b update home page icons, allow for customization 2018-06-08 17:06:50 +02:00
yflory 02b282a1a5 Disconnect from shared/service worker 2018-06-08 16:45:07 +02:00
Caleb James DeLisle 1775638d00 Merge commit '0c8ce27' into staging 2018-06-07 15:51:16 +02:00
Caleb James DeLisle 0c8ce27f24 Make the less loader only load particular less files once 2018-06-07 15:49:59 +02:00
yflory af2a13e5ae Fix UI issue with PPF in the file picker 2018-06-07 15:42:16 +02:00
yflory 574d99f9db Remove support for old media-tag 2018-06-07 15:09:35 +02:00
ansuz eac7d38655 test media-tag, and fix the bug the tests exposed 2018-06-07 14:29:09 +02:00
yflory bc57f8c274 Replace media-tag.js with the new one 2018-06-07 14:12:33 +02:00
yflory 38887eb088 Improve new media-tag 2018-06-07 11:52:04 +02:00
yflory 87f4fe9c84 Add error code to a feedback key 2018-06-07 10:48:38 +02:00
yflory f05e2225d6 lint compliance 2018-06-06 18:22:48 +02:00
yflory 78ff55e34e Fix race condition 2018-06-06 18:21:52 +02:00
yflory 48dc8c78b4 Fix cache and merge issues 2018-06-06 18:10:58 +02:00
yflory 305b47132c lint compliance 2018-06-06 17:55:02 +02:00
yflory 14db9fad8e Merge branch 'echidna' into serviceworker 2018-06-06 17:54:07 +02:00
yflory a6d9ecb3ba lint compliance 2018-06-06 17:48:10 +02:00
yflory 598d56c75e Fix cache issues 2018-06-06 17:45:43 +02:00
yflory cefe19b0e1 Merge branch 'echidna' into serviceworker 2018-06-06 17:25:24 +02:00
yflory 953d98be96 Fix reconnect 2018-06-06 17:25:06 +02:00
yflory ce6779a06f Remove debugging logs 2018-06-06 17:11:30 +02:00
yflory 6ab29f8f3a Test service worker and shared worker store 2018-06-06 15:58:43 +02:00
yflory 3f8b6d3b8a Fix default title issues when using a template 2018-06-04 16:02:58 +02:00
yflory 9c5ad795e1 Service worker test 2018-06-01 19:23:30 +02:00
yflory b0311ccec1 Don't create file duplicates in the drive 2018-06-01 12:10:49 +02:00
yflory 21366c252d Merge branch 'donkey' into staging 2018-06-01 12:07:10 +02:00
yflory cc163f83c7 Fix an issue creating duplicate files in the drive 2018-06-01 10:52:54 +02:00
yflory b9f5a0f52b Move async store in a webworker! 2018-05-31 18:22:16 +02:00
yflory 8586d0c944 Merge branch 'staging' into donkey 2018-05-31 13:28:14 +02:00
yflory ba0e000808 Add a file upload modal 2018-05-31 13:27:44 +02:00
yflory 06818b798f Add properties button to the file app to see owners and password 2018-05-30 18:48:29 +02:00
yflory fe202a92b4 Fix UI issues in kanban 2018-05-30 15:15:50 +02:00
yflory 85e5c495d9 Remove owned file 2018-05-30 14:36:29 +02:00
yflory 93ecc06964 Upload owned files 2018-05-29 19:42:20 +02:00
yflory a6bac8ae41 Fix password prompt issue when the password was wrong in the file app 2018-05-28 18:18:25 +02:00
yflory 05bd41f256 Upload a password-protected file from apps 2018-05-28 18:03:35 +02:00
yflory 66655b4a23 Upload a file with a password 2018-05-28 17:50:28 +02:00
yflory 8aac7bad45 Make sure the ID is not used when uploading a file 2018-05-28 16:57:20 +02:00
yflory 3267268e20 Fix share modal not using the previous values 2018-05-28 15:33:49 +02:00
yflory 586193d6a1 Password-protected files: upload files with hashes V2 2018-05-28 15:31:18 +02:00
yflory b377da1227 Highlight the selected line in polls 2018-05-28 11:22:48 +02:00
yflory c7e08fedfb Password-protected files 2018-05-25 18:00:10 +02:00
yflory 884f2b465d Fix kanban creation 2018-05-25 11:49:47 +02:00
yflory 95218f0fa1 Remove use of space-evenly since it is not supported by all browsers 2018-05-24 16:09:33 +02:00
yflory 7800fa2dcd Add confirm dialog when deleting a task in kanban + add colors 2018-05-23 17:13:41 +02:00
yflory 914da83b46 Fix missing edit hash in share modal when opening a pad in read-only mode 2018-05-23 16:55:23 +02:00
yflory 4df285fed5 Fix pads using version 0 hashes 2018-05-23 16:45:05 +02:00
yflory fe27c97879 Help + tooltips + fix colors in kanban 2018-05-23 14:24:23 +02:00
yflory 6b98fef679 Remove ES6 code in kanban 2018-05-23 12:01:03 +02:00
yflory 07502775f5 Add support for readonly and locked modes in kanban 2018-05-23 11:48:30 +02:00
yflory f0512bbb1d Fix UI and realtime issues with kanban 2018-05-22 18:24:40 +02:00
yflory 975fa3e4dd Test small mediatag 2018-05-22 12:34:37 +02:00
yflory ea9384d6d0 Fix kanban inputs blocked when remote change 2018-05-18 11:00:47 +02:00
ansuz bd66c8fee8 hacks to handle weird entries in drive 2018-05-18 10:28:31 +02:00
ansuz 2170fcb9ad Merge branch 'kanban' into staging 2018-05-18 10:19:55 +02:00
yflory ef735d6fe6 Fix an issue when trying to create a pad with a password from a template 2018-05-17 18:15:10 +02:00
ansuz f218a9c119 correct a copy-pasted comment 2018-05-17 16:10:53 +02:00
yflory b4638efe2d Fix missing username when avatar is 404 2018-05-17 12:09:52 +02:00
yflory 31f9062422 Fix avatar pin 2018-05-17 11:46:16 +02:00
ansuz d950b34bdf Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-05-17 10:35:59 +02:00
ansuz fb91f5df76 compare flat-dom output against hyperjson 2018-05-17 10:35:48 +02:00
yflory 5554c24b36 Remove dev console logging 2018-05-17 10:29:25 +02:00
yflory d224a2c1a4 Update size of the Add button in kanban 2018-05-17 10:27:41 +02:00
yflory 77c456a20e Disable console logging in kanban 2018-05-17 10:27:16 +02:00
yflory 73183a69fd Improve kanban UI 2018-05-16 19:28:30 +02:00
yflory 86be9abb62 Translations for kanban 2018-05-16 16:45:16 +02:00
yflory b6ebc583ba Add the kanban app to the list 2018-05-16 16:30:37 +02:00
yflory 087e346685 Remove translatable text and blocking 'confirm' dialog from jkanban.js 2018-05-16 16:18:44 +02:00
yflory 0ab27427bc Lint compliance 2018-05-16 12:22:43 +02:00
yflory 037050d16f Merge branch 'coati' into kanban 2018-05-16 11:41:55 +02:00
yflory 65a2083afc Suggest tags based on existing ones. Display existing tags in the drive. 2018-05-15 18:18:56 +02:00
yflory e2052b4510 Fix multiple tippy tooltips displayed in poll's table 2018-05-15 10:59:53 +02:00
ansuz dcd27f0da4 finalize save button tooltips 2018-05-14 14:20:37 +02:00
yflory 6fde15247b Fix UI issues in the loading screen with the loading bar 2018-05-14 14:02:46 +02:00
ansuz 34417b5e9f Merge branch 'oo' of github.com:xwiki-labs/cryptpad into oo 2018-05-14 14:02:24 +02:00
Paul Libbrecht 372f1dfeb4 First anchor test and restore of the CKEditor anchor function. 2018-05-11 09:06:22 +02:00
yflory 2d2701596a Loading message and loading bar for migration 2018-05-04 18:41:54 +02:00
yflory 2b8e734cae Add revealable password input to display or prompt the password 2018-05-04 15:42:29 +02:00
ansuz 4c747e013f on second thought that was a bad idea 2018-05-03 18:46:45 +02:00
ansuz 8ec9021f89 clear stuck tooltips in an interval 2018-05-03 18:45:19 +02:00
yflory 447230d42e Clean migration logging 2018-05-03 18:17:18 +02:00
yflory 6c4c5c135b Async migration 2018-05-03 17:59:22 +02:00
yflory 288b0c2df1 Lint compliance 2018-05-03 15:16:48 +02:00
yflory 10ce95087a Merge branch 'password' into staging 2018-05-03 15:16:03 +02:00
ansuz 89fb718572 Merge branch 'soon' 2018-05-03 10:19:36 +02:00
ansuz b9a74c2119 hide visible effects of race condition, leave a note to remember to fix it 2018-05-03 10:19:14 +02:00
ansuz 562f670921 hide visible effects of race condition, leave a note to remember to fix it 2018-05-03 10:18:36 +02:00
ansuz ac09ba65ce strip both old and new style checkpoint labels before decrypting when fetching history 2018-05-02 14:39:06 +02:00
ansuz 123612b893 Merge branch 'de-translation-pl' into staging 2018-05-02 11:09:22 +02:00
ansuz 699a635746 add trailing slash when redirecting to drive 2018-04-30 11:47:53 +02:00
yflory a66d33e5ca Improve export for pads with mediatags 2018-04-30 11:40:41 +02:00
yflory 2451174870 Lint compliance 2018-04-27 18:04:21 +02:00
yflory d0c6746034 Merge branch 'mediatagplugin' into staging 2018-04-27 17:57:22 +02:00
yflory 009eb13fc3 Merge branch 'master' into staging 2018-04-27 17:51:12 +02:00
ansuz 41583b7858 Merge branch 'checkpoint-bug' into merge-checkpoint-bug 2018-04-27 17:45:26 +02:00
yflory 64c85fe548 Don't return channel in parsePadUrl 2018-04-27 17:23:23 +02:00
yflory 43d046406f Store the channel id as pad attribute 2018-04-27 11:54:23 +02:00
yflory b26ae67df5 Fix issues with channel ID when using a password 2018-04-26 15:10:31 +02:00
yflory 1879c1829c Add passwod prompt to access protected pads 2018-04-25 19:03:58 +02:00
yflory 811463b870 Add support for version 2 hashes needed for password-protected pads 2018-04-24 17:22:33 +02:00
yflory 7384568f77 Lint compliance 2018-04-23 15:38:21 +02:00
yflory 9d30e48a44 Fix mediatag redrawn on content update 2018-04-23 15:35:55 +02:00
yflory 2d08924462 Fix CkEditor issues 2018-04-23 14:33:39 +02:00
yflory cf549eeaef Clean the code 2018-04-20 17:57:48 +02:00
yflory 41afc28802 Fix conflicts, clean the code, add migration from old mediatags 2018-04-20 17:49:40 +02:00
yflory 6a4f25bc9f Test widget filters 2018-04-20 17:48:39 +02:00
yflory fd89811479 Clean mediatag plugin 2018-04-19 18:29:10 +02:00
yflory 5eab39ad75 Tets mediatag plugin using widgets 2018-04-19 17:45:08 +02:00
yflory 449ae579e5 Lint compliance 2018-04-19 14:22:10 +02:00
yflory a773c47950 Fix loading screen in login and register 2018-04-19 14:21:26 +02:00
yflory a51e41c883 Rename the image used in the new loading screen 2018-04-19 11:30:54 +02:00
yflory 9f5e5786f3 Merge branch 'pcs' into staging 2018-04-19 11:14:56 +02:00
yflory e1d59db30d Fonts issues on Windows 2018-04-19 11:14:22 +02:00
yflory 206ac14438 Prevent users from creating a pad when visiting a deleted profile (read-only mode) 2018-04-18 18:54:46 +02:00
yflory a0d452bbd9 Use correct icons for the search results in the drive 2018-04-18 18:54:05 +02:00
yflory 1f3f4941b5 Redirect to drive anonymous users trying to create a profile 2018-04-18 18:53:36 +02:00
yflory c190a38a6b Fix UI issues 2018-04-18 14:19:45 +02:00
yflory 24dfaf766d View more templates 2018-04-17 18:23:58 +02:00
yflory 842952fe1f New checkboxes and radio input everywhere 2018-04-17 15:51:03 +02:00
yflory 68c26f3164 Custom radio inputs 2018-04-16 19:07:57 +02:00
yflory 7870dc05ca Fix notification timeout 2018-04-16 16:07:40 +02:00
yflory 881c36214f Lint compliance 2018-04-16 15:57:18 +02:00
yflory e2b9cf1c40 Fix small UI issues with the new colortheme 2018-04-16 15:46:19 +02:00
yflory ec0fc85b9f Sort templates by usage in the PCS 2018-04-13 18:52:55 +02:00
yflory 52d6c9d468 New colortheme for alertify logs and modals 2018-04-13 17:47:33 +02:00
yflory 5ee5a93513 New tippy everywhere 2018-04-13 15:25:14 +02:00
yflory 9d57548f1d New tooltips 2018-04-12 19:08:08 +02:00
yflory 4a23b57655 New loading screen 2018-04-11 18:56:03 +02:00
Paul Libbrecht 5747e1a492 Merge branch 'master' of https://github.com/xwiki-labs/cryptpad 2018-04-10 19:12:30 +02:00
yflory e1473dff79 Fix tests 2018-04-10 16:38:31 +02:00
yflory e37aab492b Validate messages not coming from history-keeper 2018-04-10 15:10:28 +02:00
yflory a570a73e98 Send checkpoints' id to the server to avoid storing duplicates 2018-04-10 10:38:30 +02:00
yflory 8bf9617dd6 Fix typo 2018-04-05 10:58:58 +02:00
yflory 2381dd0e39 Remove owned profile and owned todo in automatic account deletion 2018-04-04 17:24:26 +02:00
ansuz f276915712 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-04-04 15:07:41 +02:00
ansuz b323989347 remove extraneous console statements 2018-04-04 14:49:33 +02:00
yflory c43afcf629 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-04-04 14:38:40 +02:00
yflory 52e634885e Hide the import template button if templates are disabled in appconfig 2018-04-04 14:38:24 +02:00
ansuz c24c06e90c sign with your global private signing key 2018-04-04 14:17:48 +02:00
yflory 31980bef82 Add a ghost icon in the anonymous drive 2018-04-03 15:16:21 +02:00
yflory 0993204d14 Disable thumbnails by default 2018-04-03 13:35:06 +02:00
yflory 0dfae72f88 Lock the UI for unregistered users 2018-04-03 12:04:49 +02:00
yflory 303adaea4c Display only 5 items in the file upload table 2018-04-03 12:04:17 +02:00
yflory cf22c58e39 Missing translations 2018-04-03 11:23:58 +02:00
yflory a9d01ac864 Lock the UI when someone is editing 2018-04-03 11:00:46 +02:00
Ludovic Dubost ee8651c74e Kanban styles and color updating 2018-04-02 20:33:35 +02:00
Ludovic Dubost 035a56fdab Kanban application using the cryptpad framework 2018-04-02 20:27:52 +02:00
Ludovic Dubost 4b83f2991a Kanban prototype on cryptpad 2018-04-01 18:52:21 +02:00
yflory d12e5da1b7 Unpin old versions 2018-03-29 10:54:40 +02:00
yflory c4a3e98123 Fix initial value in oo apps 2018-03-29 10:16:51 +02:00
yflory fd1b4189be Save and open oo docs 2018-03-28 19:35:49 +02:00
yflory d5dce6ac22 Fix config 2018-03-27 14:03:30 +02:00
yflory 34f2d66b7e Load OnlyOffice documents in the inner iframe 2018-03-26 18:32:40 +02:00
ansuz ee46a4e862 remove some unnecessary checks for file-crypto and make encryption properly async 2018-03-26 18:30:52 +02:00
yflory 714c46fc2e Use blob URL to load an OnlyOffice document 2018-03-26 16:42:09 +02:00
ansuz 8c4ed76fa7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-23 18:05:33 +01:00
ansuz 1f700a8374 fix confusing error message 2018-03-23 18:05:16 +01:00
yflory 1a950319a1 Fix broken links 2018-03-23 15:05:26 +01:00
yflory f1c1d87d3f Fix template importer 2018-03-23 10:53:31 +01:00
yflory 0c2987a6d1 Import template in existing pads 2018-03-22 17:01:01 +01:00
yflory d4dfbddaa6 Add icons in the user menu 2018-03-22 15:19:14 +01:00
yflory d0c38d31e4 Owned todo 2018-03-22 15:18:41 +01:00
yflory db9eee383c Owned profile 2018-03-22 15:16:19 +01:00
yflory 9cba630700 lint compliance 2018-03-21 18:53:11 +01:00
yflory 01fb497e1b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-21 18:31:59 +01:00
yflory 4288f536f1 Use requireCSS to load FontAwesome 2018-03-21 18:31:53 +01:00
yflory a718603b36 Automatic account deletion 2018-03-21 18:27:20 +01:00
ansuz a794efe931 Merge branch 'staging' into oo 2018-03-21 11:32:59 +01:00
sairim faaff60f74
Fix broken FAQ link
Add a forward slash before faq.html... for the expiring pads FAQ link.
2018-03-20 18:16:29 +02:00
yflory 632e6c2e6c Merge branch 'metadata' into staging 2018-03-20 15:36:25 +01:00
yflory 99712ec2f0 getMetadata RPC 2018-03-20 15:33:12 +01:00
yflory 01dd6953b9 Fix the previous fix... 2018-03-20 15:13:00 +01:00
yflory c3f7b74baf Fix CkEditor's toolbar initial state 2018-03-20 15:07:20 +01:00
yflory 44cd235f48 Fix CSS with Bootstrap 4 2018-03-20 11:05:43 +01:00
yflory 2704ee1ed7 Account deletion translations 2018-03-19 18:14:00 +01:00
yflory fa4b625f0d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-19 17:25:38 +01:00
yflory 67cdb6bd13 Fix initial values in the pad creation screen 2018-03-19 17:25:31 +01:00
ansuz bd6b6dcb49 actually fix weird checkbox logic, and lint compliance 2018-03-19 17:13:44 +01:00
ansuz dc783ce3e4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-19 16:56:15 +01:00
ansuz 96a63a3b7b fix weird checkbox logic in share menu 2018-03-19 16:56:09 +01:00
yflory 91b3ef45f3 Fix mobile detection 2018-03-19 16:27:33 +01:00
yflory 4f2a91b82d Pad creation screen UI improvements 2018-03-19 16:17:19 +01:00
yflory 07e361b88d Account deletion button 2018-03-19 14:04:44 +01:00
yflory c135893638 Improve UI for polls on mobiles 2018-03-16 18:14:21 +01:00
yflory f1107ae6e5 Don't count other people's owned pads against your limit 2018-03-16 18:13:33 +01:00
yflory ab8306f5d4 Merge branch 'soon' into staging 2018-03-14 17:17:00 +01:00
yflory b3429c2d24 Merge branch 'creation' into soon 2018-03-14 17:08:54 +01:00
yflory 1dabc76bb9 Fix sframe-boot version 2018-03-14 17:03:50 +01:00
yflory de97c5a3ff Fix mobile detection when hiding the userlist 2018-03-14 17:02:41 +01:00
yflory d6228a39bd Fix userlist notifications missing for join events 2018-03-14 16:34:44 +01:00
yflory 03bcd2f00d Lint compliance 2018-03-14 12:12:24 +01:00
yflory 3eec812aff Merge branch 'staging' into creation 2018-03-14 12:07:04 +01:00
yflory b1d5beca6f Translations + UI for pad creation screen v2 2018-03-14 11:37:49 +01:00
yflory 645e47bd72 Catch chainpad errors in polls 2018-03-13 15:10:33 +01:00
yflory e56d762409 Catch chainpad errors and display it in the UI 2018-03-13 14:38:56 +01:00
yflory c9ed6d6bf8 New pad creation screen 2018-03-13 11:31:08 +01:00
ansuz 7944bc1a82 merge staging branch 2018-03-09 12:08:18 +01:00
ansuz 64afcb7c0b comment out busyloop workaround for tippyjs 2018-03-09 10:12:12 +01:00
ansuz ca65e6e54a Merge branch 'soon' 2018-03-09 10:07:38 +01:00
ansuz 03ae9d5714 Merge branch 'soon' 2018-03-08 16:38:16 +01:00
yflory 2f262b12c6 Fix help box issues 2018-03-08 16:15:26 +01:00
yflory 442f15df98 Add help text in all the apps + french translation 2018-03-08 15:39:46 +01:00
yflory cbd29794b8 Improve keyboard shortcuts in the pad creation screen 2018-03-08 12:16:40 +01:00
yflory 7a70d69d8e Hide editor toolbars by default when using a small screen 2018-03-07 17:34:55 +01:00
yflory f45023ed1f Remove connection lost popup when websocket connection is lost 2018-03-07 16:48:49 +01:00
yflory 689368cdd7 Fix feedback for markdown toolbar and cke toolbar 2018-03-07 10:57:29 +01:00
ansuz 0af90ef88d resolve merge conflict 2018-03-05 15:00:57 +01:00
ansuz 978b6b95df WIP make oo encrypted 2018-03-05 14:05:53 +01:00
yflory 62186bd4bd Remove tooltip when the element is removed from DOM 2018-03-05 11:19:05 +01:00
yflory b0dba481d8 Fix small UI issues and IE issues 2018-03-02 18:33:43 +01:00
yflory b7b560fcb8 Enable Cmd key support in shortcuts 2018-03-01 14:48:36 +01:00
yflory 12bfcbe701 Add fixed order for rightside icons in the toolbar 2018-03-01 14:32:14 +01:00
yflory 95bbc3d130 Add the mediatag button back in the code app 2018-03-01 11:23:16 +01:00
yflory ee3b926e84 Get rid of ckeditor's reset_all class... 2018-03-01 10:33:28 +01:00
ansuz ee4d12bd57 abstract repeated call 2018-02-28 18:15:33 +01:00
yflory 2c90cb5907 Move help button in drawer and fix drawer style 2018-02-28 17:59:27 +01:00
yflory 753b7550ca Save button in the pad creation screen 2018-02-28 17:02:35 +01:00
yflory a4a6385e86 Add keyboard shortcuts for the Ctrl+E or Cmd+E modal 2018-02-28 16:38:28 +01:00
yflory dbe8ab014d Select all in drive 2018-02-28 16:34:55 +01:00
ansuz f96a5003b0 empty spreadsheet file in test.bin 2018-02-28 13:56:33 +01:00
yflory d975bb9cc0 Fix focus after pad creation screen 2018-02-28 13:16:30 +01:00
ansuz 118ceef2f2 formatting and lint compliance 2018-02-28 11:58:35 +01:00
yflory 60b2384885 Move initial state into a help block 2018-02-27 17:38:29 +01:00
yflory 5c53868c3b Delete pads after 3 months of inactivity 2018-02-26 18:34:05 +01:00
yflory 329fd61bb1 Remove lag when creating a pad from the pad creation screen 2018-02-26 10:49:35 +01:00
yflory 22f130d948 Remove lag when displaying loading screen in login and register 2018-02-26 10:41:37 +01:00
yflory a697ad9762 Merge branch 'soon' 2018-02-22 17:05:58 +01:00
yflory 599afa4fc5 Merge branch 'soon' into staging 2018-02-22 15:57:08 +01:00
yflory 61dbf94f2d Fix pad attributes not working for readonly pads if you know the edit hash 2018-02-22 15:56:23 +01:00
yflory 8c42125ea0 Merge branch 'soon' 2018-02-22 12:44:28 +01:00
yflory 7ff9bbe2b0 Fix share modal with new pads 2018-02-22 12:43:16 +01:00
yflory a0ec51dde5 Fix share modal with new pads 2018-02-22 12:43:06 +01:00
yflory 480b499d7b Hack to remove onbeforeunload popup 2018-02-22 10:16:33 +01:00
yflory 7ede2e1a07 Fix cursor position when editing a task in todo 2018-02-20 18:43:25 +01:00
yflory c34161a988 Update oocell config 2018-02-20 18:36:00 +01:00
yflory acf09c807d Fix fonts 2018-02-20 16:09:49 +01:00
yflory 9ba912d953 Clean onlyoffice files 2018-02-20 15:47:07 +01:00
yflory db71fe5bf8 Rename font files 2018-02-20 15:23:24 +01:00
yflory d53ea25111 Merge branch 'soon' 2018-02-20 14:42:32 +01:00
yflory 5f50bedce2 Fix empty properties for readonly pads 2018-02-20 14:42:11 +01:00
yflory 15a8196037 Enable pad creation screen 2018-02-20 10:39:02 +01:00
yflory 2eef1e96e6 Remove invalid error reports 2018-02-20 10:21:15 +01:00
yflory 7cb3282634 New apps for text, slide and spreadsheet 2018-02-19 18:52:57 +01:00
yflory 766fa72841 Fix initial value of the preview link in the share modal 2018-02-19 14:07:21 +01:00
yflory 5c1e5a3f49 Merge branch 'staging' into oo 2018-02-19 12:11:06 +01:00
yflory 5dbc99343a Improve 'rename' input in the drive 2018-02-19 11:38:57 +01:00
yflory b04e3def64 Fix invalid translation key 2018-02-19 11:26:43 +01:00
yflory 649fefad54 Send cookie when history keeper has changed 2018-02-16 15:25:53 +01:00
yflory 2ac9c3ba66 Report RPC errors when deleting owned pads 2018-02-16 12:33:33 +01:00
yflory 037a6ccc35 Fix INVALID_RESPONSE error in the file app 2018-02-16 12:02:20 +01:00
yflory 54a91f1153 Ability to reorder and edit tasks 2018-02-15 15:38:39 +01:00
yflory 70e014cdfc Hide infinite spinner and disconnect modals when pad is deleted 2018-02-15 11:34:44 +01:00
yflory e83e589cf0 Kick from pad when an owned channel is deleted + whiteboard and poll 2018-02-14 19:41:07 +01:00
yflory 728a6a868d Manage expired channels 2018-02-13 18:20:13 +01:00
Fabien Vignon ac527c6411 add a logout page
allows destroying user session with a minimum number of loaded dependenciesi.
Can be Used for SSO forwards (logout).

Co-authored-by: Nicolas PARQUET <nparquet@linagora.com>
2018-02-12 15:38:51 +01:00
yflory 3bb6d5a83c Remove full history timeout 2018-02-09 15:47:29 +01:00
ansuz f8399eaaa6 avoid concatenating 'undefined' in drive interface 2018-02-08 11:08:10 +01:00
yflory ff151869de Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-07 13:08:12 +01:00
yflory 7ebfa43408 Improve assert translations to detect issues in objects (tips, type, etc.) 2018-02-07 13:08:03 +01:00
ansuz d676a5e7db Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords 2018-02-07 11:14:19 +01:00
ansuz bee5494abb add some sanity checks to the todo app 2018-02-07 11:07:45 +01:00
yflory 5bba9b6c39 Refactor login to remove duplicate code 2018-02-06 18:45:12 +01:00
yflory c2e9c60756 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-02-06 17:36:44 +01:00
yflory 4df4c48fbd Improve UI for pad creation screen 2018-02-06 17:36:37 +01:00
ansuz 8213d0d926 guard against null pointer exception 2018-02-05 15:24:30 +01:00
yflory 83eb304716 lint compliance 2018-02-01 11:16:34 +01:00
yflory 970122b41d Send the channel id to the text analyzer 2018-02-01 11:08:04 +01:00
yflory 80df45f257 Get text from ckeditor 2018-02-01 10:09:08 +01:00
yflory fb192a2c45 Add a configurable background color in the file app in view mode 2018-01-31 14:42:34 +01:00
yflory 91e42f1518 Fix the bug introduced in the share modal fix 2018-01-31 12:11:10 +01:00
yflory 0b1795e5a1 Fix an issue preventing the share modal to be used more than once 2018-01-31 12:08:55 +01:00
yflory ad2cde4705 Add warning about anonymous drive in localStorage 2018-01-29 19:04:00 +01:00
yflory bdafc101c9 Ability to remove owned channels from the drive 2018-01-29 15:17:53 +01:00
yflory 1c39e8b1bb Fix worker app 2018-01-29 15:17:20 +01:00
yflory b6e91c772e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-29 12:45:44 +01:00
yflory a1d9f44bbd Delete owned pads from server when removed from the owner's drive 2018-01-29 12:45:38 +01:00
ansuz f134f11b73 new getDeletedPads rpc 2018-01-29 12:40:09 +01:00
yflory 5089f1206d Pad creation screen translations and link to settings 2018-01-29 10:38:00 +01:00
yflory 74deb60f0f Fix issues with the new context menu in drive 2018-01-26 16:34:36 +01:00
yflory 36550b781f Don't check for stronger hash if we have an edit hash 2018-01-26 15:44:38 +01:00
yflory 86144eda22 Display a message about pads deleted from the server 2018-01-26 12:26:58 +01:00
yflory 9a317018e2 Remove deleted pads from the drive 2018-01-25 17:54:21 +01:00
yflory 3d3f58b3fc Improve share modal customization to make it work with async functions 2018-01-25 14:20:55 +01:00
yflory fd4ed3ce3b Fix subscription button in settings 2018-01-25 12:14:46 +01:00
yflory 548a32090e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-25 12:09:36 +01:00
yflory 4d0312115a Add a link to the account server for subscribers in settings 2018-01-25 12:09:20 +01:00
yflory 5827905dbd Import OnlyOffice code from the 'onlyoffice' branch and sframe it 2018-01-25 11:06:58 +01:00
ansuz 2b8414ca78 provide hints for running CryptPad 2018-01-24 16:16:46 +01:00
ansuz 80cd3e208a lint compliance 2018-01-24 11:35:05 +01:00
ansuz 4e8335bfdd fix support for custom button classes 2018-01-24 11:01:15 +01:00
yflory 2995782079 Different colors for ok and cancel in alertify 2018-01-23 17:02:32 +01:00
Caleb James DeLisle 4de6bd6195 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-23 16:32:05 +01:00
Caleb James DeLisle 014aacc76a Added a new RPC to get file offsets of messages by hash or of last 2 checkpoints, also improved checking of valid channel names and fixed a pull-stream bug and exposed async-store to the window 2018-01-23 16:31:59 +01:00
yflory 69c33e2f83 Ability to disable profile 2018-01-23 14:24:40 +01:00
yflory 51587d1006 Ability to disable feedback on the entire instance 2018-01-23 13:47:30 +01:00
yflory 006d99e19a Fix undefined friends 2018-01-23 12:09:54 +01:00
yflory af2bde27c6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-22 16:56:55 +01:00
yflory c90ba890ca Add more configurable options and add a new way to use custom config 2018-01-22 16:56:37 +01:00
ansuz ffa392a7e2
Merge pull request #221 from ryanpcmcquen/patch-1
Fix Org mode regex.
2018-01-22 10:44:33 +01:00
yflory 2e436f16c9 Refactor context menu in drive 2018-01-19 17:03:58 +01:00
Ryan P.C. McQuen ff4a49d59b
Fix Org mode regex.
More details here: https://github.com/mickael-kerjean/nuage/pull/16
2018-01-18 08:32:37 -08:00
yflory 4bea1aa2df Display default avatars in IE 2018-01-18 15:25:45 +01:00
yflory adf7e14891 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-18 15:04:17 +01:00
yflory bc9a88fbe9 Add support for org-mode in th code app 2018-01-18 15:04:06 +01:00
ansuz b08c1d94a1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-18 12:20:10 +01:00
ansuz 02dbe9e458 enforce maxUploadSize 2018-01-18 12:19:58 +01:00
yflory 6a906e3770 Fix share modal extension point 2018-01-18 11:16:30 +01:00
yflory e791add4ec Remove + icons from folders in the trash 2018-01-18 11:06:47 +01:00
yflory 51b4d269be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-18 10:54:08 +01:00
yflory 6e086ee779 Add shortcuts in the share modal 2018-01-18 10:53:43 +01:00
ansuz fc8847dae4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-18 10:32:27 +01:00
yflory 08ae327386 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-17 18:40:09 +01:00
yflory c5ebbe1a56 New share menu 2018-01-17 18:39:45 +01:00
ansuz e52c1fe65c remove Symbol polyfill 2018-01-17 14:27:26 +01:00
ansuz a91a047d73 more polyfill for IE 2018-01-16 18:15:08 +01:00
ansuz 50e3e3ce91 polyfill Symbol for IE 2018-01-16 18:12:33 +01:00
ansuz 1dd07ea48a polyfill MAX_SAFE_INTEGER everywhere 2018-01-16 18:03:55 +01:00
ansuz 3858aa976a better warning in case of errors in /file/ 2018-01-16 16:52:06 +01:00
yflory 4c49cd7592 Fix template picker not displayed anymore in framework 2018-01-16 14:39:56 +01:00
yflory c77e4adf1e Use local name instead of title in filepicker if it exists 2018-01-16 14:32:49 +01:00
yflory 2f74324dac Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-16 12:05:37 +01:00
yflory f79e1dfda0 Fix a race condition that could wiped the content of coed and slide 2018-01-16 12:05:26 +01:00
ansuz 3118dd8312 set logLevel to 2 by default for sframe apps 2018-01-16 11:52:04 +01:00
yflory 88a04fdb07 Don't create sfcommon a second time in code and slide 2018-01-16 11:26:16 +01:00
yflory ee605183e5 Make sure we don't have duplicates in the webchannel members 2018-01-15 15:40:52 +01:00
yflory 20f05d2f6f Fix Phantom viewers' revenge 2018-01-15 15:38:18 +01:00
yflory f3d8fd3590 Ability to import local pads on login 2018-01-12 18:17:32 +01:00
yflory 47203c37f1 Remove console error caused by setTimeout called with undefined 2018-01-12 17:44:56 +01:00
yflory a40315aff7 Remove ability to delete comments in polls for readonly users 2018-01-12 17:15:11 +01:00
yflory 85edc028ff Remove logging about filepicker rpc 2018-01-12 17:10:55 +01:00
yflory a4b35728dc Todo app has a hash in the omnibar 2018-01-12 17:08:41 +01:00
yflory 68ce7fe53d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-12 15:55:00 +01:00
yflory d59bc4612d Ability to disable the drive for anonymous users 2018-01-12 15:54:36 +01:00
ansuz 844d04df87 allow custom logout hooks defined in app config 2018-01-12 15:49:01 +01:00
ansuz 5b4e5480cb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-12 14:51:53 +01:00
ansuz 9b78580d8e make usage-bar display optional 2018-01-12 14:50:56 +01:00
yflory db0d2e161c Hide pad creation screen features if it is disabled in app config 2018-01-12 14:50:39 +01:00
yflory b01d00f74a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-12 09:50:17 +01:00
yflory daef08a9b3 Add an advanced new pad modal 2018-01-12 09:50:11 +01:00
Caleb James DeLisle cd26a4c093 Added a test of /login/ 2018-01-11 18:11:06 +01:00
yflory e377d606be Fix spinner style in the new settings category 2018-01-11 17:15:39 +01:00
Caleb James DeLisle 69aee6c21b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-11 17:09:06 +01:00
Caleb James DeLisle 378322a521 Don't finish the test until ChainPad settles, trying to eliminate a flicker 2018-01-11 17:08:47 +01:00
yflory c460e2820e Fix a 1px offset for the userlist in Firefox/Windows 2018-01-11 16:09:29 +01:00
yflory bd9c44dbb2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-11 16:02:18 +01:00
yflory ef480fea79 Add a settings category for the pad creation screen 2018-01-11 16:02:05 +01:00
Caleb James DeLisle 4808c8b374 Fixed poll which was not working with automated testing 2018-01-11 15:57:09 +01:00
ansuz 05ad38cfe1 add more config parameters to share menu extension 2018-01-11 15:55:57 +01:00
ansuz c31b5aa6c0 make extension point cover share menu for files 2018-01-11 15:55:57 +01:00
yflory 13b704d9f6 Fix undefined webchannel when uploading a file 2018-01-11 15:55:57 +01:00
ansuz ca3697ae3a implement extension point for share menu 2018-01-11 15:55:57 +01:00
ansuz 5346afe51f step towards customizable login functionality 2018-01-11 15:55:57 +01:00
ansuz 1fba82540a remove example code from todo app 2018-01-11 15:55:57 +01:00
Caleb James DeLisle 151d33db18 Added testing of /poll/ :D 2018-01-11 15:45:12 +01:00
yflory 8c9490868b improve owned pads management in the drive 2018-01-10 17:57:40 +01:00
yflory d74c2a0395 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-01-10 11:47:59 +01:00
yflory e5b9f089fb Fix undefined webchannel when uploading a file 2018-01-10 11:47:52 +01:00
Caleb James DeLisle 864e24b2ce Fixed typo in test 2018-01-10 11:42:48 +01:00
yflory 73126ed597 Display the owner and expiration time of a pad in the properties modal 2018-01-09 18:19:24 +01:00
yflory ecd8ef6418 improve thumbnails creation performances in code 2018-01-09 15:25:11 +01:00
yflory 77dcc1c705 Fix a race condition when switching language in the code app 2018-01-09 12:44:25 +01:00
yflory 65ccfe39ef Add a 'properties' button in pads to display pad data 2018-01-09 12:02:56 +01:00
yflory 071d385850 Remove an unnecessary websocket connection 2018-01-09 12:02:22 +01:00
yflory 7defde3c59 lint compliance 2018-01-08 17:41:10 +01:00
yflory 0cea5f4596 Create an owned pad and view owned pads in the drive 2018-01-08 17:36:44 +01:00
yflory 1ec41f4e09 Ability to pick a background image in slides 2018-01-04 17:22:01 +01:00
yflory 59c4df3d9b Fix 'NaN' txid for RPC when using IE 2018-01-03 17:14:35 +01:00
yflory 0f02d76b56 Fix missing callback when uploading files to the drive 2018-01-03 15:08:26 +01:00
yflory d2845b95b6 Fix multiple file upload prompt 2018-01-03 11:42:23 +01:00
yflory f329d65bc8 Ability to reduce the width of ckeditor 2017-12-22 18:01:15 +01:00
yflory 10aaa06781 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-22 16:25:52 +01:00
ansuz 869909b101 implement more reliable check for whether a channel on the server is new 2017-12-22 16:24:17 +01:00
ansuz b6430d640e temporary measure to address infinite reload loop due to inaccurate inNewFile condition 2017-12-22 14:59:41 +01:00
yflory bc5554f5f6 Display an error when visiting the bounce app without href 2017-12-22 14:58:44 +01:00
yflory 2fd22c6db6 Fix task list in markdown when using one empty line between tasks 2017-12-22 14:56:01 +01:00
yflory 5e8b183ee6 Fix uncommited column in poll hidden in published mode 2017-12-22 14:42:37 +01:00
yflory 7164d2dfdd lint compliance 2017-12-22 14:42:18 +01:00
ansuz 26f5a1fe74 signal that onLocal is called by onRemote 2017-12-22 13:16:15 +01:00
yflory 888739e333 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 18:21:14 +01:00
yflory fa6106a6bb Use CSS to remove the loading screen 2017-12-21 18:21:10 +01:00
ansuz b0fe323a4c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 18:09:55 +01:00
ansuz c0b5dc7536 make loading screen tip presence configurable 2017-12-21 18:09:49 +01:00
yflory a26031c119 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 17:38:28 +01:00
yflory 0e6e68aaff Remove print prompt in slides since the browsers already have a prompt 2017-12-21 17:38:22 +01:00
ansuz 892dfb18f7 check if users have service workers 2017-12-21 17:30:54 +01:00
ansuz 5f42a9749f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 17:23:58 +01:00
ansuz 4aa8d92a53 handle errors when constructing thumbnails from file metadata 2017-12-21 17:18:10 +01:00
yflory 5532b779fd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 15:56:28 +01:00
ansuz d1d75f2f25 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-21 15:53:16 +01:00
Caleb James DeLisle 590e77aafa lint, missing semicolon 2017-12-21 11:15:21 +01:00
Caleb James DeLisle 4117eb71cc Report the number of tests 2017-12-21 10:40:48 +01:00
Caleb James DeLisle c928be028a Upgrade the testing framework to allow multiple tests 2017-12-20 18:36:53 +01:00
yflory f7d30318cc Disable editable inputs in poll's read-only mode 2017-12-20 15:46:44 +01:00
yflory edc236e17b Disable edition in pad read-only mode 2017-12-20 12:15:43 +01:00
yflory f4078d68f0 Remove the 'edit username' button in the userlist in readonly mode 2017-12-20 11:54:30 +01:00
yflory 78f738143b Hide the markdown toolbar in read-only mode 2017-12-20 11:41:47 +01:00
ansuz 3177fd7857 hide whiteboard palette in view mode 2017-12-20 11:01:23 +01:00
Caleb James DeLisle 37dcf7285a Need to be exactly true, not just truthy 2017-12-19 19:16:53 +01:00
Caleb James DeLisle dc7dbb3e96 Accidentally made a test which hangs... 2017-12-19 19:09:48 +01:00
Caleb James DeLisle cbd7351d53 Improved logging if there's a non-empty-newdoc 2017-12-19 19:08:01 +01:00
Caleb James DeLisle d9323cc458 stubbed a failing test 2017-12-19 19:01:02 +01:00
yflory cfc9ce33d6 Hide the tags button for anonymous users 2017-12-19 11:58:45 +01:00
yflory 09433e0bf0 display existing tags in the prompt in drive 2017-12-19 10:16:53 +01:00
Caleb James DeLisle 3c0806659b Better logging if we trigger the doc emptystring issue 2017-12-18 18:28:48 +01:00
Caleb James DeLisle 7842c730a4 support for testing on safari 2017-12-18 15:15:41 +01:00
Caleb James DeLisle e587e9cd57 allow specifying the browser in selenium 2017-12-18 11:39:59 +01:00
ansuz 38e28ebc9a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-15 19:12:00 +01:00
ansuz 3c2d6af4f0 save pending tags when clicking OK on tagPrompt 2017-12-15 19:11:53 +01:00
yflory 47e4ce623a Fix import pads from anon drive at registration 2017-12-15 18:27:13 +01:00
yflory d666e9e7ee Remove tag and filepicker buttons for anon users 2017-12-15 18:16:01 +01:00
yflory c18d4297e1 Fix friend requests from the userlist 2017-12-15 16:19:22 +01:00
Caleb James DeLisle 6a2d79249d Added some nice testing 2017-12-15 16:09:30 +01:00
yflory f292407c6e Fix present mode in the code app 2017-12-15 15:40:52 +01:00
yflory 50ddad5e41 Fix an issue with the tag prompt removing all keyup listeners 2017-12-15 15:33:53 +01:00
yflory 92a8e107d7 Use the correct hash when opening the todo app for the first time 2017-12-15 15:33:11 +01:00
Caleb James DeLisle bb548b3428 Merge branch 'staging' into better-testing 2017-12-15 10:29:28 +01:00
yflory 3188ea3f35 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-14 14:59:06 +01:00
Caleb James DeLisle 6ac4fa4689 wip 2017-12-14 11:34:44 +01:00
yflory a08cf8faa8 Allow drive to receive updates after leaving history mode 2017-12-14 09:44:20 +01:00
ansuz afcf3d06b3 unpin pads when they are removed from your drive 2017-12-12 16:00:05 +01:00
ansuz 1a0ac9830a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-12 14:53:17 +01:00
ansuz c0e49211c4 eat errors related to cursors 2017-12-12 14:51:51 +01:00
yflory bba974947b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-12 14:45:39 +01:00
yflory 6bcc72ff83 Fix pads using an old URL 2017-12-12 14:45:25 +01:00
Caleb James DeLisle 8582f92892 Attempt to handle the possible scenario where we are overwriting an existing pad with the initial content. 2017-12-12 14:30:10 +01:00
ansuz 50b6a23067 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-12 13:47:35 +01:00