yflory
|
2f74324dac
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-16 12:05:37 +01:00 |
|
yflory
|
f79e1dfda0
|
Fix a race condition that could wiped the content of coed and slide
|
2018-01-16 12:05:26 +01:00 |
|
Caleb James DeLisle
|
79fa732128
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-16 11:53:41 +01:00 |
|
Caleb James DeLisle
|
137c6428e8
|
Introducing heapdump to allow collecting more data from the server
|
2018-01-16 11:53:23 +01:00 |
|
ansuz
|
3118dd8312
|
set logLevel to 2 by default for sframe apps
|
2018-01-16 11:52:04 +01:00 |
|
Caleb James DeLisle
|
f3167964f4
|
In case there is an error parsing one of the messages in a file, catch rather than blowing up
|
2018-01-16 11:51:09 +01:00 |
|
yflory
|
88a04fdb07
|
Don't create sfcommon a second time in code and slide
|
2018-01-16 11:26:16 +01:00 |
|
ansuz
|
4fc1079d67
|
translate some stuff
|
2018-01-15 17:43:58 +01:00 |
|
ansuz
|
3c9a025a4a
|
Merge branch 'soon'
|
2018-01-15 15:51:09 +01:00 |
|
yflory
|
ee605183e5
|
Make sure we don't have duplicates in the webchannel members
|
2018-01-15 15:40:52 +01:00 |
|
yflory
|
f11960d047
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-15 15:38:28 +01:00 |
|
yflory
|
20f05d2f6f
|
Fix Phantom viewers' revenge
|
2018-01-15 15:38:18 +01:00 |
|
ansuz
|
4afc04f64c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-15 14:14:50 +01:00 |
|
ansuz
|
b933c062a7
|
Merge branch 'use-less-memory' of github.com:xwiki-labs/cryptpad into origin/use-less-memory
|
2018-01-15 14:07:28 +01:00 |
|
Caleb James DeLisle
|
edeb1e25d3
|
Bad solution to a bad problem
|
2018-01-15 13:55:52 +01:00 |
|
yflory
|
f3d8fd3590
|
Ability to import local pads on login
|
2018-01-12 18:17:32 +01:00 |
|
yflory
|
a5b75e0164
|
Fix default config for anynymous drive
|
2018-01-12 18:15:15 +01:00 |
|
yflory
|
8ced81d8d7
|
lint compliance
|
2018-01-12 17:45:52 +01:00 |
|
yflory
|
50eb803c95
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-12 17:45:10 +01:00 |
|
yflory
|
47203c37f1
|
Remove console error caused by setTimeout called with undefined
|
2018-01-12 17:44:56 +01:00 |
|
ansuz
|
b630fb95e2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-12 17:39:43 +01:00 |
|
ansuz
|
a018b7db9e
|
only show availablePadTypes on the home page
|
2018-01-12 17:39:36 +01:00 |
|
yflory
|
a40315aff7
|
Remove ability to delete comments in polls for readonly users
|
2018-01-12 17:15:11 +01:00 |
|
yflory
|
85edc028ff
|
Remove logging about filepicker rpc
|
2018-01-12 17:10:55 +01:00 |
|
yflory
|
dffa117f4d
|
lint compliance
|
2018-01-12 17:09:33 +01:00 |
|
yflory
|
a4b35728dc
|
Todo app has a hash in the omnibar
|
2018-01-12 17:08:41 +01:00 |
|
yflory
|
68ce7fe53d
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-12 15:55:00 +01:00 |
|
yflory
|
d59bc4612d
|
Ability to disable the drive for anonymous users
|
2018-01-12 15:54:36 +01:00 |
|
ansuz
|
844d04df87
|
allow custom logout hooks defined in app config
|
2018-01-12 15:49:01 +01:00 |
|
ansuz
|
5b4e5480cb
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-12 14:51:53 +01:00 |
|
ansuz
|
9b78580d8e
|
make usage-bar display optional
|
2018-01-12 14:50:56 +01:00 |
|
yflory
|
db0d2e161c
|
Hide pad creation screen features if it is disabled in app config
|
2018-01-12 14:50:39 +01:00 |
|
yflory
|
b01d00f74a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-12 09:50:17 +01:00 |
|
yflory
|
daef08a9b3
|
Add an advanced new pad modal
|
2018-01-12 09:50:11 +01:00 |
|
Caleb James DeLisle
|
cd26a4c093
|
Added a test of /login/
|
2018-01-11 18:11:06 +01:00 |
|
yflory
|
e377d606be
|
Fix spinner style in the new settings category
|
2018-01-11 17:15:39 +01:00 |
|
Caleb James DeLisle
|
69aee6c21b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 17:09:06 +01:00 |
|
Caleb James DeLisle
|
378322a521
|
Don't finish the test until ChainPad settles, trying to eliminate a flicker
|
2018-01-11 17:08:47 +01:00 |
|
yflory
|
02d1f10231
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 16:09:41 +01:00 |
|
yflory
|
c460e2820e
|
Fix a 1px offset for the userlist in Firefox/Windows
|
2018-01-11 16:09:29 +01:00 |
|
Caleb James DeLisle
|
2c9e21b2de
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 16:07:10 +01:00 |
|
Caleb James DeLisle
|
a8e0cf2ed0
|
We should remove datastore between tests
|
2018-01-11 16:06:58 +01:00 |
|
yflory
|
bd9c44dbb2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 16:02:18 +01:00 |
|
yflory
|
ef480fea79
|
Add a settings category for the pad creation screen
|
2018-01-11 16:02:05 +01:00 |
|
Caleb James DeLisle
|
dc376fdb1c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2018-01-11 15:58:16 +01:00 |
|
Caleb James DeLisle
|
4808c8b374
|
Fixed poll which was not working with automated testing
|
2018-01-11 15:57:09 +01:00 |
|
ansuz
|
05ad38cfe1
|
add more config parameters to share menu extension
|
2018-01-11 15:55:57 +01:00 |
|
ansuz
|
c31b5aa6c0
|
make extension point cover share menu for files
|
2018-01-11 15:55:57 +01:00 |
|
yflory
|
13b704d9f6
|
Fix undefined webchannel when uploading a file
|
2018-01-11 15:55:57 +01:00 |
|
ansuz
|
ca3697ae3a
|
implement extension point for share menu
|
2018-01-11 15:55:57 +01:00 |