ansuz
|
805e26bc07
|
add a version footer to main pages
|
2017-03-14 14:34:13 +01:00 |
|
yflory
|
f10149db1c
|
Make sure the tip is always visible when the loading screen is removed
|
2017-03-14 12:49:22 +01:00 |
|
ansuz
|
71db08eac2
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-14 12:40:25 +01:00 |
|
ansuz
|
09afba80db
|
add support for logging in from register page
|
2017-03-14 12:39:50 +01:00 |
|
yflory
|
16e5788011
|
Call the callback if we can't parse the local Drive to import it
|
2017-03-14 12:09:52 +01:00 |
|
ansuz
|
413d9a6f0b
|
add a style-callback to confirm
|
2017-03-14 12:01:42 +01:00 |
|
ansuz
|
5d88c3a436
|
newer registration code
|
2017-03-14 12:00:23 +01:00 |
|
ansuz
|
10bb11bff6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 19:32:15 +01:00 |
|
ansuz
|
803e57c958
|
add more parameters to confirm dialogs
|
2017-03-13 19:30:56 +01:00 |
|
yflory
|
ceaf757680
|
Allow right click on the CryptPad logo/link in the top left corner
|
2017-03-13 18:49:30 +01:00 |
|
ansuz
|
f2aa531f27
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:38 +01:00 |
|
ansuz
|
df6298eeb6
|
apply styles to confirm buttons if provided
|
2017-03-13 18:18:17 +01:00 |
|
yflory
|
84c16c00ad
|
Fix click events not working on inputs in the drive tree
|
2017-03-13 15:53:13 +01:00 |
|
ansuz
|
07a2d8e189
|
apply translations on feedback page
|
2017-03-13 12:56:49 +01:00 |
|
yflory
|
ca9faa0056
|
Fix wrong translation keys
|
2017-03-13 11:52:48 +01:00 |
|
yflory
|
b7986ff6b1
|
Replace the spinner code with a font awesome spinner
|
2017-03-13 11:52:39 +01:00 |
|
ansuz
|
6e733b1329
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-13 10:59:20 +01:00 |
|
ansuz
|
d9996cc874
|
current work for pinning
|
2017-03-13 10:56:08 +01:00 |
|
ansuz
|
a7d61aa562
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
2017-03-10 18:04:07 +01:00 |
|
ansuz
|
b3cc8da315
|
implement basic clientside RPC infrastructure
and provide a basic example for testing it
|
2017-03-10 18:03:52 +01:00 |
|
yflory
|
f94db93897
|
Improve the slides layout in print mode
|
2017-03-10 16:46:36 +01:00 |
|
ansuz
|
81027b4200
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
|
2017-03-10 10:49:33 +01:00 |
|
yflory
|
2392167996
|
Export slides as PDF
|
2017-03-09 19:05:44 +01:00 |
|
yflory
|
4bac8ea0c7
|
Draw all the slides at once to allow reference links (fix #77)
|
2017-03-09 12:41:23 +01:00 |
|
yflory
|
459b18c97b
|
Add the loading screen in the HTML so that it is displayed before JS is loaded
|
2017-03-08 18:05:15 +01:00 |
|
yflory
|
404fa378e6
|
Move the store to the 'common' folder, it is not customizable anymore
|
2017-03-08 16:47:38 +01:00 |
|
yflory
|
a8d200ef2e
|
Don't redirect until realtime is synced when logging in
|
2017-03-08 16:15:31 +01:00 |
|
yflory
|
0c1efd361b
|
Make sure the href is updated everywhere when importing a stronger link
|
2017-03-08 15:49:02 +01:00 |
|
yflory
|
b701e3cc85
|
Fix lint errors
|
2017-03-08 14:59:51 +01:00 |
|
yflory
|
4206382865
|
Fix the settings app to allow backup for unregistered users
|
2017-03-08 14:45:39 +01:00 |
|
yflory
|
f62267f8a1
|
Ability to import local pads in the user object
|
2017-03-07 18:39:21 +01:00 |
|
ansuz
|
e2418a6be2
|
sketch of how pinning rpc will look
|
2017-03-07 17:33:31 +01:00 |
|
ansuz
|
dc567fa7f3
|
signing keys are stored in hex so encode and decode them
|
2017-03-07 17:30:32 +01:00 |
|
yflory
|
ce6cd1211e
|
Fix lint errors
|
2017-03-07 15:33:08 +01:00 |
|
ansuz
|
aa762e7d63
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-07 15:33:01 +01:00 |
|
ansuz
|
8a48612de2
|
add some notes for later
|
2017-03-07 14:40:06 +01:00 |
|
yflory
|
9ad33574e9
|
Fix the function returning the pads list in the drive
|
2017-03-07 14:30:07 +01:00 |
|
yflory
|
14938089ac
|
Keep the focus on the iframe window after canceling a deletion
|
2017-03-07 14:24:06 +01:00 |
|
yflory
|
3f7dea8f7e
|
Context menu support for multi-select options in drive
|
2017-03-07 12:22:02 +01:00 |
|
yflory
|
e1c02fd8a4
|
Drive rename: save pads and folders name on click, cancel with Esc.
|
2017-03-06 18:15:14 +01:00 |
|
yflory
|
d93a270336
|
Ability to display tips in the loading screen
|
2017-03-06 17:20:09 +01:00 |
|
yflory
|
77d09f64e1
|
Display anonymous users in the user list
|
2017-03-06 14:56:41 +01:00 |
|
yflory
|
cb88227e2b
|
Autocomplete on key press in some dropdown menus
|
2017-03-06 12:20:23 +01:00 |
|
ansuz
|
c04819538b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-03-03 18:16:39 +01:00 |
|
ansuz
|
fcb9848b3a
|
hide toolbar when in read-only mode
|
2017-03-03 18:16:34 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|