yflory
|
0bd4caeb7e
|
Add the task list code to the markdown renderer
|
2017-05-18 14:57:04 +02:00 |
|
ansuz
|
d187945e94
|
jshint compliance
|
2017-05-18 14:55:16 +02:00 |
|
ansuz
|
3ba94a1ba2
|
correctly set release version number
|
2017-05-18 14:54:02 +02:00 |
|
yflory
|
2b60b81a68
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 14:27:10 +02:00 |
|
yflory
|
d13dde856a
|
Add the markdown renderer file and change code's default content
|
2017-05-18 14:26:56 +02:00 |
|
ansuz
|
4debec39bb
|
update footer with next release codename and corrected matrix link
|
2017-05-18 12:58:49 +02:00 |
|
ansuz
|
73ec91aa5e
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-18 12:46:36 +02:00 |
|
ansuz
|
80479fdc90
|
use rpc calls from cryptpad common
|
2017-05-18 12:44:16 +02:00 |
|
ansuz
|
7befaccd88
|
move more rpc calls into pinpad
|
2017-05-18 12:36:12 +02:00 |
|
yflory
|
56bcdff890
|
Add a preview of the markdown content in the code editor
|
2017-05-18 12:16:26 +02:00 |
|
yflory
|
b72415b56b
|
Fix old hashes not working with the new parser
|
2017-05-18 10:13:08 +02:00 |
|
yflory
|
6b7aeb9121
|
Fix the text example
|
2017-05-17 15:48:09 +02:00 |
|
yflory
|
fe0f21594a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-16 14:41:51 +02:00 |
|
yflory
|
953e7155f0
|
Send only the hostname to the accounts server
|
2017-05-16 14:41:40 +02:00 |
|
ansuz
|
afef456b18
|
fix undefined reference
|
2017-05-16 14:15:42 +02:00 |
|
ansuz
|
8fe0282b7b
|
jshint compliance
|
2017-05-16 14:14:30 +02:00 |
|
ansuz
|
827233dcba
|
new translation keys for file upload
|
2017-05-16 14:01:06 +02:00 |
|
yflory
|
834830fc4f
|
Fix the Ctrl key + click to select multiple files
|
2017-05-16 11:26:04 +02:00 |
|
yflory
|
1a7c4d5ebe
|
Store the FS_hash in the user object after the merge
|
2017-05-16 11:25:37 +02:00 |
|
yflory
|
87fa28180a
|
Display an upgrade button in the settings page
|
2017-05-16 10:34:50 +02:00 |
|
yflory
|
c1b43db363
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 18:21:25 +02:00 |
|
yflory
|
7ee6864ea4
|
Add the user menu in the login and register pages
|
2017-05-15 18:21:11 +02:00 |
|
ansuz
|
1542aa96bc
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 18:17:56 +02:00 |
|
yflory
|
dc2cdb7c08
|
Add the usage bar in the settings page
|
2017-05-15 18:16:22 +02:00 |
|
ansuz
|
cc893723de
|
add some TODOs, log uploaded content so we know it's working
|
2017-05-15 18:10:22 +02:00 |
|
ansuz
|
2dd04f7631
|
get limits from the server
|
2017-05-15 18:03:12 +02:00 |
|
yflory
|
716245f864
|
Make all the buttons look the same
|
2017-05-15 16:16:50 +02:00 |
|
yflory
|
0f37d9def7
|
Change the button font size in the toolbar
|
2017-05-15 14:53:51 +02:00 |
|
yflory
|
48496416e7
|
Use the same font-size for all the toolbar buttons
|
2017-05-15 14:46:17 +02:00 |
|
yflory
|
8172f117a7
|
Fix Hash.alert not a function
|
2017-05-15 14:21:15 +02:00 |
|
yflory
|
0e58859393
|
Fix lint error
|
2017-05-15 13:55:40 +02:00 |
|
yflory
|
771348720b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-15 13:54:25 +02:00 |
|
yflory
|
03274c3776
|
Display an info message in the anonymous drive
|
2017-05-15 13:54:03 +02:00 |
|
yflory
|
57979f6314
|
Display the public key using a href in the settings page
|
2017-05-15 13:53:43 +02:00 |
|
ansuz
|
a9b670fdf5
|
don't parse trailing slash as part of encryption key in old hashes
|
2017-05-15 11:17:46 +02:00 |
|
ansuz
|
9bbd3161ca
|
update tests for new API changes
|
2017-05-15 11:11:12 +02:00 |
|
ansuz
|
06f3d0eefe
|
shim isArray if not exists. correctly report how often this occurs
|
2017-05-15 10:26:52 +02:00 |
|
yflory
|
50d9f72b3a
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-12 18:06:37 +02:00 |
|
yflory
|
601226115b
|
New anonymous drive
|
2017-05-12 18:06:29 +02:00 |
|
ansuz
|
30f6ef3f85
|
handle more response codes, use metadata
|
2017-05-12 17:34:29 +02:00 |
|
ansuz
|
18d959ef16
|
handle non-200 status codes
|
2017-05-12 17:07:30 +02:00 |
|
yflory
|
ed95bbb08f
|
Fix lint errors
|
2017-05-12 16:43:01 +02:00 |
|
yflory
|
89a993be3c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-12 16:33:56 +02:00 |
|
yflory
|
0f13198119
|
Move the parseHash code into parsePadUrl
|
2017-05-12 16:33:45 +02:00 |
|
ansuz
|
4c4c21342d
|
don't try to decrypt nothing
|
2017-05-12 16:26:51 +02:00 |
|
ansuz
|
69e933dd17
|
better error handling in file download
|
2017-05-12 16:17:10 +02:00 |
|
ansuz
|
42f3a62cac
|
handle errors with XHR
|
2017-05-12 16:13:09 +02:00 |
|
ansuz
|
213708d8dc
|
center media tags
|
2017-05-12 15:43:32 +02:00 |
|
ansuz
|
6c68b5e6ca
|
use new media-tag, listen for decryption events
|
2017-05-12 15:42:01 +02:00 |
|
ansuz
|
7dd5907ff0
|
Merge branch 'limit' into staging
|
2017-05-12 14:21:46 +02:00 |
|
ansuz
|
22efde87d5
|
correctly estimate upload size
|
2017-05-12 12:12:51 +02:00 |
|
ansuz
|
a993ab6616
|
use new encrypted file encoding in media-tag
|
2017-05-12 11:25:07 +02:00 |
|
ansuz
|
8c49150725
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-12 10:54:32 +02:00 |
|
yflory
|
e0293a1162
|
Merge branch 'master' into staging
|
2017-05-11 18:26:09 +02:00 |
|
yflory
|
57ee7de7d4
|
Update and return the storage limit
|
2017-05-11 16:12:44 +02:00 |
|
yflory
|
d3854b9774
|
Fix selection issues in the drive with Chrome
|
2017-05-11 14:31:15 +02:00 |
|
yflory
|
371edff943
|
Fix an error when moving unsorted files to root in the drive
|
2017-05-11 14:24:16 +02:00 |
|
yflory
|
b76dcba1d6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-11 12:43:49 +02:00 |
|
yflory
|
733c3abefa
|
Update the upgrade button in the drive
|
2017-05-11 12:43:32 +02:00 |
|
yflory
|
becba33b05
|
Scroll to the selected element in the drive
|
2017-05-11 12:11:45 +02:00 |
|
yflory
|
419fb15425
|
Remember the scroll position in the drive tree
|
2017-05-11 11:20:18 +02:00 |
|
yflory
|
5d0535966c
|
Center vertically slides in present mode and checkbox to disable transitions
|
2017-05-11 10:58:33 +02:00 |
|
ansuz
|
5d37a50a87
|
try to estimate upload size
|
2017-05-10 18:57:25 +02:00 |
|
ansuz
|
6d30d7f89f
|
strip junk bytes from base64 more safely
|
2017-05-10 18:15:33 +02:00 |
|
ansuz
|
1525712deb
|
new encrypted file format
|
2017-05-10 17:13:26 +02:00 |
|
ansuz
|
8f5989b6b0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-10 17:05:13 +02:00 |
|
yflory
|
cf81b02096
|
Make sure the spinner is always centered in the loading screen
|
2017-05-10 16:11:41 +02:00 |
|
yflory
|
5a21be8112
|
Improve UI on mobile
|
2017-05-10 15:54:09 +02:00 |
|
ansuz
|
5aba2d4640
|
remove unused variable
|
2017-05-10 15:36:34 +02:00 |
|
yflory
|
5c8586f8a3
|
Fix typo in file upload
|
2017-05-10 15:00:05 +02:00 |
|
yflory
|
1e4fc5a979
|
lint
|
2017-05-10 14:56:50 +02:00 |
|
yflory
|
3c4b6a89d2
|
Fix a conflict with the arrow keys and renaming a folder in the tree
|
2017-05-10 14:48:15 +02:00 |
|
yflory
|
96ccb94397
|
Add the share button when a file upload is complete
|
2017-05-10 14:44:01 +02:00 |
|
yflory
|
c00158d23a
|
Move code to common-history
|
2017-05-10 13:39:14 +02:00 |
|
ansuz
|
97a28d3938
|
test file encryption/decryption
|
2017-05-10 11:56:10 +02:00 |
|
ansuz
|
6a1c799a6e
|
support async tests
|
2017-05-10 11:54:21 +02:00 |
|
ansuz
|
922e7803e9
|
remove extraneous slashes from hashes when parsing
|
2017-05-10 11:54:05 +02:00 |
|
yflory
|
0f8ef2f516
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-10 11:45:25 +02:00 |
|
yflory
|
6a8153aca3
|
Fix selection issues in the drive with Chrome
|
2017-05-10 11:44:58 +02:00 |
|
yflory
|
a6c49cd65c
|
Fix undefined title in slides present mode
|
2017-05-10 10:49:59 +02:00 |
|
ansuz
|
299a53ded7
|
prefer to use functions from common
|
2017-05-09 18:54:56 +02:00 |
|
ansuz
|
a338b23f40
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-09 18:36:27 +02:00 |
|
ansuz
|
df47b913e3
|
fetch array buffers in cryptpad-common
|
2017-05-09 18:36:18 +02:00 |
|
yflory
|
ff16084719
|
Fix lint errors
|
2017-05-09 18:10:02 +02:00 |
|
yflory
|
50c8a859e6
|
Move the CodeMirror cursor code to common-codemirror
|
2017-05-09 17:57:27 +02:00 |
|
yflory
|
9eb8e55cf6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-09 17:48:07 +02:00 |
|
yflory
|
c79a6e3b2b
|
Move Metadata, CodeMirror and title functions in separate files
|
2017-05-09 17:47:47 +02:00 |
|
ansuz
|
56a871cb67
|
Merge branch 'soon' into staging
|
2017-05-09 16:50:54 +02:00 |
|
ansuz
|
521f99a3d6
|
support drag and drop for file upload
|
2017-05-09 16:50:25 +02:00 |
|
ansuz
|
b4973b7610
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-05-09 15:11:38 +02:00 |
|
ansuz
|
ae7d65c3fa
|
fix drag to select in chrome
|
2017-05-09 15:11:27 +02:00 |
|
yflory
|
63710e1ccc
|
Move the code related to the title in another file
|
2017-05-09 14:32:41 +02:00 |
|
yflory
|
48898c97e5
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-05-09 14:31:42 +02:00 |
|
yflory
|
ce5cdce917
|
Fix an issue where the username was lost on websocket reconnect
|
2017-05-09 14:31:28 +02:00 |
|
ansuz
|
1d4d4cffdb
|
correct some copypasted code
|
2017-05-09 14:26:17 +02:00 |
|
ansuz
|
2b4f503aff
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
2017-05-09 11:55:31 +02:00 |
|
ansuz
|
4a104052b4
|
handle errors in file
|
2017-05-09 11:55:25 +02:00 |
|
yflory
|
b818fd8a37
|
Fix 'undefined' error with the context menu
|
2017-05-09 11:20:06 +02:00 |
|
yflory
|
c34c1cb07c
|
Press enter to open a folder
|
2017-05-09 11:03:47 +02:00 |
|
ansuz
|
7da01d0862
|
unlist removed examples
|
2017-05-09 08:08:00 +02:00 |
|
ansuz
|
ea3dc8a852
|
remove file upload test
|
2017-05-09 08:05:20 +02:00 |
|
ansuz
|
42dcfb9661
|
unceremoniously kick web clients when you 'log out everywhere'
|
2017-05-05 18:25:55 +02:00 |
|
yflory
|
1547063b7f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-05 18:13:31 +02:00 |
|
yflory
|
a20a319a7a
|
Fix focus issues in the CryptDrive search bar
|
2017-05-05 18:13:14 +02:00 |
|
ansuz
|
36ab38f3ac
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-05 17:58:33 +02:00 |
|
yflory
|
9206d89531
|
Fix lint errors
|
2017-05-05 17:58:32 +02:00 |
|
yflory
|
bbc08bbcfd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-05 17:57:05 +02:00 |
|
yflory
|
5a883d5a57
|
Use the new toolbar and move the userlist code in a separate file
|
2017-05-05 17:56:49 +02:00 |
|
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
2017-05-05 15:47:46 +02:00 |
|
ansuz
|
6471b572eb
|
correct off-by-one
|
2017-05-05 15:40:31 +02:00 |
|
ansuz
|
3a338e0890
|
fix undefined reference
|
2017-05-05 15:20:41 +02:00 |
|
ansuz
|
a173e4c7a0
|
add 'log out everywhere' functionality in settings
|
2017-05-05 15:09:07 +02:00 |
|
yflory
|
5a5b02b82b
|
Don't store in the drive pads without a hash
|
2017-05-05 11:55:19 +02:00 |
|
ansuz
|
c07d3e6162
|
update version strings for upcoming release
|
2017-05-05 11:51:41 +02:00 |
|
ansuz
|
3e118c6a38
|
allow instance-wide custom salt for login
|
2017-05-05 09:10:31 +02:00 |
|
ansuz
|
6a00d11a15
|
fix undefined reference
|
2017-05-04 18:28:52 +02:00 |
|
ansuz
|
c3d1554e8c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 18:25:23 +02:00 |
|
ansuz
|
660cda6573
|
set title when uploading
|
2017-05-04 18:25:06 +02:00 |
|
yflory
|
706120ae5b
|
Display images uploaded in the File app with the Media app
|
2017-05-04 18:24:58 +02:00 |
|
yflory
|
28cb40d7ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 17:14:30 +02:00 |
|
yflory
|
1b6fae4dd2
|
Update mediatag
|
2017-05-04 17:14:24 +02:00 |
|
ansuz
|
a0c420af8e
|
jshint compliance
|
2017-05-04 16:37:25 +02:00 |
|
ansuz
|
1864dac84f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:16:16 +02:00 |
|
ansuz
|
78b11584f8
|
remove unused variables
|
2017-05-04 16:16:09 +02:00 |
|
yflory
|
4335b050af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-04 16:08:21 +02:00 |
|
yflory
|
a190c99426
|
Toolbar refactoring
|
2017-05-04 16:08:12 +02:00 |
|
ansuz
|
5739c3d973
|
blow up if you ever run out of nonce-space
|
2017-05-04 12:20:38 +02:00 |
|
ansuz
|
2232518c64
|
set title after uploading
|
2017-05-04 12:01:37 +02:00 |
|
ansuz
|
f644dc6c0b
|
WIP support encrypted file upload via base64 chunks
|
2017-05-04 11:37:46 +02:00 |
|
ansuz
|
7573b86946
|
call back with error if an RPC is made while disconnected
|
2017-05-04 11:36:24 +02:00 |
|
ansuz
|
410a9dfb17
|
temporary solution for testing pin limits
|
2017-05-04 11:20:52 +02:00 |
|
yflory
|
cd98fc6eab
|
Increase the z-index of the select area in the drive
|
2017-05-03 17:18:10 +02:00 |
|
yflory
|
80115d0071
|
Fix an 'undefined' variable error in the drive
|
2017-05-03 17:17:42 +02:00 |
|
yflory
|
c9d89debba
|
Fix lint errors
|
2017-05-03 16:17:52 +02:00 |
|
yflory
|
79365a7a82
|
Use the shift key to select multiple files in CryptDrive
|
2017-05-03 16:15:37 +02:00 |
|
yflory
|
3262787244
|
Update the icon mode in CryptDrive
|
2017-05-03 14:02:45 +02:00 |
|
yflory
|
d52e9fba43
|
Use the arrow keys to change the selection in the drive
|
2017-05-03 13:20:28 +02:00 |
|
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
2017-05-02 17:14:53 +02:00 |
|
yflory
|
1d3b8188b3
|
Add mobile support in the slide app
|
2017-05-02 14:17:17 +02:00 |
|
yflory
|
d2e46d1378
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-05-02 11:04:14 +02:00 |
|
yflory
|
092b98d235
|
Fix the offset of the drag&select feature in the drive
|
2017-05-02 10:41:31 +02:00 |
|
ansuz
|
f2672d587a
|
fix variable redefinition
|
2017-05-02 09:42:51 +02:00 |
|
ansuz
|
0e7eeb285c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-29 14:24:14 +02:00 |
|
yflory
|
f414d480a9
|
Add the history mode to the CryptDrive
|
2017-04-28 18:23:41 +02:00 |
|
ansuz
|
cf4dee28f7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 17:13:18 +02:00 |
|
ansuz
|
28e4ef1b13
|
WIP RPC code
|
2017-04-28 17:11:50 +02:00 |
|
yflory
|
afb0061d7b
|
Fix an issue with anonymous user unable to store new pads
|
2017-04-28 17:11:07 +02:00 |
|
yflory
|
56aaeea003
|
Fix the drive toolbar not displaying the displayName
|
2017-04-28 17:03:47 +02:00 |
|
yflory
|
538e85c080
|
Fix the context menu in the drive flowing off the screen if too long
|
2017-04-28 16:23:01 +02:00 |
|
ansuz
|
841c9ee9de
|
don't close popup dialog when hitting enter if textarea has focus
|
2017-04-28 16:11:22 +02:00 |
|
ansuz
|
3fa0a73025
|
prevent using string methods on undefined variable
|
2017-04-28 16:09:46 +02:00 |
|
ansuz
|
1b3ce5aa96
|
fix typo
|
2017-04-28 16:08:47 +02:00 |
|
yflory
|
a51a35da70
|
Fix an issue with hashes ending with a slash
|
2017-04-28 15:47:31 +02:00 |
|
yflory
|
d9b5eb8a97
|
Fix an issue with the right click triggering the select area
|
2017-04-28 15:43:05 +02:00 |
|
yflory
|
ef58120819
|
Prevent multiple concurrent clicks to get the history
|
2017-04-28 14:09:59 +02:00 |
|
ansuz
|
38a115d8f8
|
feedback on anonymous drive
|
2017-04-28 14:08:17 +02:00 |
|
yflory
|
16f6ab813c
|
Make it clear that the number is the history represents a version
|
2017-04-28 13:06:55 +02:00 |
|
yflory
|
0ee228666b
|
Replace the IRC link by the Matrix one
|
2017-04-28 12:40:39 +02:00 |
|
yflory
|
c820b3485c
|
Fix function undefined when loading a template
|
2017-04-28 12:16:45 +02:00 |
|
yflory
|
0ef1c14d7f
|
Fix lint errors
|
2017-04-28 12:12:17 +02:00 |
|
yflory
|
fc760b4820
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 12:08:21 +02:00 |
|
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
2017-04-28 12:08:05 +02:00 |
|
ansuz
|
e51c7f9cf0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-28 11:46:24 +02:00 |
|
ansuz
|
e132ccf94a
|
prepare for upload
|
2017-04-28 11:45:53 +02:00 |
|
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
2017-04-27 18:46:46 +02:00 |
|
yflory
|
197b366712
|
Ability to drag&select in the drive
|
2017-04-27 17:01:56 +02:00 |
|
ansuz
|
e2942f959b
|
add crypto for decrypting a chunked file
|
2017-04-27 12:56:42 +02:00 |
|
ansuz
|
aedc46bdaf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-27 12:47:27 +02:00 |
|
ansuz
|
a97e7223f1
|
implement getBlobPathFromHex
|
2017-04-27 12:47:21 +02:00 |
|
yflory
|
520dabe094
|
Remove the unsorted files category
|
2017-04-26 18:46:40 +02:00 |
|
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
2017-04-26 14:55:06 +02:00 |
|
yflory
|
6a8274518b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 18:42:33 +02:00 |
|
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
2017-04-25 18:42:21 +02:00 |
|
ansuz
|
12898b3358
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 18:28:48 +02:00 |
|
ansuz
|
74bcec8b31
|
programming is hard okay
|
2017-04-25 18:28:39 +02:00 |
|
yflory
|
2a417ddae8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 17:22:07 +02:00 |
|
yflory
|
d985b144cc
|
Add a new hash version for the file viewer
|
2017-04-25 17:19:13 +02:00 |
|
ansuz
|
3309087277
|
send feedback if isArray is not supported
|
2017-04-25 17:09:39 +02:00 |
|
ansuz
|
f196b836db
|
fix undefined reference
|
2017-04-25 16:17:52 +02:00 |
|
ansuz
|
48973bccd6
|
add tests to assert for hash parsing
|
2017-04-25 16:11:19 +02:00 |
|
ansuz
|
5194677443
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-25 14:57:34 +02:00 |
|
yflory
|
c9c7d61ad1
|
Media tag viewer
|
2017-04-25 14:55:38 +02:00 |
|
ansuz
|
729d1460b9
|
Merge branch 'master' into staging
|
2017-04-25 14:35:24 +02:00 |
|
ansuz
|
a840fb9e85
|
add example hashes and start working on hash v2
|
2017-04-25 14:33:57 +02:00 |
|
ansuz
|
d1fa68e30d
|
build UCF Media Tag
|
2017-04-24 17:13:32 +02:00 |
|
ansuz
|
cc33c4abe9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
2017-04-24 15:41:46 +02:00 |
|
ansuz
|
a5ca461a73
|
update footer for new version
|
2017-04-24 15:41:29 +02:00 |
|
yflory
|
fdd51ec18d
|
Don't remove a folder moved into unsorted or into itself
|
2017-04-24 15:38:03 +02:00 |
|
ansuz
|
4b95a1da48
|
unbreak assert/translations
|
2017-04-24 14:32:56 +02:00 |
|
ansuz
|
4fdc5f897e
|
only feedback migration if user had legacy store
|
2017-04-24 14:26:55 +02:00 |
|
ansuz
|
218f2ff76c
|
feedback when logging in or registering
|
2017-04-24 14:15:17 +02:00 |
|
yflory
|
4c3e842664
|
Fix focus issues with the history input in ckeditor
|
2017-04-24 13:55:03 +02:00 |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
2017-04-24 13:43:18 +02:00 |
|
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
2017-04-24 11:41:00 +02:00 |
|
ansuz
|
18e2e66b06
|
jshint compliance
|
2017-04-24 11:39:39 +02:00 |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
2017-04-21 17:31:47 +02:00 |
|
ansuz
|
4c0d7bf8e8
|
support multiple calls to cryptpad.ready
|
2017-04-21 16:51:32 +02:00 |
|
ansuz
|
ec041c88e2
|
console.log when providing feedback
also notify server if a users browser does not support proxies
|
2017-04-21 15:53:13 +02:00 |
|
ansuz
|
c51073f211
|
support batch getFileSize calls
|
2017-04-21 14:51:20 +02:00 |
|
ansuz
|
1af621bfe5
|
Merge remote-tracking branch 'origin/auth' into staging
|
2017-04-20 17:27:32 +02:00 |