yflory
|
ed9bcca96f
|
Close the websocket network when CryptGet/CryptPut is done
|
8 years ago |
yflory
|
a68acac13b
|
Only ask for a display name once in /poll
|
8 years ago |
yflory
|
a978b51656
|
If display name is empty, use anonymous in the drive
|
8 years ago |
yflory
|
153386a6e0
|
CSS improvements in the drive tree
|
8 years ago |
yflory
|
6098f28260
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a852112808
|
Fix open folder from the tree context menu
|
8 years ago |
ansuz
|
2c9deed381
|
Merge pull request #94 from pbondoer/staging
Some CSS fixes
|
8 years ago |
ansuz
|
868161a8a8
|
fix undefined reference in code
|
8 years ago |
ansuz
|
0bb10a8a0a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
Pierre Bondoerffer
|
800db07077
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
e1303a16da
|
add support for title attributes on dropdowns
|
8 years ago |
yflory
|
52793385ea
|
Fix lint errors
|
8 years ago |
Pierre Bondoerffer
|
e39fe1c0b7
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
01c4d7d4a7
|
Merge branch 'maybe' into staging
|
8 years ago |
ansuz
|
c884782d57
|
here are some changes
|
8 years ago |
yflory
|
2b6e44189d
|
When trying to reset the drive, tell the user if the input text is invalid
|
8 years ago |
yflory
|
9a7c2dd5e2
|
Add a 'settings' link to the user menu in static pages
|
8 years ago |
yflory
|
370ae81106
|
Use the display name in the backup file name if not logged in
|
8 years ago |
Pierre Bondoerffer
|
e0d972674f
|
Fix context menu in drive and rename textbox styling
|
8 years ago |
yflory
|
c5f983ecd7
|
Convert read-only link to editing link in the drive
|
8 years ago |
Pierre Bondoerffer
|
d26d8f53d9
|
(CSS) Fixed textarea being too large
|
8 years ago |
ansuz
|
a9afa24428
|
return empty string instead of blowing up when fixing HTML
|
8 years ago |
yflory
|
6b8d0c8bc7
|
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
|
8 years ago |
yflory
|
b32d698291
|
Fix issue with present mode in slide (readonly)
|
8 years ago |
yflory
|
8bdc8415ab
|
Find a pad in the drive
|
8 years ago |
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.
|
8 years ago |
ansuz
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
8 years ago |
yflory
|
53f4f8826e
|
Merge branch 'staging' into staging
|
8 years ago |
yflory
|
55210f17eb
|
Clean the code to be less dependant on 'li'
|
8 years ago |
Pierre Bondoerffer
|
3e9c4d0901
|
Add hover to file manager tree
|
8 years ago |
Pierre Bondoerffer
|
cbdfae09a6
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
c6c3e1bbb5
|
Don't select subfolders in the tree when drag&drop
|
8 years ago |
Pierre Bondoerffer
|
d605fc757b
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a26b9d3240
|
Don't select subfolders in the tree when right-click on drag&drop
|
8 years ago |
ansuz
|
cb5e01815c
|
validate all alertify strings by default. require 'force' argument to bypass
|
8 years ago |
Pierre Bondoerffer
|
b0323f6fd9
|
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
a2b5200381
|
Add a container for the folders in the tree in the drive
|
8 years ago |
yflory
|
412815b042
|
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
|
8 years ago |
yflory
|
11d54256da
|
Make sure the display name is displayed in the same way everywhere
|
8 years ago |
yflory
|
2c5c6da0d9
|
Fix XSS in alertify logs
|
8 years ago |
yflory
|
5797aab3f2
|
Fix XSS with display names in the user list
|
8 years ago |
yflory
|
26e3971482
|
Fix XSS in the user dropdown menu
|
8 years ago |
ansuz
|
639376f1cb
|
don't use hyperjson.toString
|
8 years ago |
Pierre Bondoerffer
|
eb9a39eb68
|
Add hover on elements in drive and make grid slightly prettier
|
8 years ago |
yflory
|
f130fd0598
|
Fix horizontal scrollbar in edge
|
8 years ago |
yflory
|
345d2faab2
|
Fix horizontal scrollbar in Edge #3
|
8 years ago |
yflory
|
d683dc499a
|
Fix horizontal scrollbar in Edge #2
|
8 years ago |
yflory
|
7a0a87bf6c
|
Fix horizontal scrollbar in Edge
|
8 years ago |
yflory
|
f06196c261
|
Remove the context menu buttons when removing selection
|
8 years ago |
yflory
|
c0278ba77f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
efb7380a12
|
Fix default pad not created after registration
|
8 years ago |
ansuz
|
5d39125004
|
Make onSettle Async Again
|
8 years ago |
yflory
|
4f4075ed6e
|
Make the settings app available to anonymous users
|
8 years ago |
yflory
|
0224d6489b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
12aec60a12
|
hack around onSettle not doing its job
|
8 years ago |
yflory
|
0ae7f94184
|
Remove the pointer and text underline on icon:hover in drive
|
8 years ago |
ansuz
|
69b6f80e4b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
86adfbf27d
|
update cache-busting directive in all supported apps
|
8 years ago |
ansuz
|
cfc9f2e622
|
remove code for 'user' app, now that we have login and register
|
8 years ago |
yflory
|
ec7761eeb8
|
Make sure we don't use a wrong title for a new pad
|
8 years ago |
yflory
|
8e7e1d336e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
96f6b5755d
|
Add the blog link in the header and footer
|
8 years ago |
ansuz
|
d49a7d7ec4
|
fix undefined reference
|
8 years ago |
ansuz
|
9a2ed5741a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
a4913f2f4b
|
provide UI for disabling the user feedback api
|
8 years ago |
ansuz
|
1a259bb3aa
|
check if user has disallowed feedback api
|
8 years ago |
yflory
|
4f7a05ead2
|
Fix issue with the path for the trash in the drive's topbar
|
8 years ago |
yflory
|
8741b50f5b
|
Set the file name as default title if a pad is created from the drive
|
8 years ago |
yflory
|
e8c73f35ce
|
In the tree, display the rename input only once
|
8 years ago |
yflory
|
e38df7ce47
|
Fix creation of new pads in /pad
|
8 years ago |
yflory
|
20518a3e88
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
f8d653406a
|
Add the new content for the default pad and add french translation
|
8 years ago |
ansuz
|
d15a08830e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
06f0891d21
|
add allowUserFeedback toggle to settigs page
|
8 years ago |
yflory
|
498f4065cf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
95853debf9
|
Update the default pad #1
|
8 years ago |
yflory
|
d4bf7cf9aa
|
Send the initial state only if it is a new pad in /pad
|
8 years ago |
yflory
|
66dc166936
|
Make sure the realtime is synced with onSettle when using cryptget
|
8 years ago |
yflory
|
fadddb297c
|
Readonly mode in /pad had contenteditable set to true
|
8 years ago |
ansuz
|
de5a21fe57
|
add a simple feedback api and text explaining what it is
|
8 years ago |
yflory
|
2ad9debe58
|
Remove the placeholders in /code and /slide
|
8 years ago |
yflory
|
38893fb8e5
|
Remove the 'Bootstart tooltips require Tether' error
|
8 years ago |
yflory
|
88b29e8bdd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
5303e76ece
|
Make sure the content is correctly applied in onReady
|
8 years ago |
ansuz
|
cc829d51f8
|
jshint compliance
|
8 years ago |
yflory
|
42b6cca18d
|
Fix new pad not working
|
8 years ago |
yflory
|
3fd5669647
|
Hide the trash icon for read-only pads if we have the edit link in drive
|
8 years ago |
yflory
|
02cc9c8344
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
yflory
|
e040c00557
|
Fix blocker issue when creating an account without migrating
|
8 years ago |
yflory
|
e15a6a347f
|
Fix the forget pad button
|
8 years ago |
ansuz
|
89bee8cf6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
ansuz
|
ba3e24b595
|
media tag experiments
|
8 years ago |
yflory
|
54b0a86c2e
|
Make sure we redirect to the drive if we access the login page from the homepage
|
8 years ago |
yflory
|
55fb0f03ae
|
Fix the path in the drive overriding the content area
|
8 years ago |
yflory
|
d7d7165dc4
|
Login page was using a wrong translation key
|
8 years ago |
yflory
|
ba0b314f5e
|
Fix the 'new' button in drive which was broken in non root categories
|
8 years ago |
yflory
|
d8cc2903cc
|
Display context menu actions in the toolbar when an element is selected
|
8 years ago |
yflory
|
a0340f1419
|
Open link in a new tab in /pad
|
8 years ago |
yflory
|
2d30393243
|
Add support for updated translation key
|
8 years ago |
yflory
|
cc174f3bee
|
Fix typo
|
8 years ago |