Commit graph

4762 commits

Author SHA1 Message Date
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
337138d6e5 Script to check pads to delete when account deletion request 2018-04-04 12:06:59 +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
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
9e711e4cd4 Remove Bootstrap's JS in static pages 2018-03-22 10:49:20 +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
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
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
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