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 |
|
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 |
|
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 |
|
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 |
|
Caleb James DeLisle
|
e04c0b89a1
|
manual merge of staging
|
2017-08-17 12:14:19 +02:00 |
|
Caleb James DeLisle
|
4881f8d030
|
Remove X-Frame-Options because it cannot work with a cross-domain iframe.
|
2017-08-17 12:12:40 +02:00 |
|
Caleb James DeLisle
|
3315449114
|
Lets try this...
|
2017-08-16 14:30:17 +02:00 |
|
Caleb James DeLisle
|
4c949a61e7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:40:34 +02:00 |
|
Caleb James DeLisle
|
6b174934c8
|
Try waiting for iframe document.onload instead of looping and waiting for document.body to exist.
|
2017-08-16 12:40:15 +02:00 |
|
yflory
|
e7ef1e1c2b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:35:13 +02:00 |
|
yflory
|
7c49ca6e3f
|
Fix initial text size in code
|
2017-08-16 12:34:56 +02:00 |
|
ansuz
|
2874ccb5dc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:15:20 +02:00 |
|
ansuz
|
2a8abc2699
|
comment out splitter code
|
2017-08-16 12:15:08 +02:00 |
|
Caleb James DeLisle
|
e6cdf955d3
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 12:11:46 +02:00 |
|
Caleb James DeLisle
|
725e19925c
|
Yeah, that was silly...
|
2017-08-16 12:11:25 +02:00 |
|
Caleb James DeLisle
|
f7b2aa85b8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:36:25 +02:00 |
|
Caleb James DeLisle
|
3df20760c4
|
Yann does not have a twitter account.
|
2017-08-16 11:36:14 +02:00 |
|
yflory
|
df8851a53e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:35:56 +02:00 |
|
yflory
|
df0b7155f6
|
Add missing french translation
|
2017-08-16 11:35:40 +02:00 |
|
ansuz
|
46e47b454d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:34:54 +02:00 |
|
ansuz
|
127b6dbc6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:34:35 +02:00 |
|
ansuz
|
8b5519ad29
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:31:09 +02:00 |
|
ansuz
|
2b7dcbe77c
|
remove bs class that caused poor alignment sometimes
|
2017-08-16 11:30:56 +02:00 |
|
Caleb James DeLisle
|
4213d6de70
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:29:59 +02:00 |
|
Caleb James DeLisle
|
d6125d864c
|
Added Yann's bio
|
2017-08-16 11:29:50 +02:00 |
|
yflory
|
a39f802b4d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-08-16 11:17:37 +02:00 |
|
ansuz
|
9213aa7ee4
|
simplify example config
|
2017-08-16 11:02:03 +02:00 |
|
yflory
|
e4d842ed08
|
Fix typos in the french translation
|
2017-08-16 10:55:15 +02:00 |
|
ansuz
|
7537caf8fe
|
make footer translateable
|
2017-08-16 10:51:08 +02:00 |
|
ansuz
|
bd45aeaa03
|
bump package.json version
|
2017-08-16 10:31:47 +02:00 |
|
ansuz
|
d3a298d639
|
Merge branch 'ui-integration' into staging
|
2017-08-16 10:20:34 +02:00 |
|
ansuz
|
8ee5e14a60
|
merge ui-integration
|
2017-08-16 10:20:05 +02:00 |
|