ansuz
|
8359902f6a
|
fix typo in poll
|
2017-10-24 17:42:08 +02:00 |
|
ansuz
|
69f9a7ebf3
|
make userlist change notifications configurable
|
2017-10-24 17:29:58 +02:00 |
|
Caleb James DeLisle
|
027b9fa383
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-24 18:03:31 +03:00 |
|
Caleb James DeLisle
|
aa37997aa3
|
Enable JSON-OT again because it is working now that the arguments are passed in the right order <facepalm>
|
2017-10-24 18:02:03 +03:00 |
|
ansuz
|
bac608adfe
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-24 16:56:13 +02:00 |
|
ansuz
|
dc90811090
|
only call onReady once in sframe-listmap
|
2017-10-24 16:56:08 +02:00 |
|
yflory
|
bac10472f3
|
lint compliance
|
2017-10-24 14:32:47 +02:00 |
|
yflory
|
39b4cb9226
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-24 14:31:56 +02:00 |
|
yflory
|
18b5b20d27
|
Add thumbnails for PDFs
|
2017-10-24 14:31:42 +02:00 |
|
ansuz
|
aee51f1317
|
lint compliance
|
2017-10-24 14:02:29 +02:00 |
|
ansuz
|
447b0a74ee
|
handle errors for videos when uploading
|
2017-10-24 13:45:27 +02:00 |
|
yflory
|
30a69fae13
|
Add thumbnails for videos
|
2017-10-24 12:26:04 +02:00 |
|
yflory
|
21f8ae7570
|
Keep the correct ratio for image thumbnails
|
2017-10-24 11:45:07 +02:00 |
|
yflory
|
2dd3c42fd5
|
Fix handlers registered again on reconnect in drive and poll
|
2017-10-24 10:42:08 +02:00 |
|
yflory
|
204f3e1441
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 15:17:09 +02:00 |
|
yflory
|
a0bcb901d3
|
Add titles in poll when options or usernames are overflowing
|
2017-10-23 15:16:51 +02:00 |
|
yflory
|
74985fd0f2
|
Use text for the addUser button in polls
|
2017-10-23 15:12:27 +02:00 |
|
ansuz
|
7d1892546b
|
add missing french translation
|
2017-10-23 14:59:14 +02:00 |
|
ansuz
|
6db5a34323
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 14:53:42 +02:00 |
|
ansuz
|
c17fc2efe7
|
improve option order in poll
|
2017-10-23 14:53:31 +02:00 |
|
yflory
|
2be22867c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 14:39:31 +02:00 |
|
yflory
|
13718d0263
|
Fix recent pads in chrome
|
2017-10-23 14:38:38 +02:00 |
|
ansuz
|
2e5fdf709a
|
Merge branch 'soon' into staging
|
2017-10-23 14:29:01 +02:00 |
|
ansuz
|
de8339fea7
|
hide alertify when you are in presentation mode
|
2017-10-23 14:25:25 +02:00 |
|
ansuz
|
aaef30f489
|
bump cryptpad version
|
2017-10-23 14:05:49 +02:00 |
|
Caleb James DeLisle
|
9b02b36724
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 14:22:54 +03:00 |
|
Caleb James DeLisle
|
d7e9498143
|
Fix and then disable the new OT
|
2017-10-23 14:22:33 +03:00 |
|
ansuz
|
05c66e64dd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-23 12:33:57 +02:00 |
|
ansuz
|
288e141c1f
|
add missing sframe method
|
2017-10-23 12:33:50 +02:00 |
|
yflory
|
ce5d24a1d3
|
Remove error message about Tether
|
2017-10-23 11:57:10 +02:00 |
|
ansuz
|
d571f408d8
|
Merge pull request #185 from MacLemon/reduce-image-asset-size
Compressed images for faster connections
|
2017-10-23 11:46:56 +02:00 |
|
ansuz
|
8590cf3f75
|
Merge pull request #189 from yannicka/patch-1
Update French translation
|
2017-10-23 11:46:15 +02:00 |
|
yflory
|
c1d05a00ba
|
Improve media-tag export in pad to work with existing CSP
|
2017-10-23 10:55:40 +02:00 |
|
yflory
|
3e4faf1be1
|
Add new state messages in the toolbar
|
2017-10-20 18:12:47 +02:00 |
|
yflory
|
6d080bcb45
|
Ability to export mediatag images in pad
|
2017-10-20 18:10:08 +02:00 |
|
yflory
|
a0dd867f33
|
Fix pending state not removed after friend invite rejected
|
2017-10-20 18:09:09 +02:00 |
|
yflory
|
c25be21138
|
Fix the upgrade button in the drive
|
2017-10-20 10:16:01 +02:00 |
|
Caleb James DeLisle
|
cc6b2192e4
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-20 10:26:27 +03:00 |
|
Yannick A
|
63dcfd6d18
|
Update French translation
|
2017-10-19 21:02:03 +02:00 |
|
yflory
|
a3c7aa67d8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-10-19 19:07:00 +02:00 |
|
yflory
|
094856a511
|
Fix renaming pad with multiple dots in the name in drive
|
2017-10-19 18:30:55 +02:00 |
|
ansuz
|
bf832ba784
|
fix comment overflow
|
2017-10-19 17:30:40 +02:00 |
|
yflory
|
7bc2f81852
|
Fix pinned column not always stored in polls
|
2017-10-19 16:01:56 +02:00 |
|
yflory
|
88e7f9a218
|
Add last access and creation times in the properties window in drive
|
2017-10-19 15:05:55 +02:00 |
|
yflory
|
22e3baed4b
|
Fix sort issues in drive
|
2017-10-19 15:00:29 +02:00 |
|
yflory
|
f43606f71d
|
Present mode to display only the parsed markdown in code
|
2017-10-19 14:39:38 +02:00 |
|
yflory
|
515214aed1
|
Use present mode in embed code
|
2017-10-19 11:59:07 +02:00 |
|
yflory
|
201c974df6
|
Merge branch 'thumbnails' into staging
|
2017-10-19 11:43:43 +02:00 |
|
yflory
|
7b8490ad20
|
Use less2 in contacts
|
2017-10-19 09:58:28 +02:00 |
|
yflory
|
dd63cd13d7
|
Fix profile page title
|
2017-10-18 16:59:20 +02:00 |