Commit Graph

3354 Commits (fd1b4189beeeba28a950083c9d856ee37d26be5c)

Author SHA1 Message Date
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
yflory 714c46fc2e Use blob URL to load an OnlyOffice document 2018-03-26 16:42:09 +02: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 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