yflory
|
f61f284e44
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-03 18:14:59 +01:00 |
|
yflory
|
2a1b241592
|
Display a button to open the editing link while in read-only mode if we know it
|
2017-03-03 18:14:53 +01:00 |
|
ansuz
|
bf82704def
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-03 17:21:43 +01:00 |
|
ansuz
|
92066118a1
|
correct out of date portions of the readme
|
2017-03-03 17:16:06 +01:00 |
|
ansuz
|
6e72c6a51b
|
remove unused dependencies
|
2017-03-03 17:15:33 +01:00 |
|
yflory
|
27241488a5
|
Merge pull request #96 from pbondoer/css
(CSS) Some improvements to drive
|
2017-03-03 16:33:20 +01:00 |
|
Pierre Bondoerffer
|
6c9da646e0
|
(CSS) Some improvements to drive
|
2017-03-03 16:26:08 +01:00 |
|
ansuz
|
08c862b271
|
add FIXME notes to poll
|
2017-03-03 16:13:32 +01:00 |
|
yflory
|
ed9bcca96f
|
Close the websocket network when CryptGet/CryptPut is done
|
2017-03-03 12:48:00 +01:00 |
|
yflory
|
a68acac13b
|
Only ask for a display name once in /poll
|
2017-03-03 12:07:16 +01:00 |
|
yflory
|
a978b51656
|
If display name is empty, use anonymous in the drive
|
2017-03-03 12:06:35 +01:00 |
|
ansuz
|
f0f94ab180
|
Merge pull request #95 from pbondoer/staging
Update FR and ES translations
|
2017-03-02 18:46:36 +01:00 |
|
Pierre Bondoerffer
|
616d265b8d
|
Remove unused French keys
|
2017-03-02 18:43:06 +01:00 |
|
Pierre Bondoerffer
|
30faef613a
|
Update Spanish
|
2017-03-02 18:41:14 +01:00 |
|
ansuz
|
3b578aa1fd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 18:31:38 +01:00 |
|
ansuz
|
f313b6f65c
|
bump travis node version to 6.6.0
|
2017-03-02 18:31:24 +01:00 |
|
yflory
|
153386a6e0
|
CSS improvements in the drive tree
|
2017-03-02 18:24:18 +01:00 |
|
yflory
|
6098f28260
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 18:16:20 +01:00 |
|
yflory
|
a852112808
|
Fix open folder from the tree context menu
|
2017-03-02 18:16:16 +01:00 |
|
ansuz
|
2c9deed381
|
Merge pull request #94 from pbondoer/staging
Some CSS fixes
|
2017-03-02 18:15:30 +01:00 |
|
ansuz
|
868161a8a8
|
fix undefined reference in code
|
2017-03-02 17:59:59 +01:00 |
|
ansuz
|
0bb10a8a0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-02 17:59:35 +01:00 |
|
Pierre Bondoerffer
|
800db07077
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-02 17:44:29 +01:00 |
|
ansuz
|
e1303a16da
|
add support for title attributes on dropdowns
|
2017-03-02 17:40:29 +01:00 |
|
yflory
|
52793385ea
|
Fix lint errors
|
2017-03-02 17:17:55 +01:00 |
|
Pierre Bondoerffer
|
e39fe1c0b7
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-02 17:09:39 +01:00 |
|
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
2017-03-02 17:09:06 +01:00 |
|
ansuz
|
c884782d57
|
here are some changes
|
2017-03-02 17:08:50 +01:00 |
|
yflory
|
2b6e44189d
|
When trying to reset the drive, tell the user if the input text is invalid
|
2017-03-02 17:01:27 +01:00 |
|
yflory
|
9a7c2dd5e2
|
Add a 'settings' link to the user menu in static pages
|
2017-03-02 16:38:22 +01:00 |
|
Pierre Bondoerffer
|
e8a82c4c10
|
(CSS) Toolbar buttons are now always black on white independent of system theme
|
2017-03-02 16:35:30 +01:00 |
|
Pierre Bondoerffer
|
fa59f1000e
|
(CSS) Fix title input in pads
|
2017-03-02 16:33:17 +01:00 |
|
ansuz
|
584adb5482
|
bump version to 1.1.1
|
2017-03-02 16:31:58 +01:00 |
|
yflory
|
370ae81106
|
Use the display name in the backup file name if not logged in
|
2017-03-02 16:29:17 +01:00 |
|
Pierre Bondoerffer
|
e0d972674f
|
Fix context menu in drive and rename textbox styling
|
2017-03-02 16:22:32 +01:00 |
|
yflory
|
c5f983ecd7
|
Convert read-only link to editing link in the drive
|
2017-03-02 16:01:34 +01:00 |
|
Pierre Bondoerffer
|
d26d8f53d9
|
(CSS) Fixed textarea being too large
|
2017-03-02 15:50:03 +01:00 |
|
yflory
|
2b20eef464
|
Fix userlist in /pad
|
2017-03-02 12:28:01 +01:00 |
|
ansuz
|
a9afa24428
|
return empty string instead of blowing up when fixing HTML
|
2017-03-02 11:38:20 +01:00 |
|
ansuz
|
e3f26263f4
|
remove red outline on images in slide
|
2017-03-02 11:28:20 +01:00 |
|
ansuz
|
c9040997d5
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
2017-03-02 11:07:17 +01:00 |
|
yflory
|
6b8d0c8bc7
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
2017-03-02 10:53:48 +01:00 |
|
yflory
|
b32d698291
|
Fix issue with present mode in slide (readonly)
|
2017-03-02 10:53:45 +01:00 |
|
yflory
|
8bdc8415ab
|
Find a pad in the drive
|
2017-03-02 10:15:13 +01:00 |
|
Caleb James DeLisle
|
91eda5fa83
|
Implement stronger content-security-policy except in /pad/ which does not allow it.
Implement a "loader" which allows for applying a version number to everything.
Added a cache control for anything which has a version.
|
2017-03-01 21:06:53 +01:00 |
|
ansuz
|
9800f036c5
|
fix a typo
|
2017-03-01 17:06:18 +01:00 |
|
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
2017-03-01 17:05:57 +01:00 |
|
yflory
|
b238f4c3d3
|
Merge pull request #93 from pbondoer/staging
Add hover on elements in drive and make grid slightly prettier
|
2017-03-01 16:33:23 +01:00 |
|
yflory
|
53f4f8826e
|
Merge branch 'staging' into staging
|
2017-03-01 16:32:18 +01:00 |
|
yflory
|
1bb87164f0
|
Merge branch 'soon' into staging
|
2017-03-01 16:16:59 +01:00 |
|