ansuz
|
55b93864e5
|
update dependency versions
|
2018-01-03 12:05:27 +01:00 |
|
ansuz
|
63899c94f3
|
bump bower again
|
2018-01-03 11:56:58 +01:00 |
|
ansuz
|
33e3c6a0c0
|
update dependency versions
|
2018-01-03 11:53:14 +01:00 |
|
yflory
|
d2845b95b6
|
Fix multiple file upload prompt
|
2018-01-03 11:42:23 +01:00 |
|
ansuz
|
875035a41a
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2018-01-02 12:15:08 +01:00 |
|
ansuz
|
65e66dea08
|
resolve bad merge
|
2018-01-02 12:13:43 +01:00 |
|
ansuz
|
e3c7e96d71
|
Merge branch 'master' of github.com:koulaxizis/cryptpad into merge-greek
|
2018-01-02 12:11:07 +01:00 |
|
ansuz
|
7ff02fdf03
|
Merge pull request #213 from Falgn0n/patch-1
Update example.nginx.conf
|
2018-01-02 12:09:14 +01:00 |
|
ansuz
|
e460d9c36c
|
bump version
|
2018-01-02 10:38:49 +01:00 |
|
Falgn0n
|
f362aac246
|
Update example.nginx.conf
Updated the location block for "/api/config" to point directly to the node.js server @ localhost:3000
|
2017-12-24 12:13:28 +02:00 |
|
yflory
|
f329d65bc8
|
Ability to reduce the width of ckeditor
|
2017-12-22 18:01:15 +01:00 |
|
yflory
|
10aaa06781
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-22 16:25:52 +01:00 |
|
ansuz
|
869909b101
|
implement more reliable check for whether a channel on the server is new
|
2017-12-22 16:24:17 +01:00 |
|
ansuz
|
b6430d640e
|
temporary measure to address infinite reload loop due to inaccurate inNewFile condition
|
2017-12-22 14:59:41 +01:00 |
|
yflory
|
bc5554f5f6
|
Display an error when visiting the bounce app without href
|
2017-12-22 14:58:44 +01:00 |
|
yflory
|
2fd22c6db6
|
Fix task list in markdown when using one empty line between tasks
|
2017-12-22 14:56:01 +01:00 |
|
yflory
|
5e8b183ee6
|
Fix uncommited column in poll hidden in published mode
|
2017-12-22 14:42:37 +01:00 |
|
yflory
|
7164d2dfdd
|
lint compliance
|
2017-12-22 14:42:18 +01:00 |
|
Christos Koulaxizis
|
7f3a08f0c2
|
Greek translation
|
2017-12-22 14:58:51 +02:00 |
|
ansuz
|
26f5a1fe74
|
signal that onLocal is called by onRemote
|
2017-12-22 13:16:15 +01:00 |
|
yflory
|
888739e333
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 18:21:14 +01:00 |
|
yflory
|
fa6106a6bb
|
Use CSS to remove the loading screen
|
2017-12-21 18:21:10 +01:00 |
|
ansuz
|
b0fe323a4c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 18:09:55 +01:00 |
|
ansuz
|
c0b5dc7536
|
make loading screen tip presence configurable
|
2017-12-21 18:09:49 +01:00 |
|
yflory
|
a26031c119
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 17:38:28 +01:00 |
|
yflory
|
0e6e68aaff
|
Remove print prompt in slides since the browsers already have a prompt
|
2017-12-21 17:38:22 +01:00 |
|
ansuz
|
892dfb18f7
|
check if users have service workers
|
2017-12-21 17:30:54 +01:00 |
|
ansuz
|
5f42a9749f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 17:23:58 +01:00 |
|
ansuz
|
4aa8d92a53
|
handle errors when constructing thumbnails from file metadata
|
2017-12-21 17:18:10 +01:00 |
|
yflory
|
158ef58c6c
|
Enable print plugin in ckeditor
|
2017-12-21 17:07:06 +01:00 |
|
yflory
|
5532b779fd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 15:56:28 +01:00 |
|
ansuz
|
d1d75f2f25
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-12-21 15:53:16 +01:00 |
|
Caleb James DeLisle
|
590e77aafa
|
lint, missing semicolon
|
2017-12-21 11:15:21 +01:00 |
|
Caleb James DeLisle
|
f81cfb178b
|
Turn off display after testing
|
2017-12-21 11:06:53 +01:00 |
|
Caleb James DeLisle
|
81de5d861c
|
Caffeinate mac machines before starting the tests
|
2017-12-21 10:58:36 +01:00 |
|
Caleb James DeLisle
|
4117eb71cc
|
Report the number of tests
|
2017-12-21 10:40:48 +01:00 |
|
Caleb James DeLisle
|
c928be028a
|
Upgrade the testing framework to allow multiple tests
|
2017-12-20 18:36:53 +01:00 |
|
Caleb James DeLisle
|
d54a010bf4
|
Also kill stray running servers
|
2017-12-20 17:58:10 +01:00 |
|
Caleb James DeLisle
|
571f0307dc
|
Also kill firefox before running tests
|
2017-12-20 17:50:41 +01:00 |
|
yflory
|
f7d30318cc
|
Disable editable inputs in poll's read-only mode
|
2017-12-20 15:46:44 +01:00 |
|
yflory
|
edc236e17b
|
Disable edition in pad read-only mode
|
2017-12-20 12:15:43 +01:00 |
|
yflory
|
f4078d68f0
|
Remove the 'edit username' button in the userlist in readonly mode
|
2017-12-20 11:54:30 +01:00 |
|
yflory
|
78f738143b
|
Hide the markdown toolbar in read-only mode
|
2017-12-20 11:41:47 +01:00 |
|
ansuz
|
3177fd7857
|
hide whiteboard palette in view mode
|
2017-12-20 11:01:23 +01:00 |
|
Caleb James DeLisle
|
fa3a536f34
|
Also kill off extraneous safari instances
|
2017-12-19 19:36:17 +01:00 |
|
Caleb James DeLisle
|
7fce5fe2d7
|
typo
|
2017-12-19 19:33:49 +01:00 |
|
Caleb James DeLisle
|
00a791f182
|
Attempt to shutdown chrome before starting a build
|
2017-12-19 19:30:58 +01:00 |
|
Caleb James DeLisle
|
37dcf7285a
|
Need to be exactly true, not just truthy
|
2017-12-19 19:16:53 +01:00 |
|
Caleb James DeLisle
|
5ae4f1bb41
|
Fake change in order to trigger a build...
|
2017-12-19 19:13:14 +01:00 |
|
Caleb James DeLisle
|
dc7dbb3e96
|
Accidentally made a test which hangs...
|
2017-12-19 19:09:48 +01:00 |