ansuz
|
a9afa24428
|
return empty string instead of blowing up when fixing HTML
|
2017-03-02 11:38:20 +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
|
7db0e14bc0
|
add 'force' flag to override removal of html elements
|
2017-03-01 17:05:57 +01:00 |
|
yflory
|
53f4f8826e
|
Merge branch 'staging' into staging
|
2017-03-01 16:32:18 +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 |
|
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 |
|
yflory
|
f130fd0598
|
Fix horizontal scrollbar in edge
|
2017-02-28 18:02:12 +01:00 |
|
yflory
|
345d2faab2
|
Fix horizontal scrollbar in Edge #3
|
2017-02-28 17:13:51 +01:00 |
|
yflory
|
d683dc499a
|
Fix horizontal scrollbar in Edge #2
|
2017-02-28 17:03:23 +01:00 |
|
yflory
|
7a0a87bf6c
|
Fix horizontal scrollbar in Edge
|
2017-02-28 16:38:51 +01:00 |
|
yflory
|
f06196c261
|
Remove the context menu buttons when removing selection
|
2017-02-28 15:48:49 +01:00 |
|
yflory
|
c0278ba77f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 13:12:53 +01:00 |
|
yflory
|
efb7380a12
|
Fix default pad not created after registration
|
2017-02-28 13:12:27 +01:00 |
|
ansuz
|
5d39125004
|
Make onSettle Async Again
|
2017-02-28 13:12:04 +01:00 |
|
yflory
|
4f4075ed6e
|
Make the settings app available to anonymous users
|
2017-02-28 11:23:50 +01:00 |
|
yflory
|
0224d6489b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 11:06:50 +01:00 |
|
ansuz
|
12aec60a12
|
hack around onSettle not doing its job
|
2017-02-28 11:05:59 +01:00 |
|
yflory
|
0ae7f94184
|
Remove the pointer and text underline on icon:hover in drive
|
2017-02-28 10:50:52 +01:00 |
|
ansuz
|
69b6f80e4b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 10:47:23 +01:00 |
|
ansuz
|
86adfbf27d
|
update cache-busting directive in all supported apps
|
2017-02-28 10:47:18 +01:00 |
|
ansuz
|
cfc9f2e622
|
remove code for 'user' app, now that we have login and register
|
2017-02-28 10:46:21 +01:00 |
|
yflory
|
ec7761eeb8
|
Make sure we don't use a wrong title for a new pad
|
2017-02-28 10:43:36 +01:00 |
|
yflory
|
8e7e1d336e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-28 10:39:53 +01:00 |
|
yflory
|
96f6b5755d
|
Add the blog link in the header and footer
|
2017-02-28 10:39:48 +01:00 |
|
ansuz
|
d49a7d7ec4
|
fix undefined reference
|
2017-02-28 10:30:24 +01:00 |
|
ansuz
|
9a2ed5741a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 20:11:26 +01:00 |
|
ansuz
|
a4913f2f4b
|
provide UI for disabling the user feedback api
|
2017-02-27 20:11:18 +01:00 |
|
ansuz
|
1a259bb3aa
|
check if user has disallowed feedback api
|
2017-02-27 20:02:54 +01:00 |
|
yflory
|
4f7a05ead2
|
Fix issue with the path for the trash in the drive's topbar
|
2017-02-27 18:37:44 +01:00 |
|
yflory
|
8741b50f5b
|
Set the file name as default title if a pad is created from the drive
|
2017-02-27 18:15:18 +01:00 |
|
yflory
|
e8c73f35ce
|
In the tree, display the rename input only once
|
2017-02-27 17:50:58 +01:00 |
|
yflory
|
e38df7ce47
|
Fix creation of new pads in /pad
|
2017-02-27 17:47:11 +01:00 |
|
yflory
|
20518a3e88
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 17:23:40 +01:00 |
|
yflory
|
f8d653406a
|
Add the new content for the default pad and add french translation
|
2017-02-27 17:23:28 +01:00 |
|
ansuz
|
d15a08830e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 14:32:04 +01:00 |
|
ansuz
|
06f0891d21
|
add allowUserFeedback toggle to settigs page
|
2017-02-27 14:31:56 +01:00 |
|
yflory
|
498f4065cf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-27 14:29:55 +01:00 |
|
yflory
|
95853debf9
|
Update the default pad #1
|
2017-02-27 14:29:48 +01:00 |
|
yflory
|
d4bf7cf9aa
|
Send the initial state only if it is a new pad in /pad
|
2017-02-27 14:29:38 +01:00 |
|
yflory
|
66dc166936
|
Make sure the realtime is synced with onSettle when using cryptget
|
2017-02-27 14:28:12 +01:00 |
|
yflory
|
fadddb297c
|
Readonly mode in /pad had contenteditable set to true
|
2017-02-27 12:41:29 +01:00 |
|
ansuz
|
de5a21fe57
|
add a simple feedback api and text explaining what it is
|
2017-02-27 12:06:49 +01:00 |
|
yflory
|
2ad9debe58
|
Remove the placeholders in /code and /slide
|
2017-02-27 11:45:23 +01:00 |
|
yflory
|
38893fb8e5
|
Remove the 'Bootstart tooltips require Tether' error
|
2017-02-27 11:19:29 +01:00 |
|
yflory
|
88b29e8bdd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-24 18:55:48 +01:00 |
|
yflory
|
5303e76ece
|
Make sure the content is correctly applied in onReady
|
2017-02-24 18:55:41 +01:00 |
|
ansuz
|
cc829d51f8
|
jshint compliance
|
2017-02-24 18:23:43 +01:00 |
|
yflory
|
42b6cca18d
|
Fix new pad not working
|
2017-02-24 16:55:43 +01:00 |
|
yflory
|
3fd5669647
|
Hide the trash icon for read-only pads if we have the edit link in drive
|
2017-02-24 16:51:15 +01:00 |
|
yflory
|
02cc9c8344
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-24 16:18:54 +01:00 |
|
yflory
|
e040c00557
|
Fix blocker issue when creating an account without migrating
|
2017-02-24 16:18:41 +01:00 |
|
yflory
|
e15a6a347f
|
Fix the forget pad button
|
2017-02-24 15:22:26 +01:00 |
|
ansuz
|
89bee8cf6b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-24 12:08:26 +01:00 |
|
ansuz
|
ba3e24b595
|
media tag experiments
|
2017-02-24 12:08:16 +01:00 |
|
yflory
|
54b0a86c2e
|
Make sure we redirect to the drive if we access the login page from the homepage
|
2017-02-24 11:44:47 +01:00 |
|
yflory
|
55fb0f03ae
|
Fix the path in the drive overriding the content area
|
2017-02-24 11:01:33 +01:00 |
|
yflory
|
d7d7165dc4
|
Login page was using a wrong translation key
|
2017-02-23 18:19:33 +01:00 |
|
yflory
|
ba0b314f5e
|
Fix the 'new' button in drive which was broken in non root categories
|
2017-02-23 18:15:44 +01:00 |
|
yflory
|
d8cc2903cc
|
Display context menu actions in the toolbar when an element is selected
|
2017-02-23 17:25:25 +01:00 |
|
yflory
|
a0340f1419
|
Open link in a new tab in /pad
|
2017-02-23 14:27:18 +01:00 |
|
yflory
|
2d30393243
|
Add support for updated translation key
|
2017-02-23 11:45:00 +01:00 |
|
yflory
|
cc174f3bee
|
Fix typo
|
2017-02-22 12:26:25 +01:00 |
|
yflory
|
bdc00a2413
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-22 12:25:48 +01:00 |
|
yflory
|
0ce17ebbad
|
CryptDrive usability improvements (new file in drive + context menu)
|
2017-02-22 12:25:29 +01:00 |
|
yflory
|
e73b4a1131
|
Don't display 'All files' in the menu
|
2017-02-22 11:15:29 +01:00 |
|
ansuz
|
89f3577058
|
remove old poll
|
2017-02-22 11:05:47 +01:00 |
|
ansuz
|
7e77c6828a
|
more correct pluralization
|
2017-02-21 18:55:48 +01:00 |
|
ansuz
|
3d0e7cb9a7
|
pull ckeditor config out of main.js
|
2017-02-21 18:21:30 +01:00 |
|
yflory
|
328e5c6f03
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-02-21 17:43:05 +01:00 |
|
yflory
|
c72bbd4c37
|
Use the file name as initial title
|
2017-02-21 17:42:58 +01:00 |
|
Pierre Bondoerffer
|
4cbb3b2ed2
|
Ensure we use English for reference
|
2017-02-21 14:53:18 +01:00 |
|
Pierre Bondoerffer
|
ffe17a6bc9
|
Use JSON.stringify instead and fix linter
|
2017-02-21 14:37:08 +01:00 |
|
Pierre Bondoerffer
|
a84f8e2808
|
Assert translation now outputs JavaScript which is easier to edit for translators
|
2017-02-21 14:23:58 +01:00 |
|
yflory
|
47b8fefd9e
|
Load messages.js only once, in cryptpad-common
|
2017-02-21 14:16:23 +01:00 |
|
yflory
|
11d9c9e813
|
Merge branch 'master' into staging
|
2017-02-21 10:44:03 +01:00 |
|
yflory
|
2103f0afa8
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-02-21 10:42:35 +01:00 |
|
yflory
|
0bdf59c1dd
|
Fix broken link in the 'New' button on cryptpad.fr
|
2017-02-21 10:42:06 +01:00 |
|
yflory
|
454d1c2052
|
Do not load all the translations anymore, only the needed one
|
2017-02-20 18:29:06 +01:00 |
|
yflory
|
434c3a220c
|
Remove old translation keys #2
|
2017-02-20 16:15:13 +01:00 |
|
yflory
|
d81d17b86c
|
Remove old translations keys no longer used
|
2017-02-17 17:39:27 +01:00 |
|
yflory
|
9702305abc
|
Use better translation keys in settings
|
2017-02-17 17:38:59 +01:00 |
|
yflory
|
a6497f7a52
|
Add a way to show the drive tips again
|
2017-02-17 16:56:59 +01:00 |
|
yflory
|
c17f28e5fe
|
Fix race condition #2
|
2017-02-17 15:39:34 +01:00 |