Commit Graph

2352 Commits (47cb776d6cc47cc3efc7c8efdfdf64b259616551)

Author SHA1 Message Date
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 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 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
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
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 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 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 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 c7e08fedfb Password-protected files 2018-05-25 18:00:10 +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
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 b6ebc583ba Add the kanban app to the list 2018-05-16 16:30:37 +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
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
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 ac09ba65ce strip both old and new style checkpoint labels before decrypting when fetching history 2018-05-02 14:39:06 +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 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 206ac14438 Prevent users from creating a pad when visiting a deleted profile (read-only mode) 2018-04-18 18:54:46 +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 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
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 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
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 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 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 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 99712ec2f0 getMetadata RPC 2018-03-20 15:33:12 +01:00
yflory 44cd235f48 Fix CSS with Bootstrap 4 2018-03-20 11:05:43 +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 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 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 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 03ae9d5714 Merge branch 'soon' 2018-03-08 16:38:16 +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
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 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 a697ad9762 Merge branch 'soon' 2018-02-22 17:05:58 +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 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 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 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
yflory 3bb6d5a83c Remove full history timeout 2018-02-09 15:47:29 +01:00
ansuz d676a5e7db Merge branch 'staging' of github.com:xwiki-labs/cryptpad into keywords 2018-02-07 11:14:19 +01:00
yflory 5bba9b6c39 Refactor login to remove duplicate code 2018-02-06 18:45:12 +01:00
yflory 4df4c48fbd Improve UI for pad creation screen 2018-02-06 17:36:37 +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 bdafc101c9 Ability to remove owned channels from the drive 2018-01-29 15:17:53 +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 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 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 c90ba890ca Add more configurable options and add a new way to use custom config 2018-01-22 16:56:37 +01:00
yflory 2e436f16c9 Refactor context menu in drive 2018-01-19 17:03:58 +01: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 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
yflory 4c49cd7592 Fix template picker not displayed anymore in framework 2018-01-16 14:39:56 +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 47203c37f1 Remove console error caused by setTimeout called with undefined 2018-01-12 17:44:56 +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 daef08a9b3 Add an advanced new pad modal 2018-01-12 09:50:11 +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
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
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 e5b9f089fb Fix undefined webchannel when uploading a file 2018-01-10 11:47:52 +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 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 2fd22c6db6 Fix task list in markdown when using one empty line between tasks 2017-12-22 14:56:01 +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 c0b5dc7536 make loading screen tip presence configurable 2017-12-21 18:09:49 +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 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
Caleb James DeLisle cbd7351d53 Improved logging if there's a non-empty-newdoc 2017-12-19 19:08:01 +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 50ddad5e41 Fix an issue with the tag prompt removing all keyup listeners 2017-12-15 15:33:53 +01:00
Caleb James DeLisle bb548b3428 Merge branch 'staging' into better-testing 2017-12-15 10:29:28 +01:00
Caleb James DeLisle 6ac4fa4689 wip 2017-12-14 11:34:44 +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
ansuz 76af3b90a7 stub createUnpinnedWarning0 2017-12-12 13:47:24 +01:00
yflory a863011a0c Fix profile in read-only mode 2017-12-12 12:14:32 +01:00
yflory b1765c6ae3 Fix pad creation screen with anonymous users 2017-12-11 17:58:59 +01:00
yflory c269929319 Fix creation page not displayed in pad and slide 2017-12-11 17:17:06 +01:00
yflory 362104ec09 lint compliance 2017-12-11 14:49:41 +01:00
yflory 89cc583f53 Call the handler if onReady is called for a ready channel 2017-12-11 12:48:06 +01:00
yflory dcfccf88cd Merge branch 'creationpage' into staging 2017-12-11 12:21:21 +01:00
yflory 1922dbfd75 Creation page with mobile support 2017-12-11 12:19:44 +01:00
Caleb James DeLisle 7a09bf43eb Fix a truly silly mistake in rpc.js and make the pad-not-pinned message get removed if a registered user joins 2017-12-08 14:46:32 +01:00
Caleb James DeLisle 008b2cc67e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-08 14:01:02 +01:00
Caleb James DeLisle 12b0f3e201 Pad Not Pinned: Better CSS, moved element outside of the title element, added it in poll, better colors, tippy, and login/register in same window 2017-12-08 14:00:53 +01:00
ansuz 06422e6d5a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-08 11:47:55 +01:00
ansuz 38bd27303b WIP rpc framework 2017-12-08 11:47:07 +01:00
Caleb James DeLisle 617c4b6044 CSS refactorings and pad-is-not-pinned work 2017-12-07 19:00:13 +01:00
yflory e96d54e655 Add a pad creation page 2017-12-07 18:51:50 +01:00
yflory 4377f2cee7 Fix missing translations in the drive 2017-12-07 12:20:26 +01:00
yflory 203c5d64c1 Focus codemirror after using the markdown toolbar 2017-12-07 12:18:14 +01:00
yflory e72270d4a4 Add feedback when sharedworker is defined 2017-12-07 10:50:45 +01:00
yflory 1ac4abc482 Remove old code 2017-12-07 10:35:48 +01:00
yflory 64303b4090 Merge branch 'refactor' into staging 2017-12-07 10:34:15 +01:00
yflory 3e064e6638 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-06 18:33:16 +01:00
yflory 604ea1c95f Feedback about webworkers 2017-12-06 18:32:48 +01:00
Caleb James DeLisle ba74f9d37a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-05 18:32:29 +01:00
Caleb James DeLisle 1dabea84d9 Overrides to colortheme.less will nolonger block the adding of new keys to the original file 2017-12-05 18:32:23 +01:00
yflory 61935500f4 Lint compliance 2017-12-05 18:10:53 +01:00
yflory 9eb33e39e6 Enable change events in the drive 2017-12-05 18:09:43 +01:00
Caleb James DeLisle c702a23c77 Initial work on the 'pad will expire' logic 2017-12-05 17:48:30 +01:00
yflory 17636769e4 Remove the second network created for the drive 2017-12-05 16:40:04 +01:00
ansuz 291eb57027 fix auth app 2017-12-05 15:07:35 +01:00
yflory 52712c4bb9 Use the network from the async store for pads 2017-12-04 19:16:38 +01:00
yflory de7806504b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-04 15:03:57 +01:00
yflory f52d987515 Ability to resize avatars before uploading them 2017-12-04 15:03:43 +01:00
ansuz 34223e4b78 remove accidental inclusion 2017-12-04 13:59:57 +01:00
ansuz 0b54a76211 lint compliance 2017-12-04 13:58:33 +01:00
ansuz cd29208267 fix toolbar's incorrect gotoDrive title 2017-12-04 11:46:15 +01:00
ansuz e85e2dcabd Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-04 11:41:45 +01:00
ansuz d3d9e2e771 WIP: refactoring rpc code 2017-12-04 11:10:25 +01:00
ansuz afcc888a8b make flat dom quiet again 2017-12-04 10:16:17 +01:00
yflory e164edec03 Fix the webworker app 2017-12-01 18:29:59 +01:00
yflory c59c6072f3 Remove jquery from outer 2017-12-01 16:05:23 +01:00
yflory c6b8bbea59 Fix tests 2017-12-01 14:56:34 +01:00
yflory 04e02871bc Merge branch 'refactor2' into staging 2017-12-01 14:50:19 +01:00
yflory 4903bd0757 Enable messenger in async store 2017-12-01 14:49:21 +01:00
yflory bd85f1b003 Fix file upload and remove unnecessary dependencies 2017-12-01 10:16:48 +01:00
Caleb James DeLisle 5187b3f26c Flow compliance and fix a few bugs in rpc.js 2017-11-30 18:32:20 +01:00
yflory 664625a6ef Fix more async store issues 2017-11-30 18:22:26 +01:00
yflory 5c3237e093 Fix issues with the async store 2017-11-30 17:21:58 +01:00
yflory b3688db202 Use async store 2017-11-30 15:01:17 +01:00
yflory 0840570fbf Async store part 1 2017-11-30 10:33:09 +01:00
ansuz 385ac9607c pass 'self' into common-util instead of using window 2017-11-27 18:26:04 +01:00
yflory 74e59a513a Add the markdown toolbar to the slide and poll apps 2017-11-27 17:55:20 +01:00
yflory 644f6e9985 Use the bounce app to open links from inner 2017-11-27 14:44:44 +01:00
ansuz 812df7de6f Merge branch 'merge-staging' into staging 2017-11-27 12:18:34 +01:00
ansuz be5c5831dd lint compliance 2017-11-27 12:18:04 +01:00
yflory b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
ansuz 4ff4ccd1d3 use faster and more correct 'find' implementation 2017-11-27 11:30:50 +01:00
ansuz 701af29192 fix broken register/login process 2017-11-24 15:12:00 +01:00
ansuz a3c093838c merge latest staging and resolve conflicts 2017-11-24 13:46:59 +01:00
ansuz 56102d3689 use unified listmap 2017-11-24 13:40:21 +01:00
ansuz 661db129b2 lint compliance 2017-11-24 10:32:58 +01:00
ansuz 80978377f2 return transformed cursor value 2017-11-24 10:03:45 +01:00
ansuz ee6c2097f5 resolve merge conflicts 2017-11-23 16:56:49 +01:00
yflory 9795ac32cb Ability to burn an anonymous drive from the browser 2017-11-23 14:36:42 +01:00
yflory 280a7c2765 Clean cryptpad-common 2017-11-23 12:28:49 +01:00
yflory eba1c9dfac Add chainpad log to the debug app 2017-11-21 18:50:33 +01:00
yflory 30cea8888d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-21 17:37:53 +01:00
yflory 06011065d2 Add a debug app 2017-11-21 17:37:38 +01:00
ansuz 60c4973d62 resolve merge conflicts 2017-11-21 17:22:06 +01:00
ansuz 585f9d2e4e repair broken 'clear channel' button 2017-11-21 17:19:35 +01:00
yflory 000f3edd1d Constants file 2017-11-21 16:47:19 +01:00
yflory 477f14bb8b Put constants in a separate file 2017-11-21 16:46:19 +01:00
yflory 7f88d1d43a Improve drive loading speed 2017-11-21 11:09:59 +01:00
yflory 06ede6b294 Fix export in apps using framework 2017-11-21 10:26:33 +01:00
yflory c35e3d644e Make sure dates are stored as numbers in the drive 2017-11-20 15:37:23 +01:00
yflory 655dfe971d Add translation for the edit username button in the userlist 2017-11-20 14:28:35 +01:00
ansuz d1beb6493b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-20 12:20:13 +01:00
ansuz b96ea47f1f strip tracking parameters when parsing urls 2017-11-20 12:09:17 +01:00
yflory fc02f97d78 Use less2 classes in the user menu 2017-11-17 18:20:45 +01:00
yflory 41a082c46d Fix video thumbnails 2017-11-17 18:20:02 +01:00
yflory af8aa25228 Add an option to never rename a file during the session 2017-11-17 10:57:54 +01:00
yflory 31b31654ec Lint compliance 2017-11-16 18:57:33 +01:00
yflory 25d3d321da Ability to rename a file before uploading it to the server 2017-11-16 18:11:13 +01:00
yflory 2813b7219e Fix the public key using the wrong domain in settings 2017-11-16 13:35:07 +01:00
yflory a96e49d55a Fix filepicker creating a new netflux network when initialized 2017-11-15 16:56:50 +01:00
yflory 630ac45948 Fix laggy and blinking tooltips 2017-11-15 16:31:26 +01:00
yflory 1f53304ad3 Display a dropdown menu inside another one 2017-11-15 15:35:28 +01:00
yflory 014e12b5b5 Ability to update the username from the userlist 2017-11-15 11:32:54 +01:00
yflory 7cfe64fc5b Remove cryptpad-common dependency for some inner apps 2017-11-13 18:09:19 +01:00
yflory 1514ad5df3 Move the 'logged out' screen inside the sframe 2017-11-13 17:29:00 +01:00
yflory 5a2afb5c95 Remove Realtime and Messaging from common 2017-11-13 17:01:09 +01:00
yflory 30c8c253dd Remove util and hash from common 2017-11-13 16:32:40 +01:00
yflory c9e1de042c Remove common-interface dependency from cryptpad-common 2017-11-13 12:00:26 +01:00
yflory dc207393fd Separate UI elements from cryptpad-common 2017-11-13 10:23:18 +01:00
Caleb James DeLisle 50da6b3b2e Needs to be handled in chainpad-listmap
Revert "Do content checks on the drive so if it gets corrupted, the patch will be rejected"

This reverts commit eaa7b6e8e5.
2017-11-11 01:34:20 +01:00
Caleb James DeLisle eaa7b6e8e5 Do content checks on the drive so if it gets corrupted, the patch will be rejected 2017-11-11 01:26:54 +01:00
yflory 354c63bd64 Clean old code 2017-11-09 18:17:49 +01:00
Caleb James DeLisle ac66511f0a Merge branch 'staging' into new-diff 2017-11-09 17:44:45 +01:00
yflory f931574dac lint compliance 2017-11-09 17:23:13 +01:00
Caleb James DeLisle 7b62a8042e Remove TextPatcher and begin to include ChainPad directly using requirejs instead of sniffing off the window 2017-11-09 17:07:04 +01:00
Caleb James DeLisle 840cd91bcb manual merge 2017-11-09 15:38:32 +01:00
Caleb James DeLisle 75130150d5 Refactored out TextPatcher and JsonOT and replaced with new ChainPad 2017-11-09 15:36:49 +01:00
yflory 101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +01:00
yflory c1ba08cfc6 Make sure thumbnails are .png 2017-11-07 15:04:45 +01:00
yflory 0956905ca8 Wipe localForage on log out 2017-11-07 14:56:50 +01:00
yflory 6b9ffe8dd1 Make thumbnails more secure 2017-11-07 14:51:53 +01:00
ansuz e07bb0f7b3 roll back to old transform function, except in pad 2017-11-06 17:18:10 +01:00