Commit Graph

5532 Commits (39b0785406a18a32c2a1a75c0c64ef036ca9dccd)

Author SHA1 Message Date
Weblate af3c810b7b Translated using Weblate (French)
Currently translated at 100.0% (930 of 930 strings)

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-18 16:29:03 +00:00
Weblate 95f9b176dc Translated using Weblate (English)
Currently translated at 100.0% (930 of 930 strings)

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/en/

Translated using Weblate (English)

Currently translated at 100.0% (930 of 930 strings)

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/en/
2019-02-18 16:29:03 +00:00
Weblate 413e6ac0e1 Update translation files
Updated by "Cleanup translation files" hook in Weblate.

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/
2019-02-18 16:29:03 +00:00
yflory 03b40d87ed Add support for table of contents in the code app (#325) 2019-02-18 17:25:27 +01:00
yflory 37a79a0141 Fix arrow keys not working in input fields in the drive 2019-02-18 15:16:00 +01:00
yflory 26e8cea545 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-02-18 15:09:52 +01:00
yflory bfe985e406 Move the chat code outside of the contacts folder 2019-02-18 15:09:27 +01:00
CryptPad 5b1587914c Translated using Weblate (Spanish)
Currently translated at 47.7% (443 of 929 strings)

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/es/
2019-02-13 15:48:18 +00:00
CryptPad c1f6208762 Translated using Weblate (Spanish)
Currently translated at 47.6% (442 of 929 strings)

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/es/
2019-02-13 15:44:39 +00:00
Yann Flory 2415b54b83 Translated using Weblate (French)
Currently translated at 100.0% (929 of 929 strings)

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-13 15:35:57 +00:00
Yann Flory e889870b93 Translated using Weblate (English)
Currently translated at 100.0% (929 of 929 strings)

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/en/
2019-02-13 15:35:57 +00:00
Yann Flory 80ccdb29d2 Translated using Weblate (French)
Currently translated at 100.0% (929 of 929 strings)

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-13 14:44:42 +00:00
Admin b481ee0536 Translated using Weblate (French)
Currently translated at 100.0% (929 of 929 strings)

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-13 14:44:42 +00:00
Admin 9dd3db0dc4 Translated using Weblate (French)
Currently translated at 100.0% (929 of 929 strings)

Translation: CryptPad/App
Translate-URL: http://disrupt.cryptpad.fr/projects/cryptpad/app/fr/
2019-02-13 14:16:55 +00:00
yflory f112864027 Update indentation in JSON translation files 2019-02-13 15:14:56 +01:00
ansuz 07c942de9d drop unnecessary keys from french translation 2019-02-12 13:38:18 +01:00
ansuz a089ed8e9d Merge branch 'soon' of github.com:xwiki-labs/cryptpad into soon 2019-02-12 12:07:35 +01:00
ansuz b319fefa86 migrate .de translation to json 2019-02-12 12:05:22 +01:00
ansuz f1d1818200 resolve merge conflicts 2019-02-12 11:58:13 +01:00
yflory d0f70d413a Update french translation 2019-02-12 11:19:59 +01:00
yflory 4774eff6ae Add tests for the href validator 2019-02-12 11:19:45 +01:00
yflory c0d33040b6 Fix an issue with empty hash in the href validator 2019-02-12 11:16:13 +01:00
ansuz 905e6b0fa1 add new translation keys to English text 2019-02-11 17:16:21 +01:00
ansuz 18b5e1a405 Merge remote-tracking branch 'origin/weblate' into soon 2019-02-11 13:55:08 +01:00
JanRei 2b33d9ecee Update German translation plus some minor message fixes 2019-02-10 13:35:18 +01:00
yflory 18479fc81a Display a lock icon on password protected pads in the drive (#320) 2019-02-08 17:05:12 +01:00
yflory 6c1da07c60 Display an error when an invalid hash in used 2019-02-06 15:35:27 +01:00
yflory 2815c96ce8 Fix 1px UI issues with drive icons 2019-02-05 17:23:08 +01:00
yflory 46c3f1f3df Add the properties box to the OO apps toolbar 2019-02-05 17:07:49 +01:00
yflory 084aa09a2c lint compliance 2019-02-05 17:07:19 +01:00
yflory 6855c3e9fd Fix incorrect total size displayed for spreadsheets (#318) 2019-02-05 16:32:49 +01:00
yflory c9450de799 Fix 'lock is null' error in onlyoffice apps 2019-02-05 16:19:09 +01:00
yflory f04ba4a3d8 Too many false positive with the timeout detection 2019-02-05 16:17:54 +01:00
yflory 412670c8a6 PCS with owners and password for spreadsheets 2019-02-05 15:58:49 +01:00
yflory a0049b360a Break long words in kanban items 2019-02-05 14:42:01 +01:00
yflory f381ca8cab Fix wrong index when editing a kanban item 2019-02-05 14:41:00 +01:00
yflory aa5484ff21 lint compliance 2019-02-04 16:22:05 +01:00
yflory df2069eb4a Scroll to the element when using in the drive 2019-02-04 16:21:13 +01:00
yflory fe0961b24b Enable import feature in spreadsheets 2019-02-04 16:08:28 +01:00
yflory ea54dd7392 Fix spreadsheets issues when using multiple sheets 2019-02-04 15:45:01 +01:00
yflory 4abed38bb1 Add a dev mode to facilitate debugging 2019-01-31 15:27:01 +01:00
yflory 07cd0b21b6 Fix last known hash sent to onlyoffice (it is already known...) 2019-01-31 15:26:03 +01:00
yflory 0c4c9dd283 Merge branch 'master' into staging 2019-01-31 14:09:42 +01:00
yflory bd6a9ed3f8 Use the correct API for the filepicker channel 2019-01-31 11:57:16 +01:00
yflory 3b8d6213e0 lint compliance 2019-01-31 10:29:12 +01:00
yflory 9367dc8b4d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-31 10:19:33 +01:00
Adrian Nöthlich 13970d5c73 Started to rework the German translation 2019-01-30 16:34:18 +01:00
yflory cb89a5fdfe Test timeout to kill phantom viewers 2019-01-30 15:50:37 +01:00
yflory d989b6d6e4 Fix one case of phantom viewers 2019-01-30 15:49:07 +01:00
yflory 6018f57ec1 Change translation format to JSON 2019-01-30 14:38:21 +01:00
yflory d97ada3e26 Test new translations 2019-01-29 17:50:02 +01:00
yflory 7e00d444c0 Update markdown rendering in code and slide 2019-01-29 14:39:06 +01:00
yflory e5abaa34b2 Fix cursor channel not updated to ephemeral 2019-01-29 11:40:44 +01:00
ansuz 38803195a3 Merge branch 'soon' into staging 2019-01-28 17:58:13 +01:00
ansuz c811a1a5a1 Merge branch 'master' into soon 2019-01-28 17:56:53 +01:00
yflory 50e814f4d0 Fix access to undefined object in sheet 2019-01-28 17:28:13 +01:00
yflory 0e61c46dcf Move fonts to the onlyoffice build 2019-01-28 17:06:17 +01:00
yflory 4e6df3d1c0 lint compliance 2019-01-28 16:39:49 +01:00
Ludovic Dubost 32af7f5871 Support import/export to internal format for office pads 2019-01-28 15:58:19 +01:00
yflory aec9e1be72 Text for the help menu in oo apps 2019-01-28 15:42:49 +01:00
yflory 739f1674d1 Hide upload table in onlyoffice 2019-01-28 15:42:35 +01:00
yflory af55e07107 Remove console log in oo apps 2019-01-28 14:11:51 +01:00
yflory 9ca7d504d2 Display help box in oo apps 2019-01-28 11:31:57 +01:00
yflory e78fc2abcb Add the spreadsheet app to the home page 2019-01-25 17:30:27 +01:00
yflory 6e153dc858 Handle server connection loss 2019-01-25 17:14:52 +01:00
yflory e93c9c3faa Rename the spreadsheet app 2019-01-25 17:13:55 +01:00
yflory 3d1d79e379 Disable strict mode 2019-01-24 19:02:09 +01:00
yflory 56ff47af48 Enable chat in OO apps 2019-01-24 16:43:05 +01:00
yflory ed4f8016a1 Merge branch 'staging' into locks 2019-01-24 16:27:15 +01:00
yflory 024eafaf32 Hide oodoc and ooslide in the apps list 2019-01-24 16:26:15 +01:00
yflory 4946a44e33 Pin the realtime channel in the OO apps 2019-01-24 16:20:56 +01:00
yflory 139b4608c0 lint compliance 2019-01-24 15:52:37 +01:00
yflory 88d23039b6 Remove old code and add comments 2019-01-24 15:46:04 +01:00
yflory ec2f21ec64 Implement lock mechanisms for spreadsheets 2019-01-24 15:26:35 +01:00
ansuz 21d035393d disable english translations 2019-01-24 14:48:18 +01:00
ansuz 5410728bff lint compliance 2019-01-24 14:47:39 +01:00
Paul Libbrecht 73a75c11c9 Actualizing German translations. PL 2019-01-23 19:04:05 +01:00
yflory e993925d81 Better implementation of the IE fix 2019-01-22 13:36:21 +01:00
yflory 01f93f6f7b FIx unrecoverable errors when using IE11 2019-01-22 12:25:49 +01:00
yflory 2ac176eeec Share the correct index in onlyoffice messages 2019-01-21 16:54:31 +01:00
yflory 7d0f34a684 Debugging tools 2019-01-21 16:54:15 +01:00
yflory a66d8c1384 Use lastKnownHash to handle checkpoints in the realtime channel 2019-01-18 18:17:34 +01:00
ansuz 93c5dc9202 Merge branch 'soon' into staging 2019-01-18 15:45:02 +01:00
ansuz 69b50dd102 Merge branch 'master' into soon 2019-01-18 15:44:52 +01:00
yflory 1ecc460686 Fix a backup and restore issue from the settings 2019-01-18 15:41:09 +01:00
yflory ef452d1221 Fix language detection in codemirror when importing a markdown file 2019-01-15 18:20:33 +01:00
yflory 8dbeee1af9 Realtime spreadsheets 2019-01-15 17:54:44 +01:00
yflory a41a31a574 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-15 14:34:17 +01:00
yflory 6fa7b147e9 Add C, C++, Objective-C and Java to the list of languages in the code app 2019-01-15 14:34:11 +01:00
yflory c5f554fe7b Test with onlyoffice 5.2.6 2019-01-15 14:28:49 +01:00
yflory b79ba61984 Improve realtime channel for onlyoffice 2019-01-15 10:46:39 +01:00
ansuz 5a61453492 Merge branch 'soon' into staging 2019-01-14 16:42:37 +01:00
ansuz 6cf8720458 update how the async store chooses to prune history to avoid the diverged checkpoint bug 2019-01-14 16:40:54 +01:00
ansuz 9105a89eab intantiate ephemeral channels with 34 hex characters 2019-01-14 15:32:49 +01:00
yflory efdecd4059 First step for realtime in onlyoffice apps 2019-01-14 14:01:22 +01:00
ansuz 6f89156415 guard against calling an undefined function 2019-01-11 17:01:43 +01:00
yflory 41a1148c17 Use the same code for the different frontend channels 2019-01-11 15:30:26 +01:00
ansuz 20959f84ae return Boolean from our test for WebRTC support 2019-01-10 18:21:39 +01:00
ansuz 060e5a12a2 lint compliance 2019-01-09 16:16:44 +01:00
ansuz 0f644b04b2 send feedback related to full drive export 2019-01-09 16:16:32 +01:00
yflory b4aae68c0c Fix access rights in the file app 2019-01-09 12:15:08 +01:00
yflory 6a45f5233e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 17:47:38 +01:00
yflory 6af7d393fd Fix cache issue with ckeditor css 2019-01-08 17:47:22 +01:00
ansuz 0783944e1c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 15:17:51 +01:00
ansuz 424a14625d add feedback keys for password change and drive migration 2019-01-08 15:17:43 +01:00
yflory 573a3557f1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 15:03:16 +01:00
yflory 5b80fafe5e Add feedback 2019-01-08 15:03:02 +01:00
ansuz ab832f38b7 send feedback for the subscription button in the settings sidebar 2019-01-08 14:44:40 +01:00
ansuz bcd6a4b6c6 add feedback keys 2019-01-08 14:33:02 +01:00
yflory 107c352922 Update translations 2019-01-08 14:02:54 +01:00
yflory f760253137 Fix typo 2019-01-08 14:02:03 +01:00
yflory d87a87410d Preserve hidden owned pads from a deleted folder 2019-01-08 13:57:22 +01:00
yflory a9e030a6a8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2019-01-08 10:54:00 +01:00
yflory 6140952763 Hide duplicated owned pads settings for anon users 2019-01-08 10:53:40 +01:00
ansuz 611fb4895c Merge branch 'soon' into staging 2019-01-07 17:07:21 +01:00
Paul Libbrecht 1cd79e12f2 Latest update of the German translation (cursors, shared folders, ...). 2019-01-07 12:25:19 +01:00
yflory 1e672c4a6b Use onlyoffice spreadsheets without ooserver 2019-01-07 12:02:38 +01:00
yflory 047a4a3ab4 Copy files to a shared folder instead of moving them 2019-01-07 10:25:13 +01:00
rhoio 5294604b90
Style, grammar and typo fixes in german translation 2019-01-06 17:40:36 +01:00
yflory 0a7adb3e88 Hide duplicated owned pads 2019-01-04 15:10:13 +01:00
yflory 7658fb90a2 Translations for spellcheck 2019-01-03 18:47:27 +01:00
yflory cef9733262 Enable spellcheck in pad 2018-12-21 18:16:29 +01:00
yflory c6acd191b9 Own drive translations 2018-12-20 11:18:12 +01:00
yflory f2f9b57505 Own drive migration 2018-12-19 18:59:20 +01:00
yflory b2b23446e8 Add missing translations 2018-12-18 14:48:52 +01:00
yflory bbc06f668f Fix undefined hash for deleted shared folders 2018-12-17 15:49:48 +01:00
yflory a11a883cff Cursor improvements in pad, code and slide 2018-12-17 11:44:08 +01:00
yflory d76c21fcf5 Register link in the login page 2018-12-14 16:50:25 +01:00
yflory 2031d535d7 Cursor in pads (again) 2018-12-14 16:40:15 +01:00
yflory ee3102143f Remove debugging logs 2018-12-14 15:38:04 +01:00
yflory 760f58b74c Merge branch 'staging' into oo2 2018-12-13 16:24:11 +01:00
yflory 47fa7f29c9 Merge branch 'disableApps' into staging 2018-12-13 14:46:24 +01:00
yflory 2498f45eb3 Clickable links in pad 2018-12-13 13:22:19 +01:00
yflory ae7d97b3dd Ability to disable apps using appconfig 2018-12-12 14:52:58 +01:00
yflory f883fb7e04 Preserve chat and cursor channel when importing a template 2018-12-12 13:48:28 +01:00
yflory 1a0344547b Improve cursor in pad 2018-12-11 15:59:40 +01:00
yflory 7bbf6951f2 Disable cursors in pad 2018-12-11 14:16:15 +01:00
yflory bfd94c7f2b Merge branch 'cursor' into staging 2018-12-11 13:36:49 +01:00
yflory 95a0bc9fc1 Merge branch 'rochat' into staging 2018-12-11 13:36:41 +01:00
yflory 489a99c5c4 Don't delete the old chat for now 2018-12-11 13:35:00 +01:00
yflory 0197f583f2 Translations for the cursor position settings 2018-12-11 12:04:11 +01:00
yflory 13da052325 Update translation key 2018-12-11 11:09:34 +01:00
yflory fb5ad34299 Fix typo... 2018-12-11 10:57:43 +01:00
yflory a121df2600 Delete validateKey in the messenger memory when we leave the channel 2018-12-11 10:52:11 +01:00
ansuz 8affe4053c Merge branch 'staging' of github.com:joldie/cryptpad into print-code 2018-12-11 10:41:17 +01:00
yflory d88dee9a83 Restrict sending messages in a pad chat to editors only 2018-12-10 17:47:47 +01:00
yflory 32fc941141 Merge branch 'staging' into cursor 2018-12-10 13:46:27 +01:00
yflory a2e28e6e25 Fix missing avatar in cursor tooltip 2018-12-10 13:46:21 +01:00
joldie b2c20682df Removed unnecessary media query. 2018-12-10 13:23:56 +01:00
yflory 186e4b14fe Add missing file 2018-12-10 11:58:34 +01:00
yflory c6f63d4d54 Cursor position in pad 2018-12-10 11:57:39 +01:00
joldie 35c39fae5d Added print button to code pad page. 2018-12-06 16:43:48 +01:00
yflory 600c984576 Only show the user colors in the userlist if the app supports it 2018-12-06 13:59:56 +01:00
yflory 081fc01694 Add a settings category about the cursor 2018-12-06 13:48:14 +01:00
yflory c81b4d77e8 lint compliance 2018-12-06 11:55:40 +01:00
yflory 690cba2b8f Add cursor in slide 2018-12-06 11:54:49 +01:00
yflory f157f852b1 Fix and improve cursor 2018-12-06 11:54:34 +01:00
yflory 1ba80a344b See other users' cursor position 2018-12-04 17:18:42 +01:00
yflory 008b5a3e9f Fix an ownership issue in friend channels 2018-11-27 16:57:55 +01:00
yflory ca45ff31d1 Refactor messenger to use commands from UI to store 2018-11-27 16:55:56 +01:00
yflory cc3e6f3924 Fix scrollbar position in ckeditor #296 2018-11-27 14:07:17 +01:00
yflory f5965716b6 Minor update because of flow... 2018-11-27 13:58:33 +01:00
yflory 2a46b8f855 Fix an issue with last known hash in the messenger 2018-11-27 13:42:11 +01:00
yflory dbad925e5e New cursor recovery system (beta) 2018-11-26 16:23:16 +01:00
yflory 13d6579861 Add typing test in the code app 2018-11-22 14:45:12 +01:00
yflory 015449832c Fix missing characters caused by concurrent editing 2018-11-22 14:44:46 +01:00
yflory 0e6057ee3c Merge branch 'soon' 2018-11-20 15:02:12 +01:00
yflory 3e45cff7c0 Merge branch 'staging' into soon 2018-11-20 15:01:48 +01:00
yflory 56267f4ee1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-11-20 15:01:17 +01:00
yflory aa3f6cb7d7 Update some icons in the drive 2018-11-20 15:01:12 +01:00
ansuz 1b83431382 Merge branch 'master' of https://git.xwikisas.com/xwiki-labs/cryptpad 2018-11-20 13:11:49 +01:00
ansuz d407f9af74 downgrade an XXX to a FIXME 2018-11-20 11:27:59 +01:00
ansuz 04d96d5d0e remove outdated comments 2018-11-20 11:23:31 +01:00
ansuz fcce48f2dd Merge branch 'soon' into staging 2018-11-20 11:12:41 +01:00
yflory 8522c3723d Translations for the NGI logo 2018-11-19 17:08:20 +01:00
yflory 3d712d9008 Merge branch 'cursor' into staging 2018-11-19 15:22:35 +01:00
yflory 9d9845434e lint compliance 2018-11-16 11:28:05 +01:00
yflory 3b9e1ee10c Fix scrolling issue in pads when clicking on buttons 2018-11-15 18:24:01 +01:00
yflory ab35d6b778 lint compliance 2018-11-13 17:22:34 +01:00
yflory 3a4cfbb7e8 Disable HTML in chat 2018-11-13 17:19:28 +01:00
yflory 22f1ac9e1e Merge branch 'master' of github.com:xwiki-labs/cryptpad 2018-11-13 14:21:24 +01:00
yflory 04decacaca Forbid JavaScript in links to the bounce app 2018-11-13 14:18:09 +01:00
yflory fc915e3337 Use DiffMarked in messenger to avoid duplicate code 2018-11-13 14:14:23 +01:00
yflory c64feae7bf Merge branch 'staging' into cursor 2018-11-12 11:51:17 +01:00
yflory 2a6945cbe5 Fix export in the pad app with Chrome 2018-11-12 10:54:21 +01:00
yflory b166c70a5f Fix conflict when a user was reverting the latest patch from someone else 2018-11-09 16:38:16 +01:00
yflory 8f849d8d4a Merge branch 'staging' into cursor 2018-11-08 18:24:33 +01:00
yflory 4daa2266c0 Fix new network open for each shared folder 2018-11-08 18:24:06 +01:00
yflory fe0d579d56 Cursor improvements in pad (Beta) 2018-11-08 12:06:46 +01:00
yflory 82c3c7f50b Improve the Typing Test in pad 2018-11-08 10:46:07 +01:00
yflory a5b04bd62a Download a file from the drive using the context menu 2018-11-06 18:35:04 +01:00
Paul Libbrecht 3f2e6b0611 completion 2018-11-06 13:01:17 +01:00
yflory dcdc0972dd Update template icon in the drive tree 2018-11-06 11:40:18 +01:00
yflory 4e26a8fbc5 Merge branch 'soon' into staging 2018-11-06 10:47:03 +01:00
Paul Libbrecht 12b2224dad Bad syntax error left. Sorry. Now fixed.
paul
2018-11-05 19:10:56 +01:00
yflory b74e086602 Shortcuts are now added from sframe-common 2018-11-05 17:46:51 +01:00
yflory 05e7d5eb9b Add missing translation 2018-11-05 17:32:25 +01:00
yflory 997692efb4 Use the font-size codemirror setting in the slide app too 2018-11-05 17:30:07 +01:00
yflory c4c1fcb080 Fix table rendering in polls description 2018-11-05 17:23:01 +01:00
yflory 1c5847dd01 Prevent Ctrl+S from saving useless content. Add support for custom shortcuts in CkEditor 2018-11-05 16:53:25 +01:00
yflory 1d31aab990 Display more warning messages about the full drive export 2018-11-05 15:09:32 +01:00
yflory 7509ce1cc7 Use new application icons 2018-11-05 12:02:27 +01:00
Paul Libbrecht 31a6fac4e0 Update German translation with latest phrases. Paul 2018-11-02 21:03:20 +01:00
yflory 5ce76a6358 Fix a new z-index issue in slide... 2018-10-29 14:33:08 +01:00
ansuz ef08771ffa
Fix typo in German translation, closes #290
s/Unbenennen/Umbenennen
2018-10-29 12:11:16 +01:00
yflory db25d914ab Improve default UI for small or zoomed screens 2018-10-29 11:48:22 +01:00
yflory 9d6c9dcf5e Fix font issue with new paragraph in pads (#284) 2018-10-29 11:47:57 +01:00
yflory 8b554dec63 Set font size in code editor from the settings page (#140) 2018-10-29 11:46:57 +01:00
yflory 2af2fccc11 Fix overflowing text in pad 2018-10-26 16:30:01 +02:00
yflory e4daa5adbe Fix random character insertion 2018-10-25 17:26:46 +02:00
yflory aa6c6c7f3a Merge branch 'master' into staging 2018-10-25 14:00:05 +02:00
yflory d3dbd0c712 Move static pages content in their own file 2018-10-25 11:41:18 +02:00
yflory bf720f2f30 Fix export with old polls 2018-10-25 10:35:39 +02:00
yflory e3b89a5e59 Fix kanban color picker preventing items drag&drop #277 2018-10-23 18:25:48 +02:00
yflory 98db6057c8 Allow shared workers by default 2018-10-23 15:06:17 +02:00
yflory d748620129 Add timeout when downloading a file in drive export 2018-10-23 14:23:27 +02:00
yflory 3c99302c32 Update French translation 2018-10-23 14:21:42 +02:00
yflory 4e3c09f640 Merge branch 'master' into staging 2018-10-22 17:22:28 +02:00
yflory 6924541080 Merge branch 'move' into staging 2018-10-22 17:13:41 +02:00
yflory 85cb56df1d Import changes from pull requests in master (translation files were moved) 2018-10-22 17:11:17 +02:00
yflory 35b0f878c7 Merge branch 'backupdrive' into staging 2018-10-22 15:14:08 +02:00
yflory fc86e5daf8 French translation 2018-10-22 15:13:55 +02:00
yflory ef37bac2e7 Add UI for the CryptDrive export 2018-10-19 18:38:35 +02:00
yflory 6397528f0f Fix poll export 2018-10-19 18:37:15 +02:00
yflory 3e9e92dcac Implement full CryptDrive export 2018-10-18 18:50:38 +02:00
yflory 5a6c3597db Fix missing cursor in empty pads with Chrome and fix page mode 2018-10-17 15:02:02 +02:00
yflory f538a05044 Fix an issue with empty mediatag widgets in pads 2018-10-17 14:33:16 +02:00
yflory 92ce311694 Basic CryptDrive export with pads 2018-10-17 14:32:33 +02:00
yflory f4d5a7567f Return an error when the pad has been deleted from the server 2018-10-16 17:49:24 +02:00
yflory 9f0398826d Make customized translations more maintainable 2018-10-15 18:38:41 +02:00
yflory 947c9c5e40 lint compliance 2018-10-15 17:33:07 +02:00
yflory caa72ba949 Remove dropdown menus scrollbar when space is available 2018-10-15 16:35:21 +02:00
yflory 8261ad86ae Update translation 2018-10-15 16:34:24 +02:00
yflory 3257914b17 Add support for PowerShell mode in codemirror 2018-10-08 11:16:38 +02:00
yflory bf55657993 Password-protected shared folders 2018-10-05 18:06:11 +02:00
yflory e6379dacd8 Redraw the preview in the code app when the tab gets the focus 2018-10-05 18:05:39 +02:00
yflory c127f0a5f6 Add a comment 2018-10-05 18:04:48 +02:00
yflory 7d3d3cf5ac Distinguish between two anonymous users in the chat 2018-10-05 18:04:20 +02:00
ansuz 90c905827d
Merge pull request #281 from ryanpcmcquen/patch-2
Typo fix: additionnal => additional
2018-10-05 10:22:03 -04:00
yflory 2a313a90e0 Don't rejoin a dropped channel on reconnect and leave chat channel 2018-10-04 11:08:23 -04:00
yflory 498703384f Don't rejoin a dropped channel on reconnect and leave chat channel 2018-10-04 15:29:34 +02:00
yflory 2a86db2001 New Features page 2018-10-03 17:25:04 +02:00
yflory 5cbe2f7c0f Fix tag autocomplete and Tags category in the drive 2018-10-03 15:22:13 +02:00
yflory 5d3d591228 Keep trying until the first tab is loaded 2018-10-02 18:14:06 +02:00
yflory c59d744d78 Fix loading a tab while another one is initializing the worker 2018-10-02 17:49:39 +02:00
ansuz 1d63419df8 update error handling, but leave the note to come back 2018-10-02 11:31:08 -04:00
yflory c5c6dc8223 Enable browser notifications for messaging tools 2018-10-02 12:08:25 +02:00
yflory 1201f2dcc4 Fix small UI issue 2018-10-01 18:28:25 +02:00
yflory 9a6e6f6e15 Fix User menu and link to drive in anonymous shared folders 2018-10-01 18:24:08 +02:00
yflory d78a00b5e1 Ese the correct document type in the text for the store corner popup 2018-10-01 17:35:19 +02:00
yflory 930677750c Merge branch 'anonsf' into staging 2018-10-01 16:21:53 +02:00
yflory dcabfb464d Refresh shared folder on change for anon users 2018-10-01 15:42:29 +02:00
yflory 0a83840c9c View a shared folder with an unregistered user 2018-10-01 15:17:27 +02:00
Ryan P. C. McQuen df442f9b1e
Typo fix: additionnal => additional 2018-09-28 20:16:41 -07:00
yflory e1329b7d46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-09-28 15:12:22 +02:00
yflory 17bc1ee703 Load shared folder when not logged in 2018-09-28 15:06:24 +02:00
yflory 0e04c4392c Avoid timeout in accounts.cryptpad.fr caused by the auth app 2018-09-28 15:05:39 +02:00
ansuz e77f833652 come back to this error 2018-09-25 20:09:45 -04:00
ansuz ad4e36015b Merge branch 'soon' into staging 2018-09-20 11:44:56 -04:00
ansuz 91cff453f1 enable shared folders by default 2018-09-20 11:40:42 -04:00
yflory 673dc22159 Update messenger UI 2018-09-19 17:30:15 +02:00
yflory 0e9b30744b Add support for less highlighting 2018-09-19 17:06:39 +02:00
yflory 6b4643a916 Add syntax highlighting in code blocks rendered from markdown 2018-09-19 16:51:53 +02:00
ansuz cb87f49b1f
Merge pull request #271 from Nordgedanken/fix-#254
[WIP] Partially Fix #254
2018-09-19 09:09:55 -04:00
yflory 248b87a1e1 Enable chat in the poll app 2018-09-18 16:36:29 +02:00
yflory 9db9b132b6 Use framework outer in the whiteboard app 2018-09-18 15:49:42 +02:00
yflory 8243927352 Fix an issue preventing shared folders from being moved in the drive 2018-09-18 15:43:42 +02:00
yflory 35977a7ef0 Color consistency in kanban 2018-09-18 14:56:06 +02:00
ansuz 7deb346552 update to new marked lib without breaking custom renderers 2018-09-17 15:35:53 -04:00
yflory 4025022352 Fix contextual chat notifications 2018-09-17 18:45:00 +02:00
yflory e75b9ea168 Prevent shared folders from being dropped to the trash 2018-09-17 18:09:26 +02:00
yflory 874156ccf0 Prevent shared folders from being moved to the trash using the del key 2018-09-17 17:53:18 +02:00
yflory bd1b120ab1 Add feedback about crowdfunding 2018-09-17 16:02:52 +02:00
yflory f662036817 Change the hash in the address bar when browsing a shared folder 2018-09-17 15:10:10 +02:00
yflory 38daf4676c Add text in the drive's share button for consistency 2018-09-17 14:52:46 +02:00
yflory 7a93927068 Fix UI issues with the new pad modals 2018-09-17 14:39:52 +02:00
yflory 179df27e3c Fix autostore not displaying the error message when over pin limit 2018-09-17 11:23:35 +02:00
yflory c1ef8243a1 Ability to select multiple files to upload (#275) 2018-09-17 10:31:27 +02:00
yflory 747c7ffdc3 Improve UI for contextual chat and add warning message 2018-09-14 17:30:12 +02:00
yflory 6c27d2964c Disable friends chat in pad messenger 2018-09-14 15:42:41 +02:00
yflory 1895d6cbd8 Disable crowdfunding message for premium users 2018-09-14 11:21:52 +02:00
yflory 6257b23f16 Crowdfunding config 2018-09-14 10:36:29 +02:00
yflory 716159d300 Add OpenCollective links 2018-09-13 18:47:46 +02:00
MTRNord 8b384d6bb3
fix jscolor picker for new kanban items and fix the code according to CI 2018-09-13 16:20:42 +02:00
MTRNord e7a1433a30
fix loading of the item color from saved state 2018-09-13 16:15:11 +02:00
MTRNord 2ef397a483
improve item color picker logic and UX 2018-09-13 16:08:27 +02:00
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
ansuz 76af3b90a7 stub createUnpinnedWarning0 2017-12-12 13:47:24 +01:00
ansuz 7b8321c263 make a test fail so we don't forget to fix the bug 2017-12-12 13:43:55 +01:00
yflory a863011a0c Fix profile in read-only mode 2017-12-12 12:14:32 +01:00
yflory 0d05d880ee Fix the bounce app 2017-12-12 10:47:01 +01:00
yflory b30efff5d1 Better way to check if we're using the safe origin in bounce 2017-12-12 10:44:20 +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 353b146644 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-12-11 12:21:17 +01:00
yflory 1922dbfd75 Creation page with mobile support 2017-12-11 12:19:44 +01:00
Caleb James DeLisle dd44b4da99 Removed old /less/ directory which is nolonger used :) 2017-12-08 14:56:13 +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 0080dd7624 Fix codemirror width with small screens in the code app 2017-12-07 17:28:05 +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 e397f66b56 lint compliance 2017-12-04 15:27:48 +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 b14228da18 Merge branch 'staging' into refactor 2017-12-01 17:04:03 +01:00
yflory c59c6072f3 Remove jquery from outer 2017-12-01 16:05:23 +01:00
yflory fc027ba00b Test webworker app 2017-12-01 15:03:01 +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 7c8572c99d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-30 18:32:27 +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 d1277d7026 Merge branch 'staging' into refactor2 2017-11-30 17:25:23 +01:00
ansuz 3f892e04a5 fix codemirror overflow css 2017-11-30 17:24:43 +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 96cf83af34 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 18:26:11 +01:00
ansuz 385ac9607c pass 'self' into common-util instead of using window 2017-11-27 18:26:04 +01:00
yflory acd8ab7446 Add the markdown toolbar in profile 2017-11-27 18:10:37 +01:00
yflory b0a384e8e0 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 17:55:48 +01:00
yflory 74e59a513a Add the markdown toolbar to the slide and poll apps 2017-11-27 17:55:20 +01:00
ansuz 22c5ff757b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 15:05:07 +01:00
ansuz 650d26afea use unified listmap in profile app 2017-11-27 15:04:59 +01:00
yflory 68d602f74a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 14:44:57 +01:00
yflory 644f6e9985 Use the bounce app to open links from inner 2017-11-27 14:44:44 +01:00
ansuz 5eacc158d9 make tests pass again 2017-11-27 13:45:40 +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 444ba91287 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-27 12:17:46 +01:00
yflory b0f553e9ea Add a markdown toolbar to help with the markdown syntax 2017-11-27 12:17:35 +01:00
ansuz 77c81f2426 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into merge-staging 2017-11-27 12:16:47 +01:00
ansuz 4ff4ccd1d3 use faster and more correct 'find' implementation 2017-11-27 11:30:50 +01:00
ansuz e3f04ef076 Merge branch 'soon' into staging 2017-11-27 11:11:49 +01:00
ansuz 71cf3a4ddf fix creation of personal todo list 2017-11-27 11:09:28 +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 2e00214783 drop unreachable code 2017-11-23 16:57:01 +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 4b5abdecbe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-23 12:29:32 +01:00
yflory 280a7c2765 Clean cryptpad-common 2017-11-23 12:28:49 +01:00
ansuz 98c2b0c802 Merge branch 'soon' into staging 2017-11-22 17:38:49 +01:00
ansuz 3ff0eb116b don't let search interfere with renaming 2017-11-22 17:23:14 +01:00
yflory eba1c9dfac Add chainpad log to the debug app 2017-11-21 18:50:33 +01:00
yflory a660c03f97 Fix scrollbar in the debug app 2017-11-21 17:42:50 +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
ansuz 9d662bd337 fix right-click pad creation in drive 2017-11-21 15:21:37 +01:00
ansuz d726c95f0b fix namespace collision 2017-11-21 15:10:28 +01:00
ansuz c8a9afb6c8 remove duplicate loading screen 2017-11-21 15:09:53 +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
yflory eb88efd83f Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-20 14:17:37 +01:00
yflory 80803ad076 Fix empty codemirror after thumbnail creation 2017-11-20 14:17:29 +01:00
ansuz a8d5a68eb5 open links correctly in contacts app 2017-11-20 14:06:19 +01:00
ansuz 7441a68fb9 update test after merging api changes 2017-11-20 12:22:26 +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 e2cf46d725 Add new keyboard shortcuts for the drive search 2017-11-20 11:50:52 +01:00
yflory cf26c4c286 Improve the toolbar UI for smaller screens 2017-11-17 18:21:45 +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 fd258fc277 Fix preview button tooltip in code 2017-11-17 18:19:35 +01:00
yflory fe9261f6a2 Fix modules order in TODO 2017-11-17 18:19:11 +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 bdd24ed14f lint 2017-11-14 11:57:13 +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 be848c1bec Fix broken readonly link in drive 2017-11-09 17:27:50 +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 cf5ccf04f2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-11-09 14:23:54 +01:00
yflory 101482b8cc Migrate settings to use a sandboxed iframe 2017-11-09 14:23:40 +01:00
ansuz 7f8147b18b Merge branch 'soon' 2017-11-07 15:06:57 +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 454fc8498c remove old* apps 2017-11-07 13:50:07 +01:00
ansuz e07bb0f7b3 roll back to old transform function, except in pad 2017-11-06 17:18:10 +01:00
yflory a592317e35 lint compliance 2017-11-06 15:49:40 +01:00
yflory fef97ed60e Fix an creating duplicates mediatags in markdown preview 2017-11-06 15:47:18 +01:00
yflory 9060464f37 Create thumbnails only when the tab is not focused 2017-11-06 13:36:54 +01:00
yflory a37e6c7979 lint compliance 2017-11-03 18:39:06 +01:00
yflory 2a3a5c4342 Ability to disable thumbnails 2017-11-03 18:38:27 +01:00
yflory 5dff9a32b6 Fix comments order in polls 2017-11-03 18:38:04 +01:00
yflory 1871749b6f Fix -1 viewer in the userlist when disconnected 2017-11-03 15:14:23 +01:00
yflory cf3024ef5b Ability to display an error in the toolbar state 2017-11-03 14:30:59 +01:00
yflory 8de9a596f1 Fix cursor in thumbnails 2017-11-02 19:11:27 +01:00
yflory fd7bb3aadb Make sure the infinite spinner modal is not displayed multiple times 2017-11-02 17:47:19 +01:00
yflory 3ebb5ca493 Fix issue in diffMarked creating text nodes for each character 2017-10-31 18:19:30 +01:00
yflory 5438970ab4 typo 2017-10-31 11:30:13 +01:00
yflory e0f7df80b3 Fix avatar upload and use less2 everywhere in profile 2017-10-31 11:11:29 +01:00
yflory 7f9b21405b Add missing files for profile 2017-10-31 10:27:41 +01:00
yflory e99836bae2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-30 18:49:43 +01:00
yflory 4250688856 Migrate profile to use sframe 2017-10-30 18:49:28 +01:00
ansuz 744809101c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-30 16:24:55 +01:00
ansuz 867df1db56 fix '+New' button in drive toolbar 2017-10-30 16:24:41 +01:00
yflory 907e2cb517 lint compliance 2017-10-30 15:13:27 +01:00
yflory abc511a56e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-30 15:12:29 +01:00
yflory 68accaf653 Todo in sframe with less2 2017-10-30 15:12:15 +01:00
ansuz 11b8b380fd Merge branch 'staging' into evilham 2017-10-30 14:50:11 +01:00
ansuz 04f26ff886 Merge branch 'staging' of github.com:evilham/cryptpad into evilham 2017-10-30 14:41:21 +01:00
ansuz 0a14c715ad add test for support of invite urls 2017-10-30 14:40:43 +01:00
Evilham 5dcfbd07ab Merge branch 'theming-improvement' into staging 2017-10-27 18:32:08 +02:00
Evilham 4933aafbc8 Added default values to avoid breaking existing themes. 2017-10-27 18:31:52 +02:00
ansuz 4c0049ad55 don't log presence of other users as 'joins' when you have first joined 2017-10-27 14:20:31 +02:00
ansuz 325f685f3e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-27 14:14:25 +02:00
ansuz 1cbf1aec92 prevent undefined access in non-sframe apps 2017-10-27 14:14:19 +02:00
yflory ac1b67ad67 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-27 13:31:54 +02:00
yflory 1245b4d244 Enable thumbnails in poll and whiteboard 2017-10-27 13:31:41 +02:00
ansuz d644054e3f lint compliance 2017-10-27 11:13:26 +02:00
ansuz ed253e6c75 Merge branch 'staging' into evilham 2017-10-27 11:03:16 +02:00
ansuz df1a700cb2 disable thumbnail test. add test for flat dom 2017-10-27 11:01:22 +02:00
ansuz 02cd7e5b58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-27 10:44:53 +02:00
ansuz 69890ebd8f prototype alternate datastructure for trees in listmap 2017-10-27 10:43:44 +02:00
ansuz 23c305f71f implement removeItem so localForage doesn't complain 2017-10-27 10:37:44 +02:00
Evilham 735f0a7e30 Merge branch 'theming-improvement' into staging 2017-10-26 20:44:56 +02:00
Evilham 83da9cf752 Moved colours to colortheme.less to enable theming 2017-10-26 20:29:14 +02:00
yflory 8251247da2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-26 12:31:33 +02:00
yflory 6f020b67ca Add thumbnails to framework apps 2017-10-26 12:31:16 +02:00
ansuz 98c66ef8f6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-25 13:04:08 +02:00
yflory bf817f20ee Fix file upload in code and slide 2017-10-25 12:31:22 +02:00
ansuz f031af4e9d fix broken media-tags in contacts 2017-10-25 10:50:17 +02:00
yflory 24572a40d2 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 18:50:19 +02:00
yflory f4adbd980e Thumbnails for the code app 2017-10-24 18:49:58 +02:00
ansuz ba97aa7ad2 allow file upload handler to create thumbnails for whiteboard 2017-10-24 18:09:38 +02:00
ansuz 6157c57a4b disable color palette when interface is not editable 2017-10-24 17:59:19 +02:00
ansuz 8359902f6a fix typo in poll 2017-10-24 17:42:08 +02:00
ansuz 69f9a7ebf3 make userlist change notifications configurable 2017-10-24 17:29:58 +02:00
Caleb James DeLisle 027b9fa383 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 18:03:31 +03:00
Caleb James DeLisle aa37997aa3 Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm> 2017-10-24 18:02:03 +03:00
ansuz bac608adfe Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 16:56:13 +02:00
ansuz dc90811090 only call onReady once in sframe-listmap 2017-10-24 16:56:08 +02:00
yflory bac10472f3 lint compliance 2017-10-24 14:32:47 +02:00
yflory 39b4cb9226 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-24 14:31:56 +02:00
yflory 18b5b20d27 Add thumbnails for PDFs 2017-10-24 14:31:42 +02:00
ansuz aee51f1317 lint compliance 2017-10-24 14:02:29 +02:00
ansuz 447b0a74ee handle errors for videos when uploading 2017-10-24 13:45:27 +02:00
yflory 30a69fae13 Add thumbnails for videos 2017-10-24 12:26:04 +02:00
yflory 21f8ae7570 Keep the correct ratio for image thumbnails 2017-10-24 11:45:07 +02:00
yflory 2dd3c42fd5 Fix handlers registered again on reconnect in drive and poll 2017-10-24 10:42:08 +02:00
yflory a0bcb901d3 Add titles in poll when options or usernames are overflowing 2017-10-23 15:16:51 +02:00
yflory 74985fd0f2 Use text for the addUser button in polls 2017-10-23 15:12:27 +02:00
ansuz 6db5a34323 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 14:53:42 +02:00
ansuz c17fc2efe7 improve option order in poll 2017-10-23 14:53:31 +02:00
yflory 2be22867c1 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 14:39:31 +02:00
yflory 13718d0263 Fix recent pads in chrome 2017-10-23 14:38:38 +02:00
ansuz 2e5fdf709a Merge branch 'soon' into staging 2017-10-23 14:29:01 +02:00
ansuz de8339fea7 hide alertify when you are in presentation mode 2017-10-23 14:25:25 +02:00
Caleb James DeLisle 9b02b36724 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-23 14:22:54 +03:00
Caleb James DeLisle d7e9498143 Fix and then disable the new OT 2017-10-23 14:22:33 +03:00
ansuz 288e141c1f add missing sframe method 2017-10-23 12:33:50 +02:00
yflory c1d05a00ba Improve media-tag export in pad to work with existing CSP 2017-10-23 10:55:40 +02:00
yflory 3e4faf1be1 Add new state messages in the toolbar 2017-10-20 18:12:47 +02:00
yflory 6d080bcb45 Ability to export mediatag images in pad 2017-10-20 18:10:08 +02:00
yflory a0dd867f33 Fix pending state not removed after friend invite rejected 2017-10-20 18:09:09 +02:00
yflory c25be21138 Fix the upgrade button in the drive 2017-10-20 10:16:01 +02:00
Caleb James DeLisle cc6b2192e4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-20 10:26:27 +03:00
yflory a3c7aa67d8 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-19 19:07:00 +02:00
yflory 094856a511 Fix renaming pad with multiple dots in the name in drive 2017-10-19 18:30:55 +02:00
ansuz bf832ba784 fix comment overflow 2017-10-19 17:30:40 +02:00
yflory 7bc2f81852 Fix pinned column not always stored in polls 2017-10-19 16:01:56 +02:00
yflory 88e7f9a218 Add last access and creation times in the properties window in drive 2017-10-19 15:05:55 +02:00
yflory 22e3baed4b Fix sort issues in drive 2017-10-19 15:00:29 +02:00
yflory f43606f71d Present mode to display only the parsed markdown in code 2017-10-19 14:39:38 +02:00
yflory 515214aed1 Use present mode in embed code 2017-10-19 11:59:07 +02:00
yflory 201c974df6 Merge branch 'thumbnails' into staging 2017-10-19 11:43:43 +02:00
yflory 7b8490ad20 Use less2 in contacts 2017-10-19 09:58:28 +02:00
yflory dd63cd13d7 Fix profile page title 2017-10-18 16:59:20 +02:00
Caleb James DeLisle 81d0b3272d Fix multiple infinite-spinner errors piling up on top of eachother 2017-10-18 14:49:50 +03:00
Caleb James DeLisle 9e4c48f537 lint errors 2017-10-18 12:25:13 +03:00
Caleb James DeLisle a149152f11 Merge branch 'staging' into framework 2017-10-18 11:42:31 +03:00
yflory 4197b7b968 Fix missing icon in list mode for files with thumbnail 2017-10-17 17:23:31 +02:00
yflory d941b1098a Remove selection in whiteboard when uploading to the drive 2017-10-17 17:21:15 +02:00
yflory 4116d08dd1 Display thumbnails in the drive and then file picker 2017-10-17 17:17:31 +02:00
yflory 6920129126 Embed images from the drive in whiteboard 2017-10-17 12:19:57 +02:00
MacLemon 867b971c33 Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections. 2017-10-14 00:31:31 +02:00
yflory 2fd120100a Merge branch 'wb' into staging 2017-10-13 16:58:59 +02:00
Caleb James DeLisle 15337603bb Merge branch 'staging' into framework 2017-10-13 13:41:24 +03:00
Caleb James DeLisle a6b34491fc freeze the editor when reconnecting 2017-10-13 13:40:51 +03:00
Caleb James DeLisle 854c1e94a4 make infinite spinner error message go away if ChainPad settles after it has been popped 2017-10-13 13:39:49 +03:00
yflory a859ab081a Fix fouc in drive 2017-10-12 18:21:34 +02:00
yflory 7b6432f134 Lint 2017-10-12 18:20:33 +02:00
yflory 6926d42292 Autoload template picker to make it faster to appear when used 2017-10-12 18:18:01 +02:00
yflory 1c8e1a36e8 Add file type in the pad attributes for existing files 2017-10-12 17:43:49 +02:00
yflory b86f8e3f26 Fix uloaded files not moved to the correct folder in drive 2017-10-12 17:33:22 +02:00
yflory 88d0a2b8a6 Merge branch 'master' into staging 2017-10-12 17:08:34 +02:00
yflory 5ed60a0ad7 Fix image ratio in slides 2017-10-12 16:45:51 +02:00
Caleb James DeLisle 753e2d797e Merge branch 'staging' into framework 2017-10-12 17:07:10 +03:00
yflory 62bc72847f Add an error message when trying to tag a deleted pad 2017-10-12 15:06:29 +02:00
Caleb James DeLisle c773b5d076 Remove a brittle test which can make a pad inaccessible, switch from transformFunction to (new) patchTransformer and add another DOM.normalize() which is needed 2017-10-12 15:42:09 +03:00
yflory 69dd3a60ab Hide template and fileupload buttons for anonymous users 2017-10-12 14:32:12 +02:00
yflory 8e1f15e88d Get title suggestion based on poll's description 2017-10-12 14:12:26 +02:00
ansuz e317265594 Merge branch 'master' of github.com:xwiki-labs/cryptpad 2017-10-12 14:09:55 +02:00
ansuz 0d912402e5 patch for bug in Firefox ESR 2017-10-12 14:09:48 +02:00
yflory 91381ca77d Fix lint errors 2017-10-12 12:20:27 +02:00
yflory 50090a3af6 Add placeholders for the comment form in poll 2017-10-12 12:18:32 +02:00
yflory 95ad25973e Ability to delete a stronger pad from readonly mode 2017-10-12 11:41:53 +02:00
yflory b28c1537e8 Fix history in readonly mode 2017-10-12 10:59:23 +02:00
yflory 620ba4ed5d Fix fouc in drive 2017-10-11 17:15:56 +02:00
yflory b31bbebf7b Buttons are missing in whiteboard when zoomed in 2017-10-11 17:11:38 +02:00
yflory a5a08176fb Merge branch 'master' into staging 2017-10-11 16:58:45 +02:00
yflory 54b5a2d654 Fix style issues in poll (Chrome) 2017-10-11 16:01:26 +02:00
yflory 86767184da Fix style issues in poll for Edge 2017-10-11 15:38:23 +02:00
yflory 00e8d32d60 Fix column position in poll for Chrome 2017-10-11 15:37:47 +02:00
yflory b110e1b8da Fix style issues in poll for Edge 2017-10-11 15:37:11 +02:00
yflory ecb537ac7f Move code to render.js in poll 2017-10-10 18:19:49 +02:00
yflory 75b3ff9c60 CSS issue in polls 2017-10-10 11:35:24 +02:00
yflory c46280d032 Fix style issues for Edge 2017-10-10 11:32:52 +02:00
ansuz 128c9c2f4e Merge branch 'staging' of github.com:CatalinScr/cryptpad into catalin 2017-10-09 17:20:23 +02:00
ansuz f0bdc3b26f second try 2017-10-09 16:57:30 +02:00
ansuz d50a692986 add note about tags to prompt 2017-10-09 16:51:57 +02:00
Caleb James DeLisle c8928a0811 Switch the transform function and also stop calling textPatcher without the metadata 2017-10-09 17:07:26 +03:00
yflory 035150614d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-09 15:38:08 +02:00
yflory 484e216054 Fix hashtag button in the toolbar 2017-10-09 15:37:37 +02:00
yflory 4c19375f4d Avoid missing characters in poll's inputs 2017-10-09 15:11:02 +02:00
ansuz a12239405b fix toolbar 'home link' to visit home page from drive 2017-10-09 15:10:38 +02:00
yflory dd141b5c9f Disable comments when a poll is not published 2017-10-09 14:08:54 +02:00
Caleb James DeLisle 36aee2d174 lets try normalizing the dom before applying a patch 2017-10-09 14:13:11 +03:00
Caleb James DeLisle 828a685ba8 Fix broken browser fight logging 2017-10-09 14:12:55 +03:00
yflory aa744567ed Fix thumbnails in sframe apps 2017-10-09 11:52:34 +02:00
yflory 5e7bf0cfb8 Embed an image in whiteboard 2017-10-09 10:32:24 +02:00
Caleb James DeLisle f0eb58ee95 Merge branch 'staging' into framework 2017-10-06 14:50:35 +03:00
Caleb James DeLisle 9509d538e0 Cursor not being updated at the right times before applying a patch. 2017-10-06 14:49:52 +03:00
yflory 888028c542 Lint 2017-10-05 18:13:28 +02:00
yflory e5a54b5978 Fix folder highlighting with drag&drop in the drive 2017-10-05 18:12:23 +02:00
yflory 1c7c37c121 Add the file class to pads in 'template' and 'recent' categories in the drive 2017-10-05 18:07:05 +02:00
yflory ab3648a30a Merge branch 'newpoll' into staging 2017-10-05 17:56:17 +02:00
yflory 1c4f1c785d Improve stability and UI in poll and its comments 2017-10-05 17:54:07 +02:00
ansuz 7559bc062e lint compliance 2017-10-05 17:06:02 +02:00
ansuz 503111d26a use recompiled media-tag 2017-10-05 17:00:47 +02:00
ansuz 427afc3954 override modified file name in pdfjs 2017-10-05 16:59:55 +02:00
ansuz d85db64939 add tags from drive 2017-10-05 16:58:34 +02:00
Caleb James DeLisle 0aecfad854 Occasionally the language selector only says "Mode" rather than the language 2017-10-05 16:12:49 +03:00
Caleb James DeLisle ae87320408 Preview pane cannot be resized after it has been hidden and then shown again 2017-10-05 16:12:24 +03:00
ansuz 1f35798194 stop event propagation from tag prompt 2017-10-05 15:08:34 +02:00
ansuz c936e5ae73 make context menu open correct app on correct port 2017-10-05 11:14:47 +02:00
Caleb James DeLisle d9e97b86e6 Merge branch 'staging' into framework 2017-10-05 12:14:37 +03:00
Caleb James DeLisle 383c2f54cb 1. Add a class cp-hidden-if-readonly which is display:none if the pad is in read-only mode. 2. Don't show color pickers or options when in read-only on presentation. 2017-10-05 12:14:03 +03:00
ansuz deed04108b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-10-05 10:22:07 +02:00
ansuz a90c078e84 correct reference to undefined 2017-10-05 10:21:59 +02:00
yflory 26dfc65c25 Comments in polls 2017-10-04 19:06:16 +02:00
yflory 5304dc319f Enable redirection to the previous page after registration 2017-10-04 15:55:57 +02:00
yflory ceb8ff18bd Fix ghost icon in drive 2017-10-04 15:52:09 +02:00
yflory 846b1a9fb3 Improve description UI in poll. Enable tags and mediatag 2017-10-04 15:39:18 +02:00
yflory 68bda92291 Use codemirror for description in poll 2017-10-03 19:04:29 +02:00
ansuz b8ce149db6 add hint about tag usage 2017-10-03 18:36:34 +02:00
ansuz f15ec4efe9 add tagging to whiteboard and file apps 2017-10-03 18:05:28 +02:00
ansuz f90742603e style fixes 2017-10-03 17:53:28 +02:00
Caleb James DeLisle d6570ad9f2 Standardize media-tag embedder and make media tags always absolute URL, Standardize import/export logic for codemirror apps, fix arrow key navigation in presentation fullscreen mode before first click. 2017-10-03 17:57:57 +03:00
yflory 707d3b3e94 Ability to export polls as csv 2017-10-03 16:50:59 +02:00
yflory 5cf86bf74a Update UI in poll and remove old code 2017-10-03 14:11:11 +02:00
ansuz 09c0a473e2 fix function signatures 2017-10-03 14:08:40 +02:00
yflory 3337689630 Wrong translation key in toolbar 2017-10-03 14:04:07 +02:00
Caleb James DeLisle 94d2f4472b Stop using presentSuccess because it is hidden behind the modal in slide 2017-10-03 12:10:16 +03:00
yflory 126742a1c3 Fix bugs in sframe poll and update UI 2017-10-02 19:02:31 +02:00
ansuz 351b95d6a9 resolve merge conflicts 2017-10-02 18:59:47 +02:00
ansuz 6c7b135f91 lint compliance 2017-10-02 18:58:18 +02:00
ansuz 94c392b79f secure messaging 2017-10-02 18:57:17 +02:00
Caleb James DeLisle 53f65f6a87 Merge branch 'staging' into framework 2017-10-02 17:46:27 +03:00
Caleb James DeLisle fa6938baa8 1. Migrated /slide/ to use framework
2. Fixed CSS not being applied on /slide/
3. Minor changes to /code/ to reuse code which is also used on /slide/
2017-10-02 17:34:37 +03:00
Caleb James DeLisle 1e5bc5da14 onReady should only be called once, onContentUpdate should be able to throw and there should be a generic normalizer 2017-10-02 15:09:25 +03:00
Caleb James DeLisle 7230c780a1 Get rid of last usages of cryptpad-common in pad/inner 2017-10-02 15:06:01 +03:00
Caleb James DeLisle 12e82e80ec When changing the title of a presentation, the title in the bottom of the slide should also change 2017-10-02 15:04:44 +03:00
ansuz 0a99478d9f catch diffdom errors and plow through 2017-09-28 11:50:35 +02:00
ansuz 0f9e93e1de make tests pass again 2017-09-28 10:36:40 +02:00
ansuz 48c49e5a75 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-28 10:23:59 +02:00
ansuz 19e58cec94 prevent typeError 2017-09-28 10:23:48 +02:00
yflory 66da349ee4 Sandboxed Poll app with less2 2017-09-27 18:52:04 +02:00
Caleb James DeLisle f95acda758 Minor refactoring of /pad/ ; moved /*/main.js into a common file ; framework'd /code/ 2017-09-27 16:53:16 +02:00
Caleb James DeLisle 6dbc02e81a Merge branch 'staging' into framework 2017-09-27 12:01:18 +02:00
Caleb James DeLisle 1c791b5b51 Fix framework by removing some async and also fix media tags 2017-09-27 11:58:14 +02:00
Caleb James DeLisle 90d00c10b1 Make metadata-manager a bit more robust 2017-09-27 11:56:25 +02:00
yflory 9b2251005c Merge branch 'staging' into newpoll 2017-09-27 10:36:33 +02:00
yflory 8de1852ab9 Lint compliance 2017-09-27 10:36:16 +02:00
yflory 2c10f9b07b Merge branch 'staging' into newpoll 2017-09-27 10:32:03 +02:00
yflory e02a779c14 Use secure drive as default drive 2017-09-27 10:31:35 +02:00
yflory b4de31c827 Merge branch 'newdrive' into staging 2017-09-27 10:28:16 +02:00
yflory c1275b5671 Prepare secure poll 2017-09-27 10:28:10 +02:00
yflory 4c394e0031 Fix UI issue in poll 2017-09-27 10:15:23 +02:00
Caleb James DeLisle 342b6012f7 manual merge of staging into framework 2017-09-26 17:11:45 +02:00
Caleb James DeLisle cf6030ab8b Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-26 15:58:33 +02:00
Caleb James DeLisle e62c5e1d07 Add some debugging lines to help synthesize error cases 2017-09-26 15:58:25 +02:00
ansuz 9571b3c018 persist whiteboard content across sessions 2017-09-26 15:16:17 +02:00
ansuz 748172585e update for modified id 2017-09-26 15:00:25 +02:00
ansuz 4cd7d8eda4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-26 14:35:02 +02:00
yflory 345bfc1cea Remove migration for pad attributes 2017-09-26 14:36:49 +02:00
ansuz 52be5501d6 remove invalid test 2017-09-26 14:34:54 +02:00
yflory 69014e5fde Fix mediatags in pad not cached 2017-09-26 11:21:36 +02:00
ansuz b3e066eaca show loading screen tips during loading screen 2017-09-26 10:59:25 +02:00
Caleb James DeLisle 77fe6a9bba small bug fixes 2017-09-26 10:23:35 +02:00
Caleb James DeLisle 1b01855dd2 Merge branch 'staging' into framework 2017-09-25 18:11:57 +02:00
Caleb James DeLisle 1fd7a6e2b3 Mistake in mkEvent which makes all events only work once 2017-09-25 18:03:31 +02:00
Caleb James DeLisle 368a6b2406 manual merge, still wip 2017-09-25 17:35:25 +02:00
yflory cdeac00633 Merge branch 'staging' into newdrive 2017-09-25 17:35:06 +02:00
yflory a8eecee590 Fix access to undefined variable in drive 2017-09-25 17:29:31 +02:00
yflory 91e36171eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-25 17:09:41 +02:00
yflory 138ad17e3e Fix 'import local pads' in settings creating duplicates 2017-09-25 17:09:26 +02:00
yflory 59ad96e491 Make sure the user is redirected to the drive at registration 2017-09-25 16:11:50 +02:00
yflory d2f1d0c0e9 Fix readme pad not added at registration in sframe drive 2017-09-25 16:09:54 +02:00
Caleb James DeLisle ae54cbca33 Refactor sframe-cpnf-inner to export chainpad 2017-09-25 15:46:04 +02:00
Caleb James DeLisle 44018ee7e1 Improve the LessLoader check to hopefully stop the message saying cookies were blocked. 2017-09-25 15:45:56 +02:00
Caleb James DeLisle b15527565c Allow passing arguments when firing events 2017-09-25 15:45:49 +02:00
Caleb James DeLisle 0eb2165f31 Implement a new pad framework and make it work (seemingly) with /pad/ 2017-09-25 15:45:08 +02:00
Caleb James DeLisle d9845d3450 Refactor sframe-cpnf-inner to export chainpad 2017-09-25 15:44:03 +02:00
Caleb James DeLisle f418ee9632 Improve the LessLoader check to hopefully stop the message saying cookies were blocked. 2017-09-25 15:43:02 +02:00
Caleb James DeLisle 72f03b2a47 Allow passing arguments when firing events 2017-09-25 15:42:08 +02:00
yflory 1afbd4648d Fix old drive 2017-09-25 15:23:42 +02:00
yflory b871faffc9 Enable tags in code and slide 2017-09-25 14:47:31 +02:00
yflory 6aeb366767 Lint 2017-09-25 14:47:19 +02:00
yflory 0600ce59ec Display the 'spinner' when typing in sframe apps 2017-09-25 13:19:25 +02:00
yflory 1d7683503f Fix link origin in sframe upload table 2017-09-25 12:44:05 +02:00
yflory 92c808812a Fix missing style in toolbar/less2 2017-09-25 11:59:05 +02:00
yflory deba699d08 Remove old style for sframe drive 2017-09-25 11:54:01 +02:00
yflory 4049931924 Lint 2017-09-25 11:51:24 +02:00
yflory c364377d7c Use less2 in sframe drive 2017-09-25 11:48:42 +02:00
yflory 47fe7b1c53 Drive in sandboxed iframe 2017-09-22 19:35:06 +02:00
yflory dfdeb7b113 Fix style and race condition for history mode 2017-09-21 18:00:33 +02:00
yflory a810d7bd85 Fix style and race condition for history mode 2017-09-21 18:00:11 +02:00
yflory 456370b1aa Base for Drive in sandboxed iframe 2017-09-21 17:59:26 +02:00
ansuz 95302366d1 lint compliance 2017-09-21 11:19:23 +02:00
ansuz 68f7d4bc0a more conformant tagPrompt behaviour 2017-09-20 17:55:05 +02:00
ansuz db4c3e7e2c Merge branch 'master' into staging 2017-09-20 12:07:01 +02:00
ansuz b5b84f540e fix preview mode class 2017-09-20 12:02:46 +02:00
ansuz f990200996 drop any notion of crypto from sframe-listmap 2017-09-19 18:21:33 +02:00
ansuz a1c124f1be Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:38:21 +02:00
yflory 95542bcdaf Lint 2017-09-19 15:38:19 +02:00
ansuz c9223cb942 listmap does not care about 'readOnly' mode anymore 2017-09-19 15:38:06 +02:00
yflory 88914ec6cc Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 15:36:38 +02:00
yflory 8a09e39f46 Enable tags in pads 2017-09-19 15:30:08 +02:00
ansuz d2b27f3588 resolve merge conflicts 2017-09-19 14:24:26 +02:00
ansuz 4af01e6e9e make listmap consume cpNfInner 2017-09-19 14:16:13 +02:00
yflory 72f0952835 Make sure we can't open a pad using the wrong app 2017-09-19 11:31:45 +02:00
yflory 35a313d6ee Make palette realtime 2017-09-19 11:20:20 +02:00
yflory 6fdd66167a Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 11:04:59 +02:00
yflory 3023e8c855 Fix templates in whiteboard 2017-09-19 11:04:52 +02:00
yflory 732585ea7b Sandboxed iframe for the whiteboard app 2017-09-19 10:27:31 +02:00
ansuz 029a8e3023 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-19 10:27:30 +02:00
ansuz d72146ba7f use setAttribute for assigning attributes in hyperscript 2017-09-19 10:27:19 +02:00
yflory a78b597ebb lint errors 2017-09-18 15:51:47 +02:00
yflory 8ce364a252 Add a button to empty the trash in the drive 2017-09-18 15:47:39 +02:00
yflory a1e7bf701d Select the element after clicking 'show in folder' in the drive search 2017-09-18 15:24:25 +02:00
ansuz f9d27d2783 WIP secure contacts 2017-09-18 15:09:01 +02:00
yflory 483160a96a Fix tab notifications in code and slides 2017-09-18 14:31:58 +02:00
yflory 1131ef0172 Fix language selection in sandboxed iframes 2017-09-18 14:26:54 +02:00
yflory 0a656ca8d6 Fix the splitter in code and add it back 2017-09-18 12:09:18 +02:00
yflory 018f71df04 Add drop handlers for mediatags in ckeditor 2017-09-18 10:59:40 +02:00
yflory c00d295466 Add missing translations 2017-09-15 17:33:36 +02:00
yflory a927f40f02 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-15 13:21:45 +02:00
yflory 974658453c Mediatag integration in pads 2017-09-15 13:21:37 +02:00
ansuz 08e0ae424d log errors in less compilation 2017-09-14 18:13:03 +02:00
ansuz 15db6b180c copy bug fixes from changes 2017-09-14 13:43:13 +02:00
ansuz 5b45e92250 delete range requests after they have completed 2017-09-14 12:08:41 +02:00
ansuz 4f6909fce3 set icon to 'faded' styles 2017-09-14 12:07:21 +02:00
ansuz 086d4bae32 clean up contacts initialization 2017-09-14 12:01:57 +02:00
yflory 96d0456f31 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-14 11:54:16 +02:00
yflory 1091e0b375 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-14 11:52:52 +02:00
ansuz 47ce645897 implement slice 2017-09-14 11:51:33 +02:00
ansuz a8f7beb20b remove deprecated apps 2017-09-14 11:36:40 +02:00
ansuz 6ed4f2fc64 fix a thing 2017-09-14 11:27:10 +02:00
ansuz 8a564bf350 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-14 11:23:51 +02:00
ansuz 513f8e73d4 refactor cryptpad.ready to use nthen 2017-09-14 11:23:37 +02:00
yflory c50c297490 Fix the size of the loading screen for the filepicker 2017-09-14 11:03:39 +02:00
Caleb James DeLisle b643ccc232 typo 2017-09-14 10:54:16 +02:00
Caleb James DeLisle 652c916690 change the command in the documentation so that it will not change itself 2017-09-14 10:52:55 +02:00
Caleb James DeLisle 5f0383ae99 update version of sframe-boot because it was changed 2017-09-14 10:52:25 +02:00
Caleb James DeLisle 845f75f8a7 remove a 100ms dead spot from page load 2017-09-14 10:48:59 +02:00
Caleb James DeLisle b24e9b84af Manual merge, update the CSS in loading.js and document that loading.less does nothing. 2017-09-14 10:48:35 +02:00
Caleb James DeLisle 8a32b72ffc 1. implement cryptpadCache which has put() and get() functions that can be used like a localStorage that auto-flushes when a new version is released
2. change loading.js to use packaged css in order to get the loading screen up as quick as possible.
3. change LessLoader to cache less in cryptpadCache
2017-09-14 10:23:05 +02:00
ansuz 4d688289cc lint-compliance 2017-09-13 18:19:15 +02:00
ansuz 2797a77f5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 18:18:45 +02:00
yflory 47cfa0cf45 Focus the editable content when opening a codemirror pad 2017-09-13 18:09:55 +02:00
ansuz f039fc7ff5 develop a system for avoiding z-index problems 2017-09-13 17:43:17 +02:00
yflory bafa401473 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 17:22:48 +02:00
yflory fa64adbbe5 Hide visible elements while loading the slide app 2017-09-13 17:22:43 +02:00
ansuz fbd4be6135 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 16:32:41 +02:00
yflory d360e2d0f4 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 16:20:26 +02:00
yflory ab64bf9e59 Use less2 for the loading screen 2017-09-13 16:19:26 +02:00
Caleb James DeLisle 710418f42f Make LessLoader able to cache even inside of the sandbox iframe and don't load less compiler unless needed 2017-09-13 16:04:01 +02:00
ansuz a332168926 fix some bugs in prompts, alerts, confirms 2017-09-13 15:52:31 +02:00
ansuz 0db33d48fc properly handle variable args in Cryptpad.alert 2017-09-13 14:52:58 +02:00
ansuz 8a87ec180e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 14:52:26 +02:00
Caleb James DeLisle 0d8c292fef Merge branches 'staging' and 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 14:47:55 +02:00
Caleb James DeLisle 789a923792 Change font-awesome to be pulled through LessLoader which will rewrite the font file URLs to use ver= parameter 2017-09-13 14:47:50 +02:00
Caleb James DeLisle d46cc8226d Update LessLoader to be capable of loading CSS as well as less files and properly rewrite the URLs 2017-09-13 14:46:41 +02:00
ansuz dc86579d46 use an 8 character password for tests 2017-09-13 14:00:48 +02:00
ansuz e1f090bb9d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 12:33:05 +02:00
ansuz 244e3ecba7 support forefront flag in alert config 2017-09-13 12:32:30 +02:00
Caleb James DeLisle 63cb5dfc1e Make less loader rewrite urls to use version parameter 2017-09-13 12:04:24 +02:00
Caleb James DeLisle d967df2cec Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-13 11:00:09 +02:00
Caleb James DeLisle e3c0ec29f7 Hopefully chase out a race in sframe-channel 2017-09-13 11:00:00 +02:00
yflory 8c41e0bdd6 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 18:40:20 +02:00
yflory 437f50fd4a Migrate the file to a sandboxed iframe 2017-09-12 18:40:11 +02:00
Caleb James DeLisle 1713167a5d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 14:12:41 +02:00
Caleb James DeLisle 981a919328 Added tooltips back to sframe land with hopefully a more robust removal. 2017-09-12 14:12:35 +02:00
yflory 5ac3e97dc8 Merge branch 'master' into staging 2017-09-12 12:20:47 +02:00
yflory 7d720c73a9 Merge branch 'soon' 2017-09-12 11:34:12 +02:00
yflory ddbda08c88 Fix an issue when cleaning the template category in the drive 2017-09-12 11:32:32 +02:00
ansuz 9d229b8868 lint compliance 2017-09-12 11:30:43 +02:00
yflory 5b3667fd4e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-12 11:29:57 +02:00
yflory 63700cb791 Fix an issue when cleaning the template category in the drive 2017-09-12 11:29:24 +02:00
ansuz a87ccdc37e remove redundant lines 2017-09-12 11:27:24 +02:00
ansuz da0e31fa54 guard against possible type errors 2017-09-12 11:20:50 +02:00
yflory 0f9da69185 Show if a pad has been renamed in the drive 2017-09-12 11:17:52 +02:00
ansuz 499b5ea2ba warn that a password is too short before doing anything else 2017-09-12 10:50:59 +02:00
ansuz a0b3201df3 fix focus on alerts, prompts, and confirms. call back from alerts 2017-09-12 10:49:48 +02:00
Caleb James DeLisle a74915ab58 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 17:52:40 +02:00
Caleb James DeLisle 671c893e8a Duplicating code like a moron, this should hopefully get fixed later. 2017-09-11 17:52:34 +02:00
yflory 5a4836fe6d Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 16:36:41 +02:00
yflory 79094aa4bb Fix closing the title input when the title is not modified 2017-09-11 16:36:24 +02:00
ansuz 58c38dd77b focus on the current window when you pop an alert 2017-09-11 16:34:00 +02:00
ansuz b9545f45f7 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-11 16:26:21 +02:00
ansuz 306fec2d0e improve messages for template picker confirm 2017-09-11 16:25:58 +02:00
ansuz 1943c83f69 clean up api for Cryptpad.confirm 2017-09-11 16:24:43 +02:00
Caleb James DeLisle 8d3ebdbaf7 I'm stupid 2017-09-11 15:53:27 +02:00
Caleb James DeLisle 041071e61c manual merge 2017-09-11 15:52:14 +02:00
Caleb James DeLisle 7334173b4a Hopefully fix infinite spinner whenever there is a disconnect (pad) 2017-09-11 15:46:21 +02:00
yflory 9271b0c1a8 Try to fix half-codemirror bug 2017-09-11 14:42:43 +02:00
yflory 304a8df808 Remove unneeded migration and fix attributes migration 2017-09-11 14:25:19 +02:00
ansuz 5a1abc8986 let's try using actual js syntax 2017-09-11 14:04:40 +02:00
ansuz 134c6057c1 Merge branch 'slide2' of github.com:xwiki-labs/cryptpad into origin/slide2 2017-09-11 14:01:05 +02:00
ansuz 59d25b4c1a use camel case, not snek case 2017-09-11 14:00:27 +02:00
ansuz 520b8967fd allow people with short passwords to log in 2017-09-11 13:54:48 +02:00
yflory 8ef27dca08 Lint 2017-09-11 12:25:23 +02:00
yflory 1aef844fc3 Fix title attribute for truncated titles in the drive 2017-09-11 12:23:24 +02:00
yflory 55fe882f64 Fix readonly mode in code 2017-09-11 12:23:04 +02:00
yflory bd422178c4 Hide the filepicker button in readonly mode 2017-09-11 11:59:09 +02:00
yflory 51f1be9f7a Improve the input style when renaming a folder in the drive tree 2017-09-11 11:50:04 +02:00
yflory 642511dc3b Disable exiting present mode when in embed mode 2017-09-11 11:38:40 +02:00
yflory 403b62f131 Fix ghost icon modal and improve UI on mobile 2017-09-11 11:04:14 +02:00
yflory 757d0a2800 Save the state of CKEditor's toolbar (visible or hidden) 2017-09-11 10:10:29 +02:00
yflory 5bf966633c Merge branch 'staging' into slide2 2017-09-08 18:21:38 +02:00
yflory 514bff7065 Add slide number in the title in slide2 2017-09-08 18:21:11 +02:00
ansuz 0ed6846e07 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-08 17:41:46 +02:00
ansuz b5b9f931c7 don't use common-realtime 2017-09-08 17:41:05 +02:00
ansuz 32e8c8ef4b implement alertify without alertify 2017-09-08 17:40:25 +02:00
ansuz a302ee5d25 guard against undefined arguments 2017-09-08 17:39:41 +02:00
yflory c3a07e879c Merge branch 'staging' into slide2 2017-09-08 16:23:07 +02:00
yflory fc069dac48 Ask the user before loading the template picker 2017-09-08 16:21:12 +02:00
yflory 05793c220c Fix secure iframes on Edge 2017-09-08 15:55:01 +02:00
yflory 290d668ceb Fix race condition preventing slide to work on Edge 2017-09-08 15:53:53 +02:00
ansuz de5d925154 autoselect user href in settings 2017-09-08 15:07:25 +02:00
ansuz e950ce74cb focus on input when opening filepicker 2017-09-08 15:01:47 +02:00
ansuz 739903d511 don't check account usage if you aren't logged in 2017-09-08 14:00:49 +02:00
ansuz bbf7ed3827 refactor drive to use dialog.selectable()
fix class on alertify-like boxes
2017-09-08 12:24:20 +02:00
Paul Libbrecht 1ae7076790 Merge branch 'master' of https://github.com/xwiki-labs/cryptpad 2017-09-07 22:08:34 +02:00
yflory f2aaaa9751 Move slide to secure iframe 2017-09-07 18:56:58 +02:00
ansuz 809b56625d refactor ui elements 2017-09-07 18:54:58 +02:00
ansuz bca9ba66cb enforce a configurable minimum password length when registering 2017-09-07 17:44:04 +02:00
ansuz 1958bca984 restore hashing screen in login and register 2017-09-07 16:48:22 +02:00
ansuz fab6264ce6 use loading screen from pages.js 2017-09-07 16:41:11 +02:00
ansuz e8298f165a only display first letter of name if user has no avatar 2017-09-07 16:35:24 +02:00
ansuz 85003f7a23 lint compliance 2017-09-07 14:21:54 +02:00
ansuz cca3c04d43 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-07 12:45:18 +02:00
ansuz 15e24ebe4f ui for hashtag picker 2017-09-07 12:45:07 +02:00
ansuz 1b97996ef8 implement util.once 2017-09-07 12:26:05 +02:00
yflory 0423a5f4e2 Clean secure iframe code 2017-09-06 18:26:10 +02:00
yflory 04a04aef2b Add setAttribute/getAttribute in secure iframes. Store attributes in settings 2017-09-06 16:05:20 +02:00
yflory 61b228db79 Fix double / when storing a file 2017-09-06 11:41:09 +02:00
yflory 8b2733e2da Fix typo 2017-09-06 11:37:19 +02:00
yflory c713b44a4a Merge branch 'soon' 2017-09-06 11:13:10 +02:00
yflory d98bbf7df9 Fix the pad app when cryptpad is in an iframe 2017-09-06 11:03:20 +02:00
yflory 3ca9f41290 Get embed code for pad and code 2017-09-06 10:56:27 +02:00
yflory 0bb6698399 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 18:40:18 +02:00
yflory e85b34f127 Add embed options in the secure pad hashes 2017-09-05 18:38:51 +02:00
ansuz 47ec959032 make sure contenteditable is not set in read only mode 2017-09-05 18:35:11 +02:00
ansuz 6a735b441f use paul's print styles 2017-09-05 18:16:06 +02:00
Paul Libbrecht e7de9229a8 Do not print toolbar and collaboration (#178).
paul
2017-09-05 17:29:03 +02:00
ansuz b3d5e04bb4 lint compliance 2017-09-05 17:23:16 +02:00
ansuz 3d2a2da74e add listAllTags api 2017-09-05 16:52:22 +02:00
yflory 31a6881dba Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 15:40:02 +02:00
yflory 305feebbbe Fix scroll position when refreshing the drive tree 2017-09-05 15:39:49 +02:00
ansuz 0e8a26e8eb Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 15:37:02 +02:00
ansuz 1c50bb3f61 clear hung tooltips 2017-09-05 15:36:46 +02:00
yflory 53eb9bb541 Remove the logo from the filepicker loading screen 2017-09-05 15:34:38 +02:00
yflory 729c013af7 Get mediatag embed code from the file app 2017-09-05 15:08:05 +02:00
yflory 904936209a Remove loading tips in the file picker 2017-09-05 11:59:42 +02:00
yflory 98cd69e53e Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-09-05 11:57:54 +02:00
yflory 204e45dfae Enable templates in pad 2017-09-05 11:57:44 +02:00
yflory 4108520d20 Add contacts in the new menu if the user is logged in 2017-09-05 11:43:16 +02:00
ansuz 38e1ed93e4 Merge branch 'code2' into staging 2017-09-05 11:42:00 +02:00
ansuz acaf45a0e0 drop thumbnails if metadata is too large 2017-09-05 11:38:49 +02:00
yflory 78b338c379 Merge branch 'code2' into staging 2017-09-05 11:38:17 +02:00
yflory db86a2dbee Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 2017-09-05 11:36:31 +02:00
yflory d2787e3eff Make code2 the default code app 2017-09-05 11:36:02 +02:00
ansuz 4069945bc4 Merge branch 'code2' of github.com:xwiki-labs/cryptpad into code2 2017-09-05 11:27:11 +02:00
ansuz d42d988d36 make test more resilient 2017-09-05 11:26:41 +02:00
ansuz cd7b00d45b make pixels 100px 2017-09-05 11:25:47 +02:00
ansuz e8ac5ed87f add a test for thumbnails 2017-09-05 11:24:30 +02:00
ansuz b1a1f4ba13 add encrypted thumbnails to metadata for images.
correct decryption logic
2017-09-05 10:57:59 +02:00
ansuz b8e913c95a more thumbnail methods 2017-09-05 10:46:00 +02:00
ansuz ffbb21dd2c use cryptpad-september build of media-tag 2017-09-05 10:43:48 +02:00
yflory c0f14dea5e Store code2 and set the title at the first visit 2017-09-04 17:09:45 +02:00
yflory 86e23ac19f Use less2 in secure iframes 2017-09-04 15:09:54 +02:00
yflory f12f4bb925 Integrate filepicker secure iframe in the code2 app 2017-09-01 15:17:14 +02:00
Caleb James DeLisle a164115e8c Add media-tag-nacl to cryptpad so it will be hosted on the server 2017-09-01 10:10:34 +02:00
ansuz 1072e3e797 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-31 18:12:21 +02:00
ansuz ae60b5845f implement search-by-tag for filesData 2017-08-31 18:12:13 +02:00
ansuz 72ef730f23 implement tag-related functions 2017-08-31 18:06:26 +02:00
ansuz 0302c06d0e send feedback if client does not support symbols 2017-08-31 18:04:20 +02:00
ansuz 52019dc763 make get and set pad attribute return only cloned data 2017-08-31 18:02:44 +02:00
yflory 89b7b644f3 Enable drag & upload in code2 and prepare filepicker 2017-08-31 16:32:26 +02:00
Caleb James DeLisle e2719d9098 Add media-tag-nacl to cryptpad so it will be hosted on the server 2017-08-31 16:28:48 +02:00
yflory 885282ddea Fix undefined friend 2017-08-31 15:49:20 +02:00
Caleb James DeLisle a60709ff73 Infinite spinner popup leads to frame attempting to reload and failing 2017-08-30 19:23:01 +02:00
yflory b8971cdc23 Add previewMode settings to code2 2017-08-30 18:47:50 +02:00
yflory 0d008aaa2e Add indent settings to code2 2017-08-30 17:57:10 +02:00
yflory f54dc7505c Migrate indentation settings to a settings subobject 2017-08-30 17:19:50 +02:00
yflory 0893bcc0e5 Merge branch 'staging' into code2 2017-08-30 14:57:19 +02:00
yflory f06683e949 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 12:26:23 +02:00
yflory 0ce32464fd Fix flickering avatar in firefox 2017-08-30 12:26:11 +02:00
ansuz 9a23b77b46 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-30 11:31:59 +02:00
ansuz ba0e935add stub localStorage, and handle errors that might come from touching localStorage 2017-08-30 11:31:49 +02:00
ansuz be8ea4102e keep trying to parse the hash until it works 2017-08-30 11:26:51 +02:00
yflory 4db4f66786 Remove an unnecessary fix for Safari 2017-08-30 11:14:58 +02:00
yflory a2ed266048 Move the code app in a secure iframe 2017-08-30 11:10:57 +02:00
Caleb James DeLisle 1044531806 Fix Safari iframe size issue 2017-08-30 11:04:52 +02:00
ansuz a34d1793e0 drop 'loading' text from loading screen 2017-08-29 18:15:40 +02:00
ansuz 595fa4c2e4 Merge branch 'soon' 2017-08-29 12:00:16 +02:00
ansuz 181a19a9a0 polyfill for array.fill 2017-08-29 11:49:10 +02:00
yflory 51fa6287c1 Enable notifications in secure pads 2017-08-29 11:20:02 +02:00
yflory 642dc17910 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-29 11:03:05 +02:00
yflory 901917983b Fix an issue preventing pads to be stored in the drive 2017-08-29 11:02:56 +02:00
ansuz 40f062abda restore app usage report in new pad 2017-08-29 10:50:02 +02:00
ansuz 8fb7fef3f5 regular expressions are never falsey 2017-08-29 10:37:19 +02:00
ansuz 24eac9b4a6 test for flakey tests 2017-08-28 18:42:04 +02:00
ansuz 7d2a76f4d6 delete dead code. fix off-by-one for messages. turn off history button when history is exhausted 2017-08-28 18:32:43 +02:00
ansuz 288c03bb41 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 17:52:01 +02:00
Caleb James DeLisle fe03e6ae83 bad code, lint 2017-08-28 17:53:23 +02:00
ansuz 430a6f7b77 lint compliance 2017-08-28 17:51:50 +02:00
Caleb James DeLisle 190dff1c9b Use the bounce app for opening a link with the right click 2017-08-28 17:50:55 +02:00
yflory dec870d2bd Fix selection in the drive search results 2017-08-28 17:43:26 +02:00
yflory 4bceef8952 Fix the upload status table missing in the drive 2017-08-28 17:35:24 +02:00
yflory 0b4e044540 Fix the plugin to open a link in a new tab in pad 2017-08-28 17:26:51 +02:00
yflory d9a4a32bf9 Fix avatar for anonymous users in secure pads 2017-08-28 16:57:10 +02:00
yflory 00fda0d7d7 Fix avatar in read-only mode (secure pads) 2017-08-28 16:49:28 +02:00
yflory 88cb4fd83c Enable friend requests from secure pads 2017-08-28 16:21:05 +02:00
yflory 147d88d845 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 15:13:30 +02:00
yflory e43c68aa48 Fix viewers number in secure iframe 2017-08-28 15:13:16 +02:00
yflory f89015d9ed Update the tab title to match the pad title in pad2 2017-08-28 14:49:33 +02:00
ansuz 1280cd1659 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 14:49:01 +02:00
yflory 51c065d13c Fix link to main in the new toolbar 2017-08-28 14:18:33 +02:00
yflory d9bf2abcd8 Fix old hashes not working anymore in pad 2017-08-28 13:53:24 +02:00
ansuz 536fe04790 emit notification when alert, confirm, or prompt are called 2017-08-28 13:46:28 +02:00
Caleb James DeLisle e4a356d873 Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2017-08-28 12:25:12 +02:00