Commit graph

4772 commits

Author SHA1 Message Date
ansuz
dcd27f0da4 finalize save button tooltips 2018-05-14 14:20:37 +02:00
ansuz
34417b5e9f Merge branch 'oo' of github.com:xwiki-labs/cryptpad into oo 2018-05-14 14:02:24 +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
yflory
8bf9617dd6 Fix typo 2018-04-05 10:58:58 +02:00
yflory
0dfae72f88 Lock the UI for unregistered users 2018-04-03 12:04:49 +02:00
yflory
303adaea4c Display only 5 items in the file upload table 2018-04-03 12:04:17 +02:00
yflory
cf22c58e39 Missing translations 2018-04-03 11:23:58 +02:00
yflory
a9d01ac864 Lock the UI when someone is editing 2018-04-03 11:00:46 +02:00
yflory
d12e5da1b7 Unpin old versions 2018-03-29 10:54:40 +02:00
yflory
c4a3e98123 Fix initial value in oo apps 2018-03-29 10:16:51 +02:00
yflory
fd1b4189be Save and open oo docs 2018-03-28 19:35:49 +02:00
yflory
d5dce6ac22 Fix config 2018-03-27 14:03:30 +02:00
yflory
34f2d66b7e Load OnlyOffice documents in the inner iframe 2018-03-26 18:32:40 +02:00
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
ansuz
f324d33723
Merge pull request #234 from sairim/patch-2
Fix broken FAQ link
2018-03-21 11:03:58 +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
f472bc9b6c Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-20 15:09:41 +01:00
yflory
c3f7b74baf Fix CkEditor's toolbar initial state 2018-03-20 15:07:20 +01:00
ansuz
8230c471cd add npm dependency for sortify 2018-03-20 11:31:37 +01:00
ansuz
7c072aeccb add remove-pins rpc 2018-03-20 11:16:18 +01:00
ansuz
ed8f9e4e3f remove XXX after review 2018-03-20 11:15:44 +01:00
ansuz
bc3fe4f32c update version in footer and package.json 2018-03-20 11:14:55 +01:00
yflory
28d13186af Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging 2018-03-20 11:05:56 +01:00
yflory
44cd235f48 Fix CSS with Bootstrap 4 2018-03-20 11:05:43 +01:00
ansuz
11b0781717 delete unused code 2018-03-20 10:44:26 +01:00
yflory
2704ee1ed7 Account deletion translations 2018-03-19 18:14:00 +01:00
yflory
8970bae647 Center pad type in the creation screen 2018-03-19 17:30:01 +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
bc26f67edb Use stable bootstrap 2018-03-19 16:45:36 +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
ansuz
5b21911341 pass flow tests 2018-03-16 12:26:39 +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
ebef99e5cf Owned drive 2018-03-14 16:32:17 +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
e977b14c1b Update French translation 2018-03-14 11:50:17 +01:00