Commit Graph

3351 Commits (ee46a4e86273efd8b3730b953215e2598e06ade1)

Author SHA1 Message Date
ansuz ee46a4e862 remove some unnecessary checks for file-crypto and make encryption properly async 2018-03-26 18:30:52 +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
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 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