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 |
|
Caleb James DeLisle
|
81d0b3272d
|
Fix multiple infinite-spinner errors piling up on top of eachother
|
2017-10-18 14:49:50 +03:00 |
|
Caleb James DeLisle
|
9e4c48f537
|
lint errors
|
2017-10-18 12:25:13 +03:00 |
|
Caleb James DeLisle
|
a149152f11
|
Merge branch 'staging' into framework
|
2017-10-18 11:42:31 +03:00 |
|
yflory
|
4197b7b968
|
Fix missing icon in list mode for files with thumbnail
|
2017-10-17 17:23:31 +02:00 |
|
yflory
|
d941b1098a
|
Remove selection in whiteboard when uploading to the drive
|
2017-10-17 17:21:15 +02:00 |
|
yflory
|
4116d08dd1
|
Display thumbnails in the drive and then file picker
|
2017-10-17 17:17:31 +02:00 |
|
yflory
|
e553351b79
|
Put the add friend button in the userlist below the name
|
2017-10-17 12:39:25 +02:00 |
|
yflory
|
6920129126
|
Embed images from the drive in whiteboard
|
2017-10-17 12:19:57 +02:00 |
|
MacLemon
|
867b971c33
|
Compressed images: PNG recompressed pixel identical, JPGs recompressed visually identically. Saving about 9.8%≈580kB overall, to speed up initial and repeating client connections.
|
2017-10-14 00:31:31 +02:00 |
|
yflory
|
2fd120100a
|
Merge branch 'wb' into staging
|
2017-10-13 16:58:59 +02:00 |
|
Caleb James DeLisle
|
15337603bb
|
Merge branch 'staging' into framework
|
2017-10-13 13:41:24 +03:00 |
|
Caleb James DeLisle
|
a6b34491fc
|
freeze the editor when reconnecting
|
2017-10-13 13:40:51 +03:00 |
|
Caleb James DeLisle
|
854c1e94a4
|
make infinite spinner error message go away if ChainPad settles after it has been popped
|
2017-10-13 13:39:49 +03:00 |
|
yflory
|
a859ab081a
|
Fix fouc in drive
|
2017-10-12 18:21:34 +02:00 |
|
yflory
|
7b6432f134
|
Lint
|
2017-10-12 18:20:33 +02:00 |
|
yflory
|
6926d42292
|
Autoload template picker to make it faster to appear when used
|
2017-10-12 18:18:01 +02:00 |
|
yflory
|
1c8e1a36e8
|
Add file type in the pad attributes for existing files
|
2017-10-12 17:43:49 +02:00 |
|
yflory
|
b86f8e3f26
|
Fix uloaded files not moved to the correct folder in drive
|
2017-10-12 17:33:22 +02:00 |
|
yflory
|
88d0a2b8a6
|
Merge branch 'master' into staging
|
2017-10-12 17:08:34 +02:00 |
|
yflory
|
5ed60a0ad7
|
Fix image ratio in slides
|
2017-10-12 16:45:51 +02:00 |
|
Caleb James DeLisle
|
753e2d797e
|
Merge branch 'staging' into framework
|
2017-10-12 17:07:10 +03:00 |