ansuz
|
f313b6f65c
|
bump travis node version to 6.6.0
|
2017-03-02 18:31:24 +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 |
|
yflory
|
55210f17eb
|
Clean the code to be less dependant on 'li'
|
2017-03-01 16:15:48 +01:00 |
|
Pierre Bondoerffer
|
3e9c4d0901
|
Add hover to file manager tree
|
2017-03-01 15:57:22 +01:00 |
|
Pierre Bondoerffer
|
cbdfae09a6
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-01 15:53:48 +01:00 |
|
yflory
|
c6c3e1bbb5
|
Don't select subfolders in the tree when drag&drop
|
2017-03-01 15:53:31 +01:00 |
|
Pierre Bondoerffer
|
d605fc757b
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-01 15:46:49 +01:00 |
|
yflory
|
a26b9d3240
|
Don't select subfolders in the tree when right-click on drag&drop
|
2017-03-01 15:46:10 +01:00 |
|
ansuz
|
cb5e01815c
|
validate all alertify strings by default. require 'force' argument to bypass
|
2017-03-01 15:07:34 +01:00 |
|
Pierre Bondoerffer
|
b0323f6fd9
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
2017-03-01 14:45:18 +01:00 |
|
yflory
|
a2b5200381
|
Add a container for the folders in the tree in the drive
|
2017-03-01 14:44:43 +01:00 |
|
ansuz
|
bd42a7d176
|
bump hyperjson bower dependency to new major version
|
2017-03-01 14:36:41 +01:00 |
|
yflory
|
412815b042
|
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
|
2017-03-01 13:10:55 +01:00 |
|
yflory
|
11d54256da
|
Make sure the display name is displayed in the same way everywhere
|
2017-03-01 13:10:06 +01:00 |
|
yflory
|
2c5c6da0d9
|
Fix XSS in alertify logs
|
2017-03-01 13:09:14 +01:00 |
|
yflory
|
5797aab3f2
|
Fix XSS with display names in the user list
|
2017-03-01 13:08:36 +01:00 |
|
yflory
|
26e3971482
|
Fix XSS in the user dropdown menu
|
2017-03-01 13:08:09 +01:00 |
|
ansuz
|
639376f1cb
|
don't use hyperjson.toString
|
2017-03-01 12:36:10 +01:00 |
|
Pierre Bondoerffer
|
eb9a39eb68
|
Add hover on elements in drive and make grid slightly prettier
|
2017-02-28 23:15:47 +01:00 |
|
ansuz
|
3619fdc77a
|
bump cryptpad version number
|
2017-02-28 19:04:54 +01:00 |
|