Caleb James DeLisle
|
acfaaa7d56
|
jshint compliance
|
2017-08-23 11:04:44 +02:00 |
|
Caleb James DeLisle
|
2ad9fcee17
|
Manual merge of notify.js
|
2017-08-23 10:45:55 +02:00 |
|
Caleb James DeLisle
|
8a9755611a
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-23 10:21:53 +02:00 |
|
Caleb James DeLisle
|
2dacd57e76
|
fix caching on favicon
|
2017-08-23 10:21:41 +02:00 |
|
yflory
|
33025a9df9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-22 18:19:06 +02:00 |
|
yflory
|
c33b128bf4
|
Enable feedback in pad2
|
2017-08-22 18:18:58 +02:00 |
|
yflory
|
e81bb3fe08
|
Fix profile link in the userlist
|
2017-08-22 18:18:48 +02:00 |
|
ansuz
|
002eed0d6f
|
make most of the messenger api async
|
2017-08-22 15:55:00 +02:00 |
|
Caleb James DeLisle
|
d9f5e3638e
|
Big caching improvements :D
|
2017-08-22 15:50:10 +02:00 |
|
yflory
|
b4864b96ac
|
Add a recent pads category in the drive
|
2017-08-22 14:28:17 +02:00 |
|
Caleb James DeLisle
|
4f3b4a30ee
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-21 18:38:16 +02:00 |
|
Caleb James DeLisle
|
4b70fc9f49
|
Use resources from the original origin in pad2
|
2017-08-21 18:38:07 +02:00 |
|
yflory
|
aa9e0d3cd3
|
Enable AppConfig in pad2
|
2017-08-21 18:30:51 +02:00 |
|
yflory
|
f40d2c0b20
|
Add templates to pad2
|
2017-08-21 18:21:53 +02:00 |
|
yflory
|
8d020833af
|
Add missing file
|
2017-08-21 18:21:25 +02:00 |
|
yflory
|
8d837d22ea
|
Add history to pad2
|
2017-08-21 17:40:21 +02:00 |
|
yflory
|
b2e6df1f9d
|
Add import & export in pad2
|
2017-08-21 15:34:21 +02:00 |
|
yflory
|
e2d39de143
|
Forget button in pad2
|
2017-08-21 15:20:38 +02:00 |
|
yflory
|
e4020ba8d4
|
Fix pad creation in pad2
|
2017-08-21 14:41:56 +02:00 |
|
yflory
|
140c6f3776
|
Add limit warning in pad2
|
2017-08-21 12:24:33 +02:00 |
|
yflory
|
30aef71603
|
Enable avatars in pad2
|
2017-08-21 12:01:38 +02:00 |
|
yflory
|
f88a6f63fe
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-21 11:08:38 +02:00 |
|
yflory
|
fb4808e1e1
|
Fix queries callback arguments
|
2017-08-21 11:08:27 +02:00 |
|
Caleb James DeLisle
|
6dd1643738
|
Manual merge work done on loading page to pad2
|
2017-08-21 10:53:40 +02:00 |
|
Caleb James DeLisle
|
8b702e0150
|
wip
|
2017-08-21 10:34:49 +02:00 |
|
yflory
|
e65b2f4e9f
|
Add shareButton to pad2
|
2017-08-18 18:43:04 +02:00 |
|
yflory
|
beb45740d0
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-18 16:34:50 +02:00 |
|
yflory
|
90f892de9c
|
Useradmin menu, notifications and share button in pad2
|
2017-08-18 16:34:41 +02:00 |
|
ansuz
|
253ab68d8d
|
Merge branch 'staging' into new-messaging
|
2017-08-18 15:31:06 +02:00 |
|
Caleb James DeLisle
|
498c8229e9
|
Make following a link inside of the iframe only fail rather than carrying the iframe away from the pad.
|
2017-08-18 14:12:30 +02:00 |
|
ansuz
|
0693a98890
|
create a thumbnail when uploading images from whiteboard
|
2017-08-18 12:53:02 +02:00 |
|
ansuz
|
b17044ad98
|
add support for thumbnails in metadata
|
2017-08-18 12:47:04 +02:00 |
|
yflory
|
dd9b38066e
|
Change display name in useradmin menu
|
2017-08-18 11:07:42 +02:00 |
|
yflory
|
a96d447e8b
|
Add notifications in pad2
|
2017-08-18 10:47:30 +02:00 |
|
Caleb James DeLisle
|
cf6d8c83b2
|
Fix title setter logic and separate it from UI
|
2017-08-17 19:58:48 +02:00 |
|
Caleb James DeLisle
|
ec87f3f897
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 19:01:40 +02:00 |
|
Caleb James DeLisle
|
415399ef64
|
Changes to support title change in metadata
|
2017-08-17 19:01:33 +02:00 |
|
yflory
|
d1affebd14
|
Title in pad2
|
2017-08-17 19:01:03 +02:00 |
|
yflory
|
604415b32c
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 18:29:24 +02:00 |
|
yflory
|
fab3d67b75
|
Enable title in pad2
|
2017-08-17 18:28:05 +02:00 |
|
Caleb James DeLisle
|
909bda4302
|
This should fix laxy metadata
|
2017-08-17 18:26:58 +02:00 |
|
ansuz
|
a4dbf39c4a
|
fix pdf display problems in chrome
|
2017-08-17 18:11:46 +02:00 |
|
Caleb James DeLisle
|
2490ee253f
|
Added setDisplayName RPC
|
2017-08-17 18:09:17 +02:00 |
|
yflory
|
887a26b1a6
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 17:34:47 +02:00 |
|
Caleb James DeLisle
|
0b34ceb0eb
|
Added RPC setPadTitleInDrive()
|
2017-08-17 17:34:08 +02:00 |
|
ansuz
|
bed7d95bf3
|
use latest compiled cryptpad media-tag
|
2017-08-17 17:31:52 +02:00 |
|
ansuz
|
3a5526e247
|
infer pdfjs document title from iframe url
|
2017-08-17 17:30:28 +02:00 |
|
yflory
|
25466aa2f9
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 17:26:27 +02:00 |
|
yflory
|
1d237735ef
|
Useradmin menu in pad2
|
2017-08-17 17:26:20 +02:00 |
|
Caleb James DeLisle
|
3b5af3ea74
|
sframe common changes
|
2017-08-17 16:56:18 +02:00 |
|