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 |
|
yflory
|
d1157c4d72
|
Add missing file
|
2017-08-17 16:28:54 +02:00 |
|
yflory
|
d237c76f6c
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 16:25:31 +02:00 |
|
yflory
|
f5855a2870
|
Add account name in metadata manager
|
2017-08-17 16:25:25 +02:00 |
|
Caleb James DeLisle
|
3c0197cbf4
|
Firefox fails to boot the iframe if there is no number on setInterval
|
2017-08-17 16:17:57 +02:00 |
|
yflory
|
d88704fb50
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 15:44:41 +02:00 |
|
Caleb James DeLisle
|
a4850a7fcc
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 15:42:28 +02:00 |
|
yflory
|
fc5bdd3bed
|
Add lazy metadata to fix parse errors in pad2
|
2017-08-17 15:42:26 +02:00 |
|
Caleb James DeLisle
|
ad9f2ff223
|
Made pad2 server more generic and easy to implement
|
2017-08-17 15:41:04 +02:00 |
|
ansuz
|
a125253cde
|
lint compliance
|
2017-08-17 15:13:05 +02:00 |
|
ansuz
|
290763d6c5
|
don't complain about bad realtime state just because you disconnected
|
2017-08-17 15:07:34 +02:00 |
|
yflory
|
226ef1fd00
|
Merge branch 'pad2' of github.com:xwiki-labs/cryptpad into pad2
|
2017-08-17 14:55:53 +02:00 |
|
yflory
|
fb512c8923
|
Toolbar in pad2
|
2017-08-17 14:55:44 +02:00 |
|
ansuz
|
3b20dcd435
|
add optional cache-busting to favicon
|
2017-08-17 14:34:22 +02:00 |
|
ansuz
|
ee874878dd
|
clear tooltips when the userlist is redrawn
|
2017-08-17 12:50:40 +02:00 |
|
ansuz
|
f207edfd28
|
handle errors when deriving keys. fix incorrect reference
|
2017-08-17 12:50:12 +02:00 |
|
Caleb James DeLisle
|
e04c0b89a1
|
manual merge of staging
|
2017-08-17 12:14:19 +02:00 |
|
ansuz
|
130b330ede
|
refactor messaging
|
2017-08-16 10:04:50 +02:00 |
|
ansuz
|
736288a85b
|
lint compliance
|
2017-08-14 14:02:57 +02:00 |
|
ansuz
|
5037f444e9
|
update markdown sanitization strategy
|
2017-08-14 13:12:43 +02:00 |
|
Caleb James DeLisle
|
878a565f89
|
tiny little performance improvement in something that really doesn't need it
|
2017-08-11 17:34:51 +02:00 |
|
Caleb James DeLisle
|
7a698d092e
|
When Cryptpad.clearTooltips() gets called, don't clear tooltips unless their associated element has gone missing so it won't clear a tip someone is trying to read.
|
2017-08-11 17:28:23 +02:00 |
|
Pierre Bondoerffer
|
17b986a6ca
|
fix toolbar drive link (oops)
|
2017-08-11 12:56:06 +02:00 |
|
ansuz
|
284124a32d
|
WIP
|
2017-08-11 10:59:54 +02:00 |
|
Caleb James DeLisle
|
4acd9957a9
|
Set the url if there is none
|
2017-08-11 10:40:57 +02:00 |
|
Caleb James DeLisle
|
33e73dd5e5
|
fixed one last fight
|
2017-08-10 21:40:34 +02:00 |
|
Caleb James DeLisle
|
9c0b0cc6a8
|
Merge branch 'staging' into pad2
|
2017-08-10 18:39:16 +02:00 |
|
Caleb James DeLisle
|
1e56fa31c0
|
yay, they talk and they don't fight
|
2017-08-10 18:31:44 +02:00 |
|
ansuz
|
1c526feffb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-10 18:06:58 +02:00 |
|
Caleb James DeLisle
|
b3d349bf80
|
Merge branch 'staging' into pad2
|
2017-08-10 14:53:12 +02:00 |
|
Caleb James DeLisle
|
8efac4e661
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-10 14:49:41 +02:00 |
|
Caleb James DeLisle
|
0dde1d7507
|
wip
|
2017-08-10 14:49:21 +02:00 |
|
Pierre Bondoerffer
|
baf64114a6
|
point to homepage in drive
|
2017-08-10 14:45:56 +02:00 |
|
Caleb James DeLisle
|
c304071492
|
wip
|
2017-08-09 17:37:55 +02:00 |
|
Caleb James DeLisle
|
e49a42db18
|
Merge branch 'staging' into pad2
|
2017-08-09 16:28:51 +02:00 |
|
Caleb James DeLisle
|
1f9bd866c3
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-09 16:06:46 +02:00 |
|
Pierre Bondoerffer
|
edad5deeac
|
fix logo not showing sometimes in chrome
|
2017-08-09 16:06:29 +02:00 |
|
Caleb James DeLisle
|
52565076b9
|
Merge branch 'staging' of git://github.com/pbondoer/cryptpad into staging
|
2017-08-09 14:48:06 +02:00 |
|
Caleb James DeLisle
|
4b25ab80d6
|
wip
|
2017-08-09 14:45:39 +02:00 |
|
ansuz
|
844967a880
|
continued refactoring
|
2017-08-09 14:20:37 +02:00 |
|
Pierre Bondoerffer
|
a4aeada585
|
make the file dialog placeholder visible, center file list
|
2017-08-09 11:20:46 +02:00 |
|
Pierre Bondoerffer
|
e08ed72653
|
generate the tooltip after the button
|
2017-08-09 11:11:53 +02:00 |
|
Pierre Bondoerffer
|
665e81912e
|
put the tooltip on the actual button to prevent tippy from popping when not intended
|
2017-08-09 11:06:06 +02:00 |
|
Pierre Bondoerffer
|
34ba673cd3
|
improve file upload UI
|
2017-08-09 10:54:20 +02:00 |
|
ansuz
|
34a5a32c44
|
lint compliance
|
2017-08-08 20:29:02 +02:00 |
|
ansuz
|
cdf3cee9c8
|
split out message rendering into ui
|
2017-08-08 18:21:03 +02:00 |
|
ansuz
|
fcdfa52aa9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-08 17:13:38 +02:00 |
|
ansuz
|
58b3b32cc3
|
big messaging refactor. split UI from logic
|
2017-08-08 17:13:10 +02:00 |
|
Pierre Bondoerffer
|
6ca6755d02
|
more missing titles in toolbar
|
2017-08-08 16:51:23 +02:00 |
|
Pierre Bondoerffer
|
d3f2398865
|
bump tippy to 1.2.0, add dynamicTitle option
|
2017-08-08 16:19:44 +02:00 |
|
ansuz
|
8301bd44be
|
Merge pull request #164 from pbondoer/staging
UI improvements
|
2017-08-08 14:46:25 +02:00 |
|
Pierre Bondoerffer
|
f585ddccdf
|
fix image sizes in /slide/
|
2017-08-08 11:44:01 +02:00 |
|
ansuz
|
fc95f1b6a8
|
lint compliance
|
2017-08-08 10:32:25 +02:00 |
|
ansuz
|
ba9696ba33
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-08 10:03:54 +02:00 |
|
Caleb James DeLisle
|
a612f02be2
|
Merge branch 'staging' into pad2
|
2017-08-07 17:49:03 +02:00 |
|
ansuz
|
c63807fd2b
|
implement channel.send
|
2017-08-07 17:24:16 +02:00 |
|
Caleb James DeLisle
|
35a55a15ed
|
wip
|
2017-08-07 17:23:28 +02:00 |
|
ansuz
|
d835005905
|
simplify in-memory message format
|
2017-08-07 17:22:56 +02:00 |
|
Pierre Bondoerffer
|
8f285eba9f
|
make file picker ui even prettier
|
2017-08-07 17:22:54 +02:00 |
|
ansuz
|
797cc2b105
|
handle messages which fail to decrypt
|
2017-08-07 17:21:23 +02:00 |
|
Caleb James DeLisle
|
65dfd99171
|
major wip
|
2017-08-07 16:27:57 +02:00 |
|
Pierre Bondoerffer
|
c53e738054
|
improve file picker ui
|
2017-08-07 16:27:29 +02:00 |
|
ansuz
|
bad5160885
|
fix bad reference
|
2017-08-05 09:14:36 +02:00 |
|