Commit Graph

3906 Commits (69b50dd10268bc9cff22f16073796b845e04995b)

Author SHA1 Message Date
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