23ce2ed674
Merge pull request #166 from coldfix/master
...
Properly escape sed match/replace expressions
2017-08-10 11:43:36 +02:00
405526cfa5
Properly escape sed replace expressions
...
This fixes an error during container startup due to interpolating a
$STORAGE value that may contain slashes or other "active" characters:
...
Using secure websockets: false
Using storage adapter: ./storage/file
sed: bad option in substitution expression
Also add a trailing ',' in the search expression to avoid substituting
in the comment above the actual definition:
/* If Cryptpad is proxied without using https, the server needs to know.
* Specify 'useSecureWebsockets: true' so that it can send
...
2017-08-10 10:35:38 +02:00
ace31c952e
clear tooltips when redrawing the userlist
2017-08-01 11:51:46 +02:00
4c6f8d71e1
don't invoke spinner if it does not exist
2017-08-01 11:08:25 +02:00
0b69973c17
remove html
2017-08-01 10:32:04 +02:00
85cfd4335d
correct markdown syntax
2017-08-01 10:31:23 +02:00
4614d6ae81
remove legacy max-width from usage bar
2017-08-01 10:05:54 +02:00
9a733cca0e
drop support for legacy iframe
2017-07-31 17:30:19 +02:00
311f709dc4
lint compliance
2017-07-31 17:15:17 +02:00
27c94b4437
Merge pull request #161 from pbondoer/language
...
New FR/ES keys
2017-07-31 16:57:35 +02:00
f2a78ddfd9
New FR/ES keys
2017-07-31 16:55:09 +02:00
1ca00e7e01
resolve merge conflicts
2017-07-31 16:00:45 +02:00
1f8449ff65
Merge pull request #139 from dtrv/master
...
add translations and some improvements
2017-07-31 15:50:03 +02:00
411c64df85
Merge branch 'master' into master
2017-07-31 15:49:54 +02:00
88c9998565
Merge pull request #159 from c4rl0sc/master
...
Fixed spelling issues and improved translation quality.
2017-07-31 15:48:13 +02:00
c147d342a3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-31 15:45:50 +02:00
eebe473f13
reenable same-origin CSP
2017-07-31 15:43:47 +02:00
542d0cd17f
drop support for legacy pad list
2017-07-31 15:34:56 +02:00
93e007b52a
reduce png sizes
2017-07-31 15:11:35 +02:00
f6125415aa
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-07-31 15:07:43 +02:00
1c238100c8
don't throw alerts in the middle of someone's presentation
2017-07-31 15:07:34 +02:00
cd3f29c502
Merge branch 'readme' of git://github.com/pbondoer/cryptpad into staging
2017-07-31 15:00:47 +02:00
e655ebd29e
Remove link on README
2017-07-31 14:59:26 +02:00
3f92427fdf
Polish README some mo'
2017-07-31 14:58:14 +02:00
7cd42d5ff1
use provided clearTooltips function
2017-07-31 14:52:33 +02:00
c26350c057
Improve README
2017-07-31 14:47:54 +02:00
3fa010027c
implement clearTooltips
2017-07-31 12:29:41 +02:00
a68a225d79
fix read-only synchronization bug
2017-07-31 12:21:48 +02:00
777dea2014
Merge branch 'staging' into todo
2017-07-31 11:43:56 +02:00
a458d7fa46
bump to latest version
2017-07-31 10:24:35 +02:00
99d39514a2
turn uploads on by default
2017-07-31 10:20:42 +02:00
9734a4db80
append new items to the top of the todo
2017-07-26 15:37:16 +02:00
69eaccbdef
don't create empty todo entries
2017-07-26 15:22:25 +02:00
e84edb2c2b
disable problematic tooltips
2017-07-26 13:46:07 +02:00
9c07793d0d
remove tips on checkbox state change
2017-07-26 13:42:12 +02:00
ba9cab762c
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:29:33 +02:00
8e83501c72
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:31:02 +02:00
459e0b3b16
CSS and bug fixes for todo
2017-07-26 13:30:39 +02:00
a5b19b1cdd
add missing translations
2017-07-26 13:27:34 +02:00
d4ffa7903f
better popup logic
2017-07-26 13:26:35 +02:00
0b81781f35
make the input bold
2017-07-26 13:25:58 +02:00
2af96d74fc
automatically focus on the create todo form
2017-07-26 13:17:02 +02:00
77d6da841f
Merge branch 'todo' of github.com:xwiki-labs/cryptpad into todo
2017-07-26 13:07:41 +02:00
3da76e3ae8
Update style for the todo app
2017-07-26 13:07:35 +02:00
85366f2368
use new translations
2017-07-26 13:04:23 +02:00
d99d071716
WIP checkbox titles
2017-07-26 13:03:48 +02:00
e6031c2209
slightly better styles
2017-07-26 13:03:25 +02:00
8cfd8d3270
add translations for todo
2017-07-26 13:02:14 +02:00
c390bdd518
resolve merge conflicts
2017-07-26 12:41:13 +02:00
0612a50ab4
Add fadein/fadeout when adding or removing a task
2017-07-26 11:40:24 +02:00
ansuz