85105a1382
Active folder in drive is not underlined anymore
2017-03-20 14:16:44 +01:00
cd77f50717
Fix transitions in slides, add swipe event handlers, and fix print in firefox
2017-03-20 12:50:46 +01:00
e139295d7e
Add transitions in present mode
2017-03-17 18:39:39 +01:00
45ac3e40a2
Copy print options to present mode
2017-03-17 18:03:00 +01:00
a5f11d0d0d
Uniform the slides rendering in present and print mode
2017-03-17 15:30:27 +01:00
d422c7e165
support old hashes in getUserChannelList
2017-03-16 17:14:54 +01:00
7d5ff27900
better rpc tests, sum up your channel usage
2017-03-16 17:03:45 +01:00
5ed6223313
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-16 14:47:03 +01:00
7f2f1f7191
correctly initialize RPC object
2017-03-16 14:46:55 +01:00
c9c9dd0999
use userChannelList if a list is not supplied to pinpad
2017-03-16 14:46:17 +01:00
e8c3cf6aa5
implement rpc message signing
2017-03-16 14:45:38 +01:00
d85a42c776
include User_hash in user channel list
2017-03-16 14:43:57 +01:00
f98c825dc3
Fix keyboard shortcuts not working in CryptDrive
2017-03-16 14:43:00 +01:00
7b27f1dc2c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-16 14:16:54 +01:00
7761aaa89f
Add search UI
2017-03-16 14:16:42 +01:00
b578803136
clean up registration code a little bit
2017-03-16 10:37:16 +01:00
c3c866fa2b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 18:59:53 +01:00
d19bbcb001
Add support for search in the drive
2017-03-15 18:59:55 +01:00
5eb32b33ee
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 18:59:38 +01:00
298725b3c2
don't show usage tips on error screens
2017-03-15 18:58:39 +01:00
0a6373852e
add signing keys to user object at login and register time
2017-03-15 18:57:13 +01:00
9a32fb1999
Fix sub-folders changing position in the tree when renaming them
2017-03-15 17:34:06 +01:00
931f7619c0
Keep the scroll position on redraw in drive
2017-03-15 17:30:52 +01:00
0607c3bbf3
Add a title to the 'new' button in drive
2017-03-15 17:20:08 +01:00
b9c64a526a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 17:15:03 +01:00
15e9af77bb
Remove the langauge selector from toolbar and add it in settings
2017-03-15 17:14:49 +01:00
8129b8cdc1
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-15 16:05:05 +01:00
15a67afc75
jshint compliance
2017-03-15 16:04:52 +01:00
13d7b3cadc
Merge branch 'd' into staging
2017-03-15 16:01:29 +01:00
a286599f93
Fix fast reconnect, and add support for reconnecting ws in polls
2017-03-15 16:01:00 +01:00
bd9efd7c04
provide examples of valid and invalid rpc calls
2017-03-15 15:56:32 +01:00
7187d3c550
implement getUserChannelList
2017-03-15 15:55:55 +01:00
306f6ce806
resolve merge-conflict with accounting branch
2017-03-14 15:52:04 +01:00
fe5e33a0ee
Fix loss of presentation position when updating slides
2017-03-14 15:42:42 +01:00
805e26bc07
add a version footer to main pages
2017-03-14 14:34:13 +01:00
f10149db1c
Make sure the tip is always visible when the loading screen is removed
2017-03-14 12:49:22 +01:00
71db08eac2
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-14 12:40:25 +01:00
09afba80db
add support for logging in from register page
2017-03-14 12:39:50 +01:00
16e5788011
Call the callback if we can't parse the local Drive to import it
2017-03-14 12:09:52 +01:00
413d9a6f0b
add a style-callback to confirm
2017-03-14 12:01:42 +01:00
5d88c3a436
newer registration code
2017-03-14 12:00:23 +01:00
10bb11bff6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 19:32:15 +01:00
803e57c958
add more parameters to confirm dialogs
2017-03-13 19:30:56 +01:00
ceaf757680
Allow right click on the CryptPad logo/link in the top left corner
2017-03-13 18:49:30 +01:00
f2aa531f27
apply styles to confirm buttons if provided
2017-03-13 18:18:38 +01:00
df6298eeb6
apply styles to confirm buttons if provided
2017-03-13 18:18:17 +01:00
84c16c00ad
Fix click events not working on inputs in the drive tree
2017-03-13 15:53:13 +01:00
07a2d8e189
apply translations on feedback page
2017-03-13 12:56:49 +01:00
ca9faa0056
Fix wrong translation keys
2017-03-13 11:52:48 +01:00
b7986ff6b1
Replace the spinner code with a font awesome spinner
2017-03-13 11:52:39 +01:00
6e733b1329
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-13 10:59:20 +01:00
d9996cc874
current work for pinning
2017-03-13 10:56:08 +01:00
a7d61aa562
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
2017-03-10 18:04:07 +01:00
b3cc8da315
implement basic clientside RPC infrastructure
...
and provide a basic example for testing it
2017-03-10 18:03:52 +01:00
f94db93897
Improve the slides layout in print mode
2017-03-10 16:46:36 +01:00
81027b4200
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into accounting
2017-03-10 10:49:33 +01:00
2392167996
Export slides as PDF
2017-03-09 19:05:44 +01:00
4bac8ea0c7
Draw all the slides at once to allow reference links ( fix #77 )
2017-03-09 12:41:23 +01:00
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
404fa378e6
Move the store to the 'common' folder, it is not customizable anymore
2017-03-08 16:47:38 +01:00
a8d200ef2e
Don't redirect until realtime is synced when logging in
2017-03-08 16:15:31 +01:00
0c1efd361b
Make sure the href is updated everywhere when importing a stronger link
2017-03-08 15:49:02 +01:00
b701e3cc85
Fix lint errors
2017-03-08 14:59:51 +01:00
4206382865
Fix the settings app to allow backup for unregistered users
2017-03-08 14:45:39 +01:00
f62267f8a1
Ability to import local pads in the user object
2017-03-07 18:39:21 +01:00
e2418a6be2
sketch of how pinning rpc will look
2017-03-07 17:33:31 +01:00
dc567fa7f3
signing keys are stored in hex so encode and decode them
2017-03-07 17:30:32 +01:00
ce6cd1211e
Fix lint errors
2017-03-07 15:33:08 +01:00
aa762e7d63
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-07 15:33:01 +01:00
8a48612de2
add some notes for later
2017-03-07 14:40:06 +01:00
9ad33574e9
Fix the function returning the pads list in the drive
2017-03-07 14:30:07 +01:00
14938089ac
Keep the focus on the iframe window after canceling a deletion
2017-03-07 14:24:06 +01:00
3f7dea8f7e
Context menu support for multi-select options in drive
2017-03-07 12:22:02 +01:00
e1c02fd8a4
Drive rename: save pads and folders name on click, cancel with Esc.
2017-03-06 18:15:14 +01:00
d93a270336
Ability to display tips in the loading screen
2017-03-06 17:20:09 +01:00
77d09f64e1
Display anonymous users in the user list
2017-03-06 14:56:41 +01:00
cb88227e2b
Autocomplete on key press in some dropdown menus
2017-03-06 12:20:23 +01:00
c04819538b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-03 18:16:39 +01:00
fcb9848b3a
hide toolbar when in read-only mode
2017-03-03 18:16:34 +01:00
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
27241488a5
Merge pull request #96 from pbondoer/css
...
(CSS) Some improvements to drive
2017-03-03 16:33:20 +01:00
6c9da646e0
(CSS) Some improvements to drive
2017-03-03 16:26:08 +01:00
08c862b271
add FIXME notes to poll
2017-03-03 16:13:32 +01:00
ed9bcca96f
Close the websocket network when CryptGet/CryptPut is done
2017-03-03 12:48:00 +01:00
a68acac13b
Only ask for a display name once in /poll
2017-03-03 12:07:16 +01:00
a978b51656
If display name is empty, use anonymous in the drive
2017-03-03 12:06:35 +01:00
153386a6e0
CSS improvements in the drive tree
2017-03-02 18:24:18 +01:00
6098f28260
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-02 18:16:20 +01:00
a852112808
Fix open folder from the tree context menu
2017-03-02 18:16:16 +01:00
2c9deed381
Merge pull request #94 from pbondoer/staging
...
Some CSS fixes
2017-03-02 18:15:30 +01:00
868161a8a8
fix undefined reference in code
2017-03-02 17:59:59 +01:00
0bb10a8a0a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-03-02 17:59:35 +01:00
800db07077
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-02 17:44:29 +01:00
e1303a16da
add support for title attributes on dropdowns
2017-03-02 17:40:29 +01:00
52793385ea
Fix lint errors
2017-03-02 17:17:55 +01:00
e39fe1c0b7
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-02 17:09:39 +01:00
01c4d7d4a7
Merge branch 'maybe' into staging
2017-03-02 17:09:06 +01:00
c884782d57
here are some changes
2017-03-02 17:08:50 +01:00
2b6e44189d
When trying to reset the drive, tell the user if the input text is invalid
2017-03-02 17:01:27 +01:00
9a7c2dd5e2
Add a 'settings' link to the user menu in static pages
2017-03-02 16:38:22 +01:00
370ae81106
Use the display name in the backup file name if not logged in
2017-03-02 16:29:17 +01:00
e0d972674f
Fix context menu in drive and rename textbox styling
2017-03-02 16:22:32 +01:00
c5f983ecd7
Convert read-only link to editing link in the drive
2017-03-02 16:01:34 +01:00
d26d8f53d9
(CSS) Fixed textarea being too large
2017-03-02 15:50:03 +01:00
a9afa24428
return empty string instead of blowing up when fixing HTML
2017-03-02 11:38:20 +01:00
6b8d0c8bc7
Merge branch 'security2' of git.xwikisas.com:xwiki-labs/cryptpad into security2
2017-03-02 10:53:48 +01:00
b32d698291
Fix issue with present mode in slide (readonly)
2017-03-02 10:53:45 +01:00
8bdc8415ab
Find a pad in the drive
2017-03-02 10:15:13 +01:00
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
7db0e14bc0
add 'force' flag to override removal of html elements
2017-03-01 17:05:57 +01:00
53f4f8826e
Merge branch 'staging' into staging
2017-03-01 16:32:18 +01:00
55210f17eb
Clean the code to be less dependant on 'li'
2017-03-01 16:15:48 +01:00
3e9c4d0901
Add hover to file manager tree
2017-03-01 15:57:22 +01:00
cbdfae09a6
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-01 15:53:48 +01:00
c6c3e1bbb5
Don't select subfolders in the tree when drag&drop
2017-03-01 15:53:31 +01:00
d605fc757b
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-01 15:46:49 +01:00
a26b9d3240
Don't select subfolders in the tree when right-click on drag&drop
2017-03-01 15:46:10 +01:00
cb5e01815c
validate all alertify strings by default. require 'force' argument to bypass
2017-03-01 15:07:34 +01:00
b0323f6fd9
Merge branch 'staging' of https://github.com/xwiki-labs/cryptpad into staging
2017-03-01 14:45:18 +01:00
a2b5200381
Add a container for the folders in the tree in the drive
2017-03-01 14:44:43 +01:00
412815b042
Merge branch 'security' of git.xwikisas.com:xwiki-labs/cryptpad into security
2017-03-01 13:10:55 +01:00
11d54256da
Make sure the display name is displayed in the same way everywhere
2017-03-01 13:10:06 +01:00
2c5c6da0d9
Fix XSS in alertify logs
2017-03-01 13:09:14 +01:00
5797aab3f2
Fix XSS with display names in the user list
2017-03-01 13:08:36 +01:00
26e3971482
Fix XSS in the user dropdown menu
2017-03-01 13:08:09 +01:00
639376f1cb
don't use hyperjson.toString
2017-03-01 12:36:10 +01:00
eb9a39eb68
Add hover on elements in drive and make grid slightly prettier
2017-02-28 23:15:47 +01:00
f130fd0598
Fix horizontal scrollbar in edge
2017-02-28 18:02:12 +01:00
345d2faab2
Fix horizontal scrollbar in Edge #3
2017-02-28 17:13:51 +01:00
d683dc499a
Fix horizontal scrollbar in Edge #2
2017-02-28 17:03:23 +01:00
7a0a87bf6c
Fix horizontal scrollbar in Edge
2017-02-28 16:38:51 +01:00
f06196c261
Remove the context menu buttons when removing selection
2017-02-28 15:48:49 +01:00
c0278ba77f
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 13:12:53 +01:00
efb7380a12
Fix default pad not created after registration
2017-02-28 13:12:27 +01:00
5d39125004
Make onSettle Async Again
2017-02-28 13:12:04 +01:00
4f4075ed6e
Make the settings app available to anonymous users
2017-02-28 11:23:50 +01:00
0224d6489b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 11:06:50 +01:00
12aec60a12
hack around onSettle not doing its job
2017-02-28 11:05:59 +01:00
0ae7f94184
Remove the pointer and text underline on icon:hover in drive
2017-02-28 10:50:52 +01:00
69b6f80e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 10:47:23 +01:00
86adfbf27d
update cache-busting directive in all supported apps
2017-02-28 10:47:18 +01:00
cfc9f2e622
remove code for 'user' app, now that we have login and register
2017-02-28 10:46:21 +01:00
ec7761eeb8
Make sure we don't use a wrong title for a new pad
2017-02-28 10:43:36 +01:00
8e7e1d336e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-28 10:39:53 +01:00
96f6b5755d
Add the blog link in the header and footer
2017-02-28 10:39:48 +01:00
d49a7d7ec4
fix undefined reference
2017-02-28 10:30:24 +01:00
9a2ed5741a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 20:11:26 +01:00
a4913f2f4b
provide UI for disabling the user feedback api
2017-02-27 20:11:18 +01:00
1a259bb3aa
check if user has disallowed feedback api
2017-02-27 20:02:54 +01:00
4f7a05ead2
Fix issue with the path for the trash in the drive's topbar
2017-02-27 18:37:44 +01:00
8741b50f5b
Set the file name as default title if a pad is created from the drive
2017-02-27 18:15:18 +01:00
e8c73f35ce
In the tree, display the rename input only once
2017-02-27 17:50:58 +01:00
e38df7ce47
Fix creation of new pads in /pad
2017-02-27 17:47:11 +01:00
20518a3e88
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 17:23:40 +01:00
f8d653406a
Add the new content for the default pad and add french translation
2017-02-27 17:23:28 +01:00
d15a08830e
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 14:32:04 +01:00
06f0891d21
add allowUserFeedback toggle to settigs page
2017-02-27 14:31:56 +01:00
498f4065cf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-27 14:29:55 +01:00
95853debf9
Update the default pad #1
2017-02-27 14:29:48 +01:00
d4bf7cf9aa
Send the initial state only if it is a new pad in /pad
2017-02-27 14:29:38 +01:00
66dc166936
Make sure the realtime is synced with onSettle when using cryptget
2017-02-27 14:28:12 +01:00
fadddb297c
Readonly mode in /pad had contenteditable set to true
2017-02-27 12:41:29 +01:00
de5a21fe57
add a simple feedback api and text explaining what it is
2017-02-27 12:06:49 +01:00
2ad9debe58
Remove the placeholders in /code and /slide
2017-02-27 11:45:23 +01:00
38893fb8e5
Remove the 'Bootstart tooltips require Tether' error
2017-02-27 11:19:29 +01:00
88b29e8bdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-24 18:55:48 +01:00
5303e76ece
Make sure the content is correctly applied in onReady
2017-02-24 18:55:41 +01:00
cc829d51f8
jshint compliance
2017-02-24 18:23:43 +01:00
42b6cca18d
Fix new pad not working
2017-02-24 16:55:43 +01:00
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
02cc9c8344
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-24 16:18:54 +01:00
e040c00557
Fix blocker issue when creating an account without migrating
2017-02-24 16:18:41 +01:00
e15a6a347f
Fix the forget pad button
2017-02-24 15:22:26 +01:00
89bee8cf6b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-24 12:08:26 +01:00
ba3e24b595
media tag experiments
2017-02-24 12:08:16 +01:00
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
55fb0f03ae
Fix the path in the drive overriding the content area
2017-02-24 11:01:33 +01:00
d7d7165dc4
Login page was using a wrong translation key
2017-02-23 18:19:33 +01:00
ba0b314f5e
Fix the 'new' button in drive which was broken in non root categories
2017-02-23 18:15:44 +01:00
d8cc2903cc
Display context menu actions in the toolbar when an element is selected
2017-02-23 17:25:25 +01:00
a0340f1419
Open link in a new tab in /pad
2017-02-23 14:27:18 +01:00
2d30393243
Add support for updated translation key
2017-02-23 11:45:00 +01:00
cc174f3bee
Fix typo
2017-02-22 12:26:25 +01:00
bdc00a2413
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-22 12:25:48 +01:00
0ce17ebbad
CryptDrive usability improvements (new file in drive + context menu)
2017-02-22 12:25:29 +01:00
e73b4a1131
Don't display 'All files' in the menu
2017-02-22 11:15:29 +01:00
89f3577058
remove old poll
2017-02-22 11:05:47 +01:00
7e77c6828a
more correct pluralization
2017-02-21 18:55:48 +01:00
3d0e7cb9a7
pull ckeditor config out of main.js
2017-02-21 18:21:30 +01:00
328e5c6f03
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-21 17:43:05 +01:00
c72bbd4c37
Use the file name as initial title
2017-02-21 17:42:58 +01:00
4cbb3b2ed2
Ensure we use English for reference
2017-02-21 14:53:18 +01:00
ffe17a6bc9
Use JSON.stringify instead and fix linter
2017-02-21 14:37:08 +01:00
a84f8e2808
Assert translation now outputs JavaScript which is easier to edit for translators
2017-02-21 14:23:58 +01:00
47b8fefd9e
Load messages.js only once, in cryptpad-common
2017-02-21 14:16:23 +01:00
11d9c9e813
Merge branch 'master' into staging
2017-02-21 10:44:03 +01:00
2103f0afa8
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2017-02-21 10:42:35 +01:00
0bdf59c1dd
Fix broken link in the 'New' button on cryptpad.fr
2017-02-21 10:42:06 +01:00
454d1c2052
Do not load all the translations anymore, only the needed one
2017-02-20 18:29:06 +01:00
434c3a220c
Remove old translation keys #2
2017-02-20 16:15:13 +01:00
d81d17b86c
Remove old translations keys no longer used
2017-02-17 17:39:27 +01:00
9702305abc
Use better translation keys in settings
2017-02-17 17:38:59 +01:00
a6497f7a52
Add a way to show the drive tips again
2017-02-17 16:56:59 +01:00
c17f28e5fe
Fix race condition #2
2017-02-17 15:39:34 +01:00
239e2bcc1f
Fix issue with null entries in Cryptpad_RECENTPADS
2017-02-17 15:18:09 +01:00
1540ae3f6f
Fix issue with null entries in Cryptpad_RECENTPADS
2017-02-17 15:16:30 +01:00
dd014f6ef2
Fix race conditon
2017-02-17 15:16:03 +01:00
94417d9a8b
jshint compliance
2017-02-17 14:28:18 +01:00
8167ed9048
implement cache-busting everywhere
2017-02-17 12:39:01 +01:00
34b6507fa3
implement cache-busting everywhere
2017-02-17 12:38:58 +01:00
c9b8889380
add cache-busting to chainpad-crypto
2017-02-17 11:26:43 +01:00
09fade6127
add cache-busting to chainpad-crypto
2017-02-17 11:25:35 +01:00
2daa9f8658
Link to main page was opened in the inner iframe
2017-02-17 10:57:56 +01:00
deda40375a
Use the new onSettle from chainpad to determine if the realtime is synced
2017-02-17 10:31:07 +01:00
550c65aae0
Add a default pad in CryptDrive after signing up
2017-02-16 18:10:12 +01:00
92d50ded64
Merge branch 'soon' into staging
2017-02-16 16:48:12 +01:00
97762f9f9a
Make sure all the elements in RECENTPADS are non-null objects
2017-02-16 16:07:43 +01:00
e4dbe97d71
Update display name in realtime across tabs and remember 'anonymous' name
2017-02-16 15:35:03 +01:00
7762ffcbff
Ability to use Ctrl+click on the cryptpad logo in apps
2017-02-15 18:31:36 +01:00
7497e0d1c5
Add a dropdown user menu to the top bar in static pages
2017-02-15 17:57:42 +01:00
0e76b18278
Hide the links in the html topbar on small screens
2017-02-15 14:23:56 +01:00
7758d056fa
Ability to import/export a user realtime object
2017-02-15 12:40:28 +01:00
0a43570990
Add the new files for the settings app
2017-02-14 19:07:17 +01:00
cd9cea8fa4
Create a settings app to manage user objects
2017-02-14 19:04:57 +01:00
71b84afdb2
Redirect to the pad when logging in or signing up from a pad
2017-02-14 11:29:08 +01:00
92050eb04f
Fix the trash button in toolbar not always working
2017-02-14 10:56:38 +01:00
aae3fba284
Fix the storage when the hash is invalid
2017-02-13 17:54:01 +01:00
25dd103f6f
Reduce font-size for register explanations
2017-02-13 12:54:34 +01:00
7d0c29513c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 12:42:17 +01:00
7d21206cae
add registration introductory text
2017-02-13 12:42:07 +01:00
2851ceb95a
Merge branch 'soon' into staging
2017-02-13 11:59:49 +01:00
2807ad9dc3
Add spinner and translate the register page
2017-02-13 11:41:48 +01:00
562e5b8c70
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 11:17:16 +01:00
5d4d530c89
switch registration text to an explanation of how login works
2017-02-13 11:17:00 +01:00
bff9d05210
Make sure the login_name is in the object
2017-02-13 11:15:30 +01:00
b1b294aade
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-13 11:10:40 +01:00
20083264b2
load fontawesome icons on register page
2017-02-13 11:09:44 +01:00
3aa03225c9
Add a spinner when hashing the password and translate homepage
2017-02-13 11:09:30 +01:00
fbcf4ccec4
force usernames to be lowercase
2017-02-13 11:01:30 +01:00
5614bea271
redirect users to login and register from toolbar
2017-02-13 10:51:54 +01:00
f723585758
add api to check whether the realtime has synced with the server
2017-02-13 10:42:17 +01:00
3b1bd2f720
use additional translation keys for registration
2017-02-13 10:15:25 +01:00
b5b2454f0b
use bootstrap for login and register pages
2017-02-10 18:29:49 +01:00
c556f78562
log in directly from home page, sign up at /register/
2017-02-10 16:49:17 +01:00
d0edf75c89
signup link directs users to register page, not user
2017-02-10 16:48:28 +01:00
1232aa8a79
jshint compliance
2017-02-10 14:25:02 +01:00
8eec7ec7c8
Fix typo
2017-02-10 11:00:34 +01:00
88af104ce8
basic registration page to replace user page
2017-02-09 18:50:28 +01:00
a995df25f6
disable new OT in pad and code app
2017-02-09 17:20:13 +01:00
f92ba193c3
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-09 17:16:03 +01:00
e100110741
implement log in as an api
2017-02-09 16:31:57 +01:00
d54262c8df
Use the same disconnecter error translation key for all the apps
2017-02-09 15:34:14 +01:00
f8366e0cfc
Remove support for legacy store and add a way to import legacy pads
2017-02-09 15:23:09 +01:00
342cb44cf7
Ability to migrate a anon drive directly from the drive
2017-02-09 12:58:08 +01:00
c642bce984
restore disabled listener
2017-02-09 10:31:00 +01:00
67d881b2cf
Remove the drive entry from the user menu if already in drive
2017-02-08 16:25:52 +01:00
e865b89f43
Add the contextmenu button in the drive dynamically
2017-02-08 15:41:50 +01:00
3af7c9cff8
Replace the expand/collapse ckeditor button by our own to save space
2017-02-08 15:32:55 +01:00
914c442615
Do not redirect to home page when logging out from another tab
2017-02-08 12:54:07 +01:00
702798f65a
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 18:47:24 +01:00
1e2cc6bea4
Fix race condition with the iframe store
2017-02-07 18:47:10 +01:00
dae17588c6
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 18:27:28 +01:00
32a5c5ff62
better integration between /user/ and home
2017-02-07 17:50:37 +01:00
fe7ba98338
remove dead code from /user/
2017-02-07 17:50:02 +01:00
9b047bfb53
don't autocorrect usernames. add trailing slash to /drive
2017-02-07 17:28:32 +01:00
6e97082ff9
remove dead code from login function
2017-02-07 17:27:36 +01:00
b3e73b0f0b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 16:49:31 +01:00
367a02c031
Add mobile support for the code app
2017-02-07 16:49:25 +01:00
628148d001
Display the contextmenu button only if contextmenu exists
2017-02-07 13:09:14 +01:00
8a1acc3c37
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-07 10:40:03 +01:00
6f07a3b7b4
erase lingering sessionStorage values when logging out
2017-02-07 10:39:42 +01:00
ac79fbb5a2
Improve mobile support for the toolbar and the drive
2017-02-06 18:06:59 +01:00
9f1789b2d2
Fix creation of pads from non-root category in the drive
2017-02-06 14:47:37 +01:00
7e7d1f7a16
Display the error when opening a document with the wrong app
2017-02-06 12:43:56 +01:00
6f0d33dc1d
Fix missing placeholder in the Slide app
2017-02-06 12:14:33 +01:00
7d6e15e465
Throw an error when trying to open a document with the wrong app
2017-02-06 12:06:39 +01:00
ad82a275bc
Replace the Apps button by a New button again
2017-02-06 11:39:04 +01:00
fd33ffd56f
Fix issue creating a patch everytime the user clicked in an app
2017-02-06 11:12:08 +01:00
fbbf8a2829
Replace initialState by a placeholder in slide and code
2017-02-03 18:45:30 +01:00
87abfac5e0
Fix lint error
2017-02-03 16:53:47 +01:00
02439e0f61
Improve the homepage with new images and translations
2017-02-03 16:03:36 +01:00
f57c8c0e4b
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 18:40:45 +01:00
2c6b4b9c6a
Hide disabled applications from the context menu in drive
2017-02-02 18:40:39 +01:00
85b49d5ec8
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 18:37:09 +01:00
91299f5f30
Ability to access the drive from any pad
2017-02-02 18:22:59 +01:00
b0fb56fa63
Allow logge din users to access the home page
2017-02-02 18:09:27 +01:00
72c4175b6f
remove slide/oldmain.js
2017-02-02 14:44:43 +01:00
e607ba5dad
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 11:33:44 +01:00
9cea8d82c2
Fix left-click disabled in Edge after renaming a file
2017-02-02 11:33:37 +01:00
2dfe182d8d
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-02-02 11:27:17 +01:00
0ca1775657
add page for listing missing translations
2017-02-02 11:27:08 +01:00
6a5769405b
Fix a race condition issue introduced with reconnecting patch
2017-02-01 18:48:30 +01:00
8881334ca8
Fix renaming folders from the tree
2017-02-01 17:46:05 +01:00
65054119cf
Fix a bug preventing reconnection in drive
2017-02-01 17:21:54 +01:00
89da142204
Fix pad creation from the context menu
2017-02-01 15:52:47 +01:00
757ae7a3ad
Fix a cross origin frame issue with dropdowns
2017-02-01 12:19:54 +01:00
3321d01040
add background image
2017-01-31 19:48:55 +01:00
8427b6ae8e
Fix 'sort by type' in drive
2017-01-31 17:00:30 +01:00
39c85ca3f7
Fix race condition causing missing translations in homepage
2017-01-31 12:01:33 +01:00
dc39c4e179
Fix a race condition causing the drive toolbar to be missing
2017-01-31 11:50:20 +01:00
2e247d44c7
Hide the backup icon when logged in
2017-01-31 10:59:23 +01:00
8ed593bfff
Keep the anon drive when signing up
2017-01-31 10:46:41 +01:00
5e69b78334
Remove the domain from the href in store
2017-01-30 18:52:27 +01:00
a9c9d19212
Hide the template from the list in the drive until it's done
2017-01-30 17:46:08 +01:00
487650df78
Remove the remember me checkbox
2017-01-30 15:32:42 +01:00
58d8a30b5b
Redirect to the main page when logging out
2017-01-30 15:26:32 +01:00
29578a7400
Merge branch 'hpbs' into newtoolbar
2017-01-30 14:45:02 +01:00
2d79649949
Fix the 'NoScript' bug with the drive
2017-01-30 12:28:21 +01:00
5ef074370b
Name a place before creating it in the drive
2017-01-27 17:51:08 +01:00
02906b3945
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
2017-01-27 16:57:22 +01:00
a4286f1c83
Merge branch 'soon' into newtoolbar
2017-01-27 16:52:49 +01:00
0e9e0e545f
Load the new pad when the hash is changed
2017-01-27 14:57:45 +01:00
e41cbb92d8
Use default FILES_DATA name if not provided
2017-01-26 16:52:23 +01:00
fa1582f307
Replace 'filename' by 'title' in drive when there is no filename
2017-01-26 16:43:26 +01:00
c44f3a1044
Delete multiple elements could also remove unselected ones
2017-01-26 16:18:43 +01:00
b79e1e48c7
Update colors in drive
2017-01-26 14:52:34 +01:00
fb48484d2a
Fix the rename feature in drive not working with tables
2017-01-26 14:51:59 +01:00
3f44444f41
Display the 'New' button in the trash
2017-01-26 13:19:40 +01:00
00efc96919
Move the toolbar and add a breadcrumb
2017-01-26 12:56:19 +01:00
6f5ff07c2b
Display the elements as a table instead of a list
2017-01-25 18:33:59 +01:00
95056315cf
Move the folder icon style to the less file
2017-01-25 17:29:06 +01:00
8c7305bf1b
Use less to write the drive stylesheet
2017-01-25 16:21:46 +01:00
11f0a9ae5f
Revert the changes adding anonymous pads
2017-01-25 15:35:40 +01:00
f42665ba49
Remove the unowned pads category
2017-01-25 14:27:06 +01:00
cb85ad3fdf
Merge branch 'newtoolbar' into ownedpads
2017-01-25 10:23:03 +01:00
75f1eed712
Merge branch 'newtoolbar' into hpbs
2017-01-25 10:21:50 +01:00
373b07ed28
Fix lint errors
2017-01-25 10:21:31 +01:00
097f78d777
Merge branch 'newtoolbar' of github.com:xwiki-labs/cryptpad into newtoolbar
2017-01-25 10:01:49 +01:00
015e6fc262
Make sure we have the same hash in all the tabs when disconnecting
2017-01-24 18:17:23 +01:00
88021f2264
Anonymous pads fo anonymous users
2017-01-24 18:14:29 +01:00
8ccd845d52
Merge branch 'newtoolbar' into hpbs
2017-01-24 12:54:32 +01:00
ce1e792419
Merge branch 'soon' into newtoolbar
2017-01-24 12:54:07 +01:00
9d275daebb
Backport changes for the login page from hpbs branch
2017-01-24 12:47:53 +01:00
a5c03c1540
Make sure data is migrated before leaving registration page
2017-01-24 12:38:06 +01:00
69fb8b4d2f
Merge branch 'master' into soon
2017-01-23 15:13:26 +01:00
f8455875a9
Fix the NoScript (iframe not loaded) bug with inner iframes
2017-01-23 15:07:38 +01:00
c77abfa7f4
Remove a second scrollbar in polls
2017-01-23 11:05:13 +01:00
5e36d9ea29
Fix polls table not updated with local events
2017-01-23 10:53:01 +01:00
39ca2e6dd6
Fix bootstrap conflict with context menus
2017-01-23 10:52:37 +01:00
d1bed5ae4b
Fix polls table not updated with local events
2017-01-23 10:51:44 +01:00
26bea774cb
Merge branch 'newtoolbar' into hpbs
2017-01-19 15:52:12 +01:00
99b8898e54
Apply new title when clicking on the page without pressing enter
2017-01-19 15:41:25 +01:00
ea8667302c
Display only a placeholder when the poll title is default
2017-01-19 15:35:38 +01:00
7d66d391fc
Merge branch 'newtoolbar' into hpbs
2017-01-19 15:17:30 +01:00
1e1bfd275c
Don't show the tab notification when someone has joined the pad
2017-01-19 15:17:21 +01:00
5d5d03163e
Add favicon and notifications in polls
2017-01-19 14:52:12 +01:00
3338000018
Add Esc and Arrow icons in the slide's present mode
2017-01-19 12:49:40 +01:00
efdae19f0c
Update the lists in the code and slide toolbars to use the new dropdown
2017-01-19 12:14:14 +01:00
36c8ade26c
Update the lists in the code and slide toolbars to use the new dropdown
2017-01-19 12:13:57 +01:00
fa8a0d5880
Merge branch 'newtoolbar' into hpbs
2017-01-19 10:53:55 +01:00
69bee7d79a
Add data into the homepage
2017-01-18 18:02:32 +01:00
88d5b4cc9c
Add a 'New pad' button in the toolbar
2017-01-18 11:00:46 +01:00
73d424b506
Improve the login UI (css and translations)
2017-01-17 16:21:12 +01:00
e006ed7076
Ability to log in from the main page
2017-01-17 11:52:44 +01:00
a9063e0459
Reload all tabs when the user logs in or out
2017-01-16 14:08:44 +01:00
efed1f5efe
Add handlers to login and logout buttons
2017-01-13 17:39:41 +01:00
767ba8b549
Select what we want to display in the toolbar
2017-01-13 17:14:44 +01:00
2afdc11327
Replace the username button by a dropdown menu
2017-01-13 17:11:12 +01:00
4adde0f0c0
Use the new dropdown for userlist and share
2017-01-13 15:05:00 +01:00
70b73206b7
Merge branch 'brandones-master' into soon
2017-01-13 10:33:38 +01:00
efffd4974f
Add createDropdown and createLanguageSelector in cryptpad-common
2017-01-12 18:28:38 +01:00
29c8f0bbef
Use a FontAwesome spinner to replace the old unaligned one
2017-01-12 17:05:16 +01:00
b5acdb8cc0
Disable zooming on mobile
2017-01-12 18:50:39 +03:00
40985f1811
Dubious height setting for iOS
2017-01-12 18:49:46 +03:00
52d8d8db1d
Get rid of margins on mobile
2017-01-12 18:49:46 +03:00
cd0931c951
UI improvements for mobile browsers
2017-01-12 18:49:46 +03:00
6352656737
Remove the default context menu in the entire drive
2017-01-12 15:55:35 +01:00
ed79b8870c
Merge branch 'master' into soon
2017-01-12 15:37:48 +01:00
605072cfbf
Fix empty title with new documents
2017-01-12 15:15:10 +01:00
4963c77b61
Fix the title reset bug
2017-01-12 14:29:40 +01:00
35a853ffff
Stop failing tests over missing translations because otherwise they'll almost never be passing.
2017-01-12 12:06:44 +01:00
3f1e287811
Fix an issue causing a user object to be turned into a pad
2017-01-12 11:09:45 +01:00
994f6991c8
Merge branch 'master' into soon
2017-01-11 18:01:08 +01:00
6c5e8d3118
Safari is really the best browser in the world, even though you have to stick a screwdriver in it to get it to start up
2017-01-11 18:00:41 +01:00
569ea21705
Replace the language selector by our custom dropdown menu
2017-01-11 10:59:09 +01:00
33b8de888e
clean up unused files
2017-01-11 07:49:56 +01:00
26dd4ea11f
Fix lint errors
2017-01-10 15:33:21 +01:00
4278ac7637
Merge branch 'soon' into fileManager
2017-01-10 15:07:48 +01:00
2be5db9540
Ability to open files in readonly mode
...
Fix CSS issues
2017-01-10 15:04:02 +01:00
63b9d4e9fd
remove path for backwards compatibility
2017-01-10 10:54:08 +01:00
f74d0a46a4
Remove the alert when pressing del in 'all files'
2017-01-09 18:38:05 +01:00
b39067d2a1
jshint compliance
2017-01-09 18:07:45 +01:00
74a12f50ac
only migrate keys which don't already exist
2017-01-09 17:35:58 +01:00
1c3f1a15cd
make sure that /pad is resized after loading
2017-01-09 17:02:01 +01:00
5b08fed7fa
Ability to add files from the drive toolbar
...
Fix CSS issues with the different toolbars
Translate the backup URL button alert
2017-01-09 16:29:16 +01:00
a3cd100c94
apply yflory's safari patch
2017-01-09 11:46:51 +01:00
0373556475
support old hashes in /poll
2017-01-09 11:46:21 +01:00
d5561910d4
Move the file manager into /drive and add a toolbar
2017-01-06 18:26:41 +01:00
1e70af0c16
Use the same network for the apps and the file store
2017-01-06 13:52:53 +01:00
bf764d26e7
Merge branch 'staging' into workgroups
2017-01-06 11:17:17 +01:00
3836b20b08
enable the file store
2017-01-06 11:16:56 +01:00
b0d4dad417
Fix creation of a new file manager object
2017-01-05 18:43:00 +01:00
5a8f0df19e
Add support for reconnecting websocket
2017-01-05 18:42:18 +01:00
b33661d9d5
don't toggle maximization state after setting
2017-01-05 15:21:17 +01:00
e56cc49f79
catch errors that popped up because of a cross-origin iframe
2017-01-05 14:14:26 +01:00
5080751a90
hide unnecessary scrollbar
2017-01-05 10:58:10 +01:00
95617a11c8
fix broken paths in old poll
2017-01-05 10:57:13 +01:00
7a0442afe0
Drag and drop files into a workgroup
2017-01-04 18:24:20 +01:00
05a956879a
prepare new poll app for release
...
move old poll into poll/old
2017-01-04 15:48:50 +01:00
5cd714b18a
configure filestore usage via customize/application_config.js
2017-01-03 12:10:11 +01:00
2b5085625c
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
2017-01-02 15:43:06 +01:00
69b1764c9d
Missing entries in the context menu with users
2017-01-02 15:42:29 +01:00
c6499d6789
make panel styles reusable
2016-12-30 15:30:35 +01:00
34967ac354
encapsulate rendering functions so we can pass in cryptpad-common
2016-12-30 13:27:01 +01:00
66b8c93205
remember time of first visit
2016-12-30 13:23:09 +01:00
ba4df1a22c
create examples directory with old prototypes
2016-12-30 13:22:15 +01:00
0abf45bdc5
better fsStore debugging
2016-12-30 12:27:58 +01:00
e3f79f914a
fix user hash
2016-12-29 18:12:30 +01:00
d232a5a83e
Revert "simplify key generation and remember user's additional keys"
...
This reverts commit 75786ff9ff
2016-12-29 17:51:58 +01:00
91a806ab86
focus on OK button when we pop an alert
2016-12-29 17:10:59 +01:00
850bd42149
don't try to display things that don't exist
2016-12-29 17:05:28 +01:00
75786ff9ff
simplify key generation and remember user's additional keys
2016-12-29 17:04:48 +01:00
621476424d
make strings translatable and refocus on correct input
2016-12-29 17:04:01 +01:00
a97696c712
show user's display name and account name
2016-12-29 17:03:17 +01:00
3560f0580f
commit prototype upload script
2016-12-28 17:23:57 +01:00
2f9f3d921a
trim excess whitespace from usernames
2016-12-28 17:13:41 +01:00
89e5830409
make alertify display time configurable
2016-12-28 17:13:00 +01:00
49d80d91d9
don't load customize/pad.js anymore
2016-12-28 15:53:27 +01:00
f020fd5a75
remove /customize/pad.js from main apps
2016-12-28 15:12:22 +01:00
aae443c8e9
replace old poll app with new
2016-12-28 11:44:48 +01:00
387f4ebf5d
add this important js file I forgot
2016-12-28 11:01:14 +01:00
8f0de589dc
add missing cp class to more html
2016-12-28 10:45:14 +01:00
e9376a66c2
apply 'cp' class for unified styles
2016-12-27 14:29:20 +01:00
8b034a9554
better flow and animations for login page
2016-12-27 12:32:20 +01:00
db12b5e896
move text for login page into translation file
2016-12-27 12:31:16 +01:00
5e1d8292c5
guard against trying to parse special fragments
2016-12-26 14:23:17 +01:00
51067430f9
more restructuring of user app
2016-12-26 14:19:29 +01:00
a4ed2388e2
use 'box' class
2016-12-26 14:19:02 +01:00
eb620bee77
restructure user application
2016-12-26 14:17:39 +01:00
a10eac2773
Fix lint errors
2016-12-22 18:16:38 +01:00
52a593c2c2
fix jshint complaints
2016-12-22 17:27:56 +01:00
53a4d4738a
really make sure you're logged out
2016-12-22 17:22:32 +01:00
63cd5c16ac
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
2016-12-22 17:20:30 +01:00
81259fc25f
Refresh unsorted and templates when files data changes
2016-12-22 17:20:05 +01:00
5534da8abf
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into login
2016-12-22 16:54:51 +01:00
9b6c9e3891
Add support for templates in the file manager
2016-12-22 16:53:38 +01:00
acfc27f5c5
fix merge conflicts
2016-12-22 16:53:03 +01:00
3197b62fbb
latest work
2016-12-22 16:44:49 +01:00
29d406b7a9
implement cryptput
2016-12-22 16:00:13 +01:00
84d5e4b35d
better tools for playing with template code
2016-12-22 11:03:44 +01:00
1772cc93c8
Fix the taildoc bug
2016-12-22 11:02:12 +01:00
87abfff66b
Fix Flash Of Unstyled Content (fouc)
2016-12-21 18:33:21 +01:00
86cda4357b
handle more possible cases
2016-12-21 18:24:48 +01:00
1682d23c1c
remove old user prototype
2016-12-21 18:06:05 +01:00
046220f239
Add info boxes for the different categories
2016-12-21 11:46:49 +01:00
403ba53980
Fix typo error
2016-12-21 10:22:48 +01:00
e9418af88b
Add an info box in the file manager
2016-12-20 18:59:50 +01:00
c359c27997
Use user object as default store in file manager
2016-12-20 17:27:45 +01:00
4aed585574
Fix style issues in the toolbar
2016-12-20 14:40:00 +01:00
f9db7e588e
Fix unused backup in localStorage
2016-12-20 14:37:29 +01:00
c7e63f63fd
Use the user object in file manager if it exists
2016-12-20 11:30:04 +01:00
6778a7062d
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into staging
2016-12-20 11:23:54 +01:00
bd6992da0a
create a random hash
2016-12-20 11:13:15 +01:00
2cd50498c2
add log(in|out) functions to common
2016-12-20 11:11:40 +01:00
dfea802c77
better crypto hygeine, start thinking more about ui
2016-12-20 11:09:41 +01:00
e3f484d876
File manager in the home page, lint
2016-12-19 17:53:03 +01:00
7df460c766
implement createChannelId api
2016-12-19 14:55:39 +01:00
3698fe8b0e
Merge branch 'soon' into login
2016-12-19 12:51:57 +01:00
5a14db9f07
Merge branch 'test-filemanager' into login
2016-12-19 12:37:28 +01:00
dd46b9425a
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-19 12:37:02 +01:00
4646d5c866
Add suport for read-only mode in the file manager
2016-12-19 12:35:13 +01:00
2a624a0b60
add example usage for cryptget.js
2016-12-19 12:25:36 +01:00
303953a431
Merge branch 'soon' into login
2016-12-19 11:04:46 +01:00
6b9529b121
implement ajax-like functionality for zk docs
2016-12-19 10:59:18 +01:00
5bc7766f44
Use a consistent toolbar across all apps
2016-12-16 18:35:49 +01:00
8a7fda6341
Merge branch 'soon' into login
2016-12-16 18:10:35 +01:00
a220742f68
fix reversed color settings
2016-12-16 15:31:22 +01:00
308db7fa79
fix uncolored /pad/ content in IE
2016-12-16 15:25:06 +01:00
67baf30d65
basic outline of logins
2016-12-16 15:19:17 +01:00
2968488278
convert uint8 arrays to hex
2016-12-16 15:18:06 +01:00
d95a3ac92e
Fix an issue when deleting a key from the proxy
2016-12-16 11:41:45 +01:00
82f3d5f852
Open the file manager of someone else
2016-12-13 18:59:04 +01:00
c0d96fb10d
Merge branch 'login' into test-filemanager
2016-12-13 11:21:18 +01:00
c3e3aa69c3
Merge branch 'fileManager' into fmIndex
2016-12-12 18:27:19 +01:00
5d335ba796
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-12 18:25:07 +01:00
8e6830d080
Fix file manager with a chosen hash
2016-12-12 18:24:45 +01:00
2b077a8e95
add the file manager in the main page
2016-12-12 18:03:06 +01:00
f36d15d0db
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into test-filemanager
2016-12-12 18:03:00 +01:00
b7f2ef97c7
Merge branch 'fileManager' of github.com:xwiki-labs/cryptpad into fileManager
2016-12-12 12:05:31 +01:00
fdb5c2ddb5
Fix UI issues with rename and delete actions
2016-12-12 12:03:54 +01:00
319ce5d8c8
Fix the code app
2016-12-12 10:35:28 +01:00
ee56f5608f
Fix the infinite spinner bug with the file manager store
2016-12-08 18:52:36 +01:00
43ccd11adc
Merge branch 'infiniteSpinner' into fileManagerMerge
2016-12-08 16:03:18 +01:00
05fd6c1563
Fix the infinite spinner problem
2016-12-08 16:01:46 +01:00
5cd7d8ec84
Fix undefined userid in new poll
2016-12-08 10:19:23 +01:00
cb43eb9ca1
Merge branch 'newpoll' into fileManagerMerge
2016-12-07 16:59:43 +01:00
9b3719e0ae
Merge branch 'soon' into fileManagerMerge
2016-12-07 16:59:32 +01:00
b7b4a034a3
Merge branch 'soon' into newpoll
2016-12-07 16:58:28 +01:00
ddc99cecb1
Fix lint errors
2016-12-07 12:22:27 +01:00
f26cdb1a21
Fix UI issues, unclickable user column, add confirm dialog
2016-12-07 11:44:09 +01:00
6feb8548b3
Prevent the proxy handlers from being called on the parents
2016-12-07 11:12:35 +01:00
740b6e955e
Improve UI, fix issues with the table
2016-12-06 18:55:10 +01:00
94fbc2dca4
prototype cryptographic login
2016-12-06 17:34:24 +01:00
a23b3d3517
use new ot in code too
2016-12-06 16:22:58 +01:00
de0863e232
use new ot
2016-12-06 16:22:42 +01:00
4cd9bd5534
strip listeners
2016-12-06 16:21:11 +01:00
b79618c94a
don't allow listeners in /slide/
2016-12-06 16:00:38 +01:00
ebff304602
turn off some unwanted behaviour
2016-12-06 15:16:43 +01:00
6dff82ede2
Improve UI, scrollbar in the table, publish/admin buttons
2016-12-05 18:54:46 +01:00
90804ed9e0
Add usernames/userlist in the toolbar and fix publish button
2016-12-01 18:40:09 +01:00
3632834500
Lock inputs when the user is not editing them
2016-11-30 18:39:19 +01:00
eaeaf4df40
Improve UI, add title input and forget button
2016-11-29 18:57:31 +01:00
bca746bbb5
Fix uncommitted column, add toolbar
2016-11-28 18:38:06 +01:00
ffedcb63f7
Display own column at the beginning, add uncommitted column
2016-11-25 18:17:03 +01:00
4a4d4a0474
most recent work
2016-11-25 12:02:58 +01:00
e5ff7020fb
move buttons out of form
2016-11-25 12:02:37 +01:00
c88fa34558
Improve UI, fix issues with new file manager channels
2016-11-24 18:58:29 +01:00
5a5451d94c
Sort elements in the trash, add properties in the context menu, fix issue with Edge
2016-11-23 18:21:45 +01:00
19e4a2d044
Create new files, sort displayed elements
2016-11-22 18:31:49 +01:00
a957b72598
Create a new pad from the file manager
2016-11-21 18:49:13 +01:00
4fcdece4af
Test create new pad from the file manager
2016-11-18 17:42:07 +01:00
d6e1215166
Refresh the directory if needed when the object has changed
2016-11-18 17:17:48 +01:00
118829617f
Use the FS store as default store
2016-11-17 18:27:55 +01:00
aa14ea7ac4
Use the old store format
2016-11-16 18:11:44 +01:00
da19608269
Translate the context menus, Shift+Del shortcut and realtime object
2016-11-16 17:11:48 +01:00
7a035fa4a0
Fix drag and drop with multiple elements selected
2016-11-15 18:15:54 +01:00
d77970975c
Add translations, ability to select multiple elements, clean the code
2016-11-14 18:41:42 +01:00
eb50177201
do a bit of work to preserve cursors
2016-11-14 18:03:17 +01:00
ac43f4cb1f
new prototype poll
2016-11-14 15:56:49 +01:00
f05efbb113
Clean the code
2016-11-14 11:06:00 +01:00
851d3df656
Ability to see, move and delete unsorted files
2016-11-10 18:33:44 +01:00
43d93938c3
Fix the list, find the unsorted files, ability to add a folder
2016-11-09 18:25:08 +01:00
cfe3d38197
Add expend/collapse to the tree, fix CSS, add list/grid view modes
2016-11-08 18:53:47 +01:00
c9cd06514c
Add "restore" from trash, improve drag and drop and update css
2016-11-07 18:50:42 +01:00
4c5cb79c20
Merge pull request #58 from xwiki-labs/replaceState
...
use replaceState if available
2016-11-07 15:08:49 +01:00
c2770a7a74
set correct hash even if browser does not implement replaceState
2016-11-07 15:03:17 +01:00
d009b7400c
fall back to default title if one is not suggested
2016-11-07 12:29:57 +01:00
e77ad4e909
better fixes for export
2016-11-07 12:26:48 +01:00
75dd4a5926
slightly better test for variable
2016-11-07 12:11:01 +01:00
b7d9998b9b
fix reference to undefined variable
2016-11-07 12:10:00 +01:00
303c65f2c3
use replaceState if available, instead of setting the hash
2016-11-07 11:20:30 +01:00
8e1bff706b
Add drag and drop, rename and delete actions
2016-11-04 18:52:26 +01:00
67bf41627d
comment out dead code so CI doesn't complain
2016-11-04 17:09:13 +01:00
002e22ee9a
turn off unwanted behaviour until we can do it correctly
2016-11-04 16:17:59 +01:00
5fc44a6e4b
Merge branch 'soon' into fixpolls
2016-11-04 14:23:07 +01:00
ce9eb47351
Initial state of the file manager app
2016-11-03 18:51:30 +01:00
2d5448458b
export messages
2016-11-03 12:45:11 +01:00
b1370c05b7
add translation completeness test to assertion page
2016-11-03 12:44:12 +01:00
5f6ebb5cc1
fix incorrect regex for c-like title detection
2016-11-03 11:30:46 +01:00
d512b113cd
address failure to parse url when hash is not present
2016-11-02 18:28:19 +01:00
6ae851ffdd
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging-soon
2016-11-02 13:01:40 +01:00
636b0fcadc
do our best to keep the console quiet
2016-11-02 12:09:41 +01:00
3de4e5709b
Clean the code
2016-10-26 17:50:59 +02:00
ab1d3958ce
Add a pencil icon when hovering the title
2016-10-26 17:49:16 +02:00
6d1e06cca3
Add notifications when a user joins or leaves the channel
2016-10-26 15:02:30 +02:00
54a63267cd
Add a share button and merge the viewers and editors buttons
2016-10-25 18:34:23 +02:00
87d86384ac
Fix broken elements in the new toolbar
2016-10-25 17:29:13 +02:00
6351d1856f
Remove the top bar and move its content in the applications' toolbars
2016-10-25 15:22:35 +02:00
3d74290c7d
Merge branch 'usability5' into staging
2016-10-24 18:33:10 +02:00
9e92a597b3
Ability to edit the title in the toolbar by clicking it
2016-10-24 18:32:43 +02:00
0a9d34a6c9
hide appended color pickers
2016-10-24 15:30:23 +02:00
c858b247c1
filter absent users from the userlist
2016-10-24 15:11:19 +02:00
ac3ddbab70
expose userList for later usage
2016-10-24 15:10:49 +02:00
a8612ed1c7
Merge branch 'usability5' of github.com:xwiki-labs/cryptpad into staging
2016-10-24 14:54:35 +02:00
10bb5e1607
Add the title in the toolbar
2016-10-21 18:16:27 +02:00
1e003b13a8
ask anonymous, first-time users to set their name when they first join a pad
2016-10-21 15:17:15 +02:00
5d9b81ab2f
Merge pull request #53 from xwiki-labs/update
...
minor fixes to html and userlist
2016-10-20 11:54:29 +02:00
46c5f64369
remove absent users from the userlist
2016-10-19 12:30:25 +02:00
51a79c5218
Remove unused dependency
2016-10-18 13:38:48 +02:00
9a733bb360
Fix dropdown menus with Edge
2016-10-13 15:00:53 +02:00
39bbf8a6c1
Fix the new userlist button and make the toolbar responsive
2016-10-13 14:24:59 +02:00
24fbe22c9d
Improve the toolbar style and the way the userlist is displayed
2016-10-12 18:40:26 +02:00
d2389a5729
Change the userlist in the toolbar
2016-10-11 18:39:43 +02:00
e739c49e7f
Remove the 'about' button in ckeditor
2016-10-11 11:57:07 +02:00
b23fe783e3
Fix the color picker in Chrome and hide the buttons when not supported
2016-10-10 18:21:18 +02:00
91b4446c0b
Merge branch 'fix-chrome-style-bug' into soon
2016-10-10 17:07:50 +02:00
53fe002d3b
Merge branch 'slide' into soon
2016-10-10 17:06:39 +02:00
6c04b7967d
Remove unused library
2016-10-10 17:03:25 +02:00
d63c912af0
Use the HTML5 color picker to change the colors in slides
2016-10-10 17:01:04 +02:00
bb2317d8e6
fix chrome style bug by forcing reload of style sheet
2016-10-07 17:41:52 +02:00
765498e88e
Remove the support for old.cryptpad.fr
2016-10-07 10:39:48 +02:00
d7e170c797
Test colorpicker
2016-10-07 10:31:36 +02:00
81fce1237f
Colorpicker to choose the background color in present mode
2016-10-06 18:04:35 +02:00
5300bc363c
Fix a race condition in the slide application
2016-10-05 18:26:32 +02:00
c322aa440e
Fix the username icon hcih was not working anymore
2016-10-05 18:19:52 +02:00
8575f3f79f
Fix the "rename" feature which was not working anymore in some cases
2016-10-05 17:22:56 +02:00
a989b51d74
Fix race conditions with Alertify
2016-10-05 16:04:21 +02:00
74df38f94f
Fix race conditions that could prevent applications from being loaded
2016-10-05 11:19:18 +02:00
a28daf2715
use websocket url configuration api
2016-10-04 17:13:15 +02:00
dbc8f01b8b
fix merge errors and reach full jshint compliance
2016-10-04 16:58:10 +02:00
a30e17121d
Merge branch 'readonlyButton' into soon
2016-10-04 15:48:52 +02:00
e84a54556c
Move the toolbar buttons' events handlers in cryptpad-common
2016-10-04 15:44:12 +02:00
2ac1b02572
Merge branch 'config-sockets' into soon
2016-10-04 14:38:50 +02:00
11f63c861c
Merge branch 'titles' of github.com:xwiki-labs/cryptpad into title
2016-10-04 11:23:04 +02:00
5e76194262
use new config api
2016-10-03 19:28:36 +02:00
3dfa19b786
more flexible websocket configuration (WIP)
2016-10-03 19:19:38 +02:00
76fdadee7f
Store only the strongest hash in the localstorage
2016-10-03 18:23:59 +02:00
1c808b3da8
Add comment for the 'important' css rule
2016-10-03 16:09:59 +02:00
17b4f91810
Do not share the title in the doc if it is the default title
2016-10-03 16:05:39 +02:00
391728ee6d
Use CodeMirror in /slide #2
...
Fix title errors in the slide app caused by the present mode
2016-10-03 14:21:39 +02:00
8c33218ceb
Move the codemirror themes in /common
2016-10-03 14:19:37 +02:00
2609af2105
Use the CodeMirror editor in the slide application
2016-09-30 17:39:16 +02:00
b5b0eacebc
Remove the old (non-bower) codemirror
2016-09-29 16:24:26 +02:00
261d2fecbc
Get codemirror from bower and use that version in the code app
2016-09-29 16:23:27 +02:00
bc73fa2074
Merge branch 'fontawesome' into soon
2016-09-29 14:52:48 +02:00
f03018f3bc
Improve the top bar and use the font awesome icons in /code
2016-09-28 15:28:25 +02:00
0be8c333e0
Merge branch 'fontawesome' of github.com:xwiki-labs/cryptpad into fontawesome
2016-09-28 09:01:33 +02:00
3d54413343
Improve the UI with FontAwesome icons
2016-09-27 18:33:03 +02:00
a266f0bee1
query parameter for messages
2016-09-27 11:01:32 +02:00
c16e8d603b
Enable reconnecting websocket in code pad
2016-09-26 16:06:23 +02:00
d6525087c7
jshint compliancy
2016-09-23 17:53:24 +02:00
ed9acf1c00
Merge branch 'rememberName' of github.com:xwiki-labs/cryptpad into rememberName
2016-09-23 16:40:07 +02:00
a4843cb5d7
Merge branch 'newhashNoConflict' of github.com:xwiki-labs/cryptpad into newhashNoConflict
2016-09-23 16:07:46 +02:00
a82b7aaf8b
allow empty names
2016-09-23 16:06:46 +02:00
2267ec8c43
Slides in read-only were not updated with the latest content
2016-09-23 15:12:17 +02:00
eac0cdd6dd
Enable read-only mode in slides
2016-09-23 12:26:06 +02:00
d46bd1af5c
Improve the toolbar UI with the username displayed
2016-09-22 17:56:51 +02:00
79884e2400
Use the same username for all pads
2016-09-22 17:12:46 +02:00
73d5ea967b
Fix an error created by the merge
2016-09-22 16:34:06 +02:00
dde519795d
Merge branch 'newhash' into newhashNoConflict
2016-09-22 16:14:48 +02:00
99004428d5
Enable the read-only mode in Cryptpoll
2016-09-22 16:09:20 +02:00
47e8be1681
Remove the IMPORT button and editor toolbars in read-only mode
2016-09-21 15:03:36 +02:00
f29e3d7b0d
don't let notifications interfere with document titles
2016-09-21 14:34:56 +02:00
a9e2ca8d72
make tests green again
2016-09-20 23:31:29 +02:00
83705ae058
Improve the UI in read-only mode
2016-09-20 18:22:40 +02:00
e6785b4dad
push /pad/ state once ready to avoid OT collision
2016-09-20 16:35:55 +02:00
723df4880e
Merge branch 'slides' into merge-slides
2016-09-20 16:28:36 +02:00
b96f050555
Merge branch 'board' into merge-boards
2016-09-20 16:26:31 +02:00
fa8199bc75
don't try to use experimental user code
2016-09-20 16:22:00 +02:00
2d42cadb23
push /code/ state once ready to avoid OT collision
2016-09-20 15:14:53 +02:00
bf5dac58dd
Merge branch 'titleUserDoc' of github.com:xwiki-labs/cryptpad into titleUserDoc
2016-09-20 14:13:35 +02:00
bf8c9a2c4b
Add a button to get the read only URL
2016-09-20 11:35:57 +02:00
99b50465c7
Add the read-only mode for /pad and /code
2016-09-19 17:52:37 +02:00
42f14873cd
Merge branch 'translations' into newhashmerge
2016-09-19 14:53:40 +02:00
391b7690e6
Set the pad to readonly mode when using a 'view' url
2016-09-19 14:52:36 +02:00
368e253c9f
Ability to send a read-only URL
2016-09-16 18:45:40 +02:00
6363d3fb90
Pad titles are now shared with the userdoc
2016-09-16 12:49:47 +02:00
5c63585952
Complete the French translation
2016-09-15 18:35:09 +02:00
0d9f63b977
Merge branch 'translations' - part one
2016-09-15 10:36:05 +02:00
f086492e50
Improve the localization system
...
Improve and enable the French translation
2016-09-14 18:08:52 +02:00
cc4bca8004
execute callbacks on presentation events
2016-09-14 16:03:52 +02:00
8bf79ef915
serialize slide pads as a sorted object
2016-09-14 16:02:57 +02:00
997b46a3f7
limit the size of rendered images
2016-09-14 16:02:20 +02:00
25c8d16bf5
Use a new version-prefixed hash parser
2016-09-13 17:43:56 +02:00
c35c7cda20
hide wizard after computing results
2016-09-13 16:02:38 +02:00
0dae949c4f
fix scrolljank bug
2016-09-13 15:34:10 +02:00
c736caceba
Use a better default pad title
2016-09-13 12:24:06 +02:00
97415d8158
Merge branch 'users'
2016-09-01 17:38:25 +02:00
122a9fe068
realtime kanban board
2016-09-01 16:23:40 +02:00
4561ddcdf3
add missing semicolon
2016-09-01 16:13:25 +02:00
8031770f90
rename "module" to "APP" in /slide/ for jshint
2016-09-01 16:12:22 +02:00
8e86be81b2
Merge branch 'better-slides'
2016-09-01 16:01:21 +02:00
fb21b4e46b
fix up /render/
2016-09-01 15:54:21 +02:00
4941c1493e
better user integration. a few more common utils
2016-09-01 12:15:30 +02:00
2f2aeef0e5
add missing semicolon
2016-09-01 12:06:21 +02:00
8a659cf887
maintain aspect ratio for slides
...
display index and slide count in title
2016-09-01 12:03:09 +02:00
30ea1b59b7
integrate users into common utilities
2016-08-30 18:09:53 +02:00
6d775f61c6
add missing functions
2016-08-30 10:06:14 +02:00
168338b898
add missing functions
2016-08-29 18:10:15 +02:00
7c5ee53e81
resolve conflict and merge
2016-08-25 18:01:03 +02:00
f47a6f1cbb
Merge branch 'master' of github.com:xwiki-labs/cryptpad
2016-08-25 17:59:37 +02:00
f40b798d88
Merge pull request #30 from xwiki-labs/reconnect
...
Ability to reconnect after a connection failure
2016-08-25 17:57:45 +02:00
c168ce2d1c
Ability to reconnect after a connection failure
2016-08-25 17:56:17 +02:00
e386749e89
unlock the editor after your name has been set (or not)
2016-08-25 11:36:20 +02:00
aa91ebd24e
don't initialize until the store is ready
2016-08-25 11:23:51 +02:00
93f5a3d3e9
use more bits from the users' seed and parse into various subkeys
2016-08-25 11:23:11 +02:00
1bec02239c
coerce dates into strings
2016-08-25 11:19:09 +02:00
0add01a940
remove dead code
2016-08-25 11:08:15 +02:00
dcebb9597f
prototype of password based key derivation
2016-08-22 11:43:41 +02:00
848f16e8f5
unused function which computes values for the table
2016-08-22 11:41:23 +02:00
18ea61dc9a
use diffdom for sanitation and better redraws
2016-08-19 15:43:14 +02:00
c62d064ee9
add a 'share' button which copies the url to the clipboard
2016-08-19 13:33:14 +02:00
b229a18ccf
notify users of changes if the visibility api is supported
2016-08-19 12:14:59 +02:00
d64e06c12e
don't make empty options
2016-08-19 12:14:20 +02:00
a3f6fe8843
lock options by default
...
add edit button for modifying options
fix bug where committing didn't clear the active column
minor style fixes
2016-08-19 11:26:48 +02:00
8c914dfe1f
better filenames
2016-08-19 10:47:07 +02:00
f1619f4a0f
get /slide/ up to par with other prototypes
...
* use messages.js for some translatable elements
* style alerts
* infer document name from content
* present, forget, rename, import, and export buttons
2016-08-19 10:44:49 +02:00
269eba3c47
remove commit button if a user is removed
2016-08-18 18:31:01 +02:00
f8f66800d1
display a 'commit' button which locks your column
2016-08-18 17:54:17 +02:00
85540bad12
leave all columns locked unless you've visited before
2016-08-18 16:13:03 +02:00
d679cac666
fewer log statements for the console
2016-08-18 15:27:55 +02:00
55b1a17b0d
off by one error
2016-08-18 15:26:00 +02:00
235c0482f9
increase clickable area around editable columns' checkboxes
2016-08-18 13:25:21 +02:00
c76aaac542
don't make columns with empty names
2016-08-18 12:41:49 +02:00
d85684ef74
usability improvements
...
only one column is editable at a time
editable columns have a different appearance from locked columns
any column can be edited by anyone via an edit button
columns and rows require confirmation before deletion
2016-08-18 12:06:13 +02:00
76bfb6ab35
detect whether you are new to a page
...
prompt for your name and create a column for your username
prompt before deleting columns as well
style a few elements differently
2016-08-17 18:38:27 +02:00
e2b162bf6d
snapshot some dead code
2016-08-17 15:29:04 +02:00
55666e9f70
remember presentations, and label them correctly on the home page
2016-08-17 15:03:57 +02:00
5a3da11c40
very simple presentation with markdown
2016-08-17 11:28:50 +02:00
7eaa4ce733
recognize pads with the same type and hash as identical no matter their domain
2016-08-05 17:17:49 +02:00
da6e5d73d0
fix undefined reference
2016-08-05 15:55:00 +02:00
043041523f
on import, fall back to setting language from file extension
2016-08-05 15:48:30 +02:00
deb63d2447
share syntax highlighting selection with peers
2016-08-05 15:03:42 +02:00
2d5caf38d9
show a spinner until the document has loaded
2016-08-04 17:00:30 +02:00
fd0a7337a3
wait a full minute until requirejs times out
2016-08-04 12:44:27 +02:00
975bff5794
show a spinner until the document has loaded
2016-08-04 12:43:06 +02:00
a58f58535b
better regex for pulling titles out of c-like comments
2016-08-03 17:11:41 +02:00
5131f47cca
jshint compliance
2016-08-03 17:03:50 +02:00
306d524416
fix broken removal call
2016-08-03 16:53:41 +02:00
dd3a5d47be
migrate localStorage so people go to cryptpad.fr
2016-08-03 11:08:45 +02:00
a094e3c02e
use correct store api calls in frame.js
...
also don't log unnecessarily
2016-08-03 11:02:40 +02:00
dcc9810a42
avoid extra call to store if there are no keys to remove
2016-08-03 09:42:49 +02:00
9a5294016d
fix incorrect usage of store api
2016-08-03 09:35:16 +02:00
4e5f381325
add spinner to API. update bower deps
2016-08-02 18:56:35 +02:00
01d9923e15
export Cryptpad at window level
2016-08-02 18:55:45 +02:00
fa654a7646
slightly better regex
2016-08-02 17:08:46 +02:00
254d800a3b
add a /p/ route so that we don't break old urls
2016-08-02 15:26:13 +02:00
cd18075ac7
add some redirection logic to support old hash types
2016-08-02 15:17:20 +02:00
600f3151e9
don't use the store until it's ready to be used
2016-08-02 12:11:40 +02:00
fffa9acf15
remove unused files from fs and jshintignore
2016-08-02 11:59:54 +02:00
yflory