ansuz
|
7dd5907ff0
|
Merge branch 'limit' into staging
|
8 years ago |
|
ansuz
|
22efde87d5
|
correctly estimate upload size
|
8 years ago |
|
ansuz
|
a993ab6616
|
use new encrypted file encoding in media-tag
|
8 years ago |
|
ansuz
|
8c49150725
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
e0293a1162
|
Merge branch 'master' into staging
|
8 years ago |
|
yflory
|
57ee7de7d4
|
Update and return the storage limit
|
8 years ago |
|
yflory
|
371edff943
|
Fix an error when moving unsorted files to root in the drive
|
8 years ago |
|
yflory
|
b76dcba1d6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
733c3abefa
|
Update the upgrade button in the drive
|
8 years ago |
|
yflory
|
becba33b05
|
Scroll to the selected element in the drive
|
8 years ago |
|
yflory
|
419fb15425
|
Remember the scroll position in the drive tree
|
8 years ago |
|
yflory
|
5d0535966c
|
Center vertically slides in present mode and checkbox to disable transitions
|
8 years ago |
|
ansuz
|
5d37a50a87
|
try to estimate upload size
|
8 years ago |
|
ansuz
|
6d30d7f89f
|
strip junk bytes from base64 more safely
|
8 years ago |
|
ansuz
|
1525712deb
|
new encrypted file format
|
8 years ago |
|
ansuz
|
8f5989b6b0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
cf81b02096
|
Make sure the spinner is always centered in the loading screen
|
8 years ago |
|
yflory
|
5a21be8112
|
Improve UI on mobile
|
8 years ago |
|
ansuz
|
5aba2d4640
|
remove unused variable
|
8 years ago |
|
yflory
|
5c8586f8a3
|
Fix typo in file upload
|
8 years ago |
|
yflory
|
1e4fc5a979
|
lint
|
8 years ago |
|
yflory
|
3c4b6a89d2
|
Fix a conflict with the arrow keys and renaming a folder in the tree
|
8 years ago |
|
yflory
|
96ccb94397
|
Add the share button when a file upload is complete
|
8 years ago |
|
yflory
|
c00158d23a
|
Move code to common-history
|
8 years ago |
|
ansuz
|
97a28d3938
|
test file encryption/decryption
|
8 years ago |
|
ansuz
|
6a1c799a6e
|
support async tests
|
8 years ago |
|
ansuz
|
922e7803e9
|
remove extraneous slashes from hashes when parsing
|
8 years ago |
|
yflory
|
0f8ef2f516
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
6a8153aca3
|
Fix selection issues in the drive with Chrome
|
8 years ago |
|
yflory
|
a6c49cd65c
|
Fix undefined title in slides present mode
|
8 years ago |
|
ansuz
|
299a53ded7
|
prefer to use functions from common
|
8 years ago |
|
ansuz
|
a338b23f40
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
df47b913e3
|
fetch array buffers in cryptpad-common
|
8 years ago |
|
yflory
|
ff16084719
|
Fix lint errors
|
8 years ago |
|
yflory
|
50c8a859e6
|
Move the CodeMirror cursor code to common-codemirror
|
8 years ago |
|
yflory
|
9eb8e55cf6
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
c79a6e3b2b
|
Move Metadata, CodeMirror and title functions in separate files
|
8 years ago |
|
ansuz
|
56a871cb67
|
Merge branch 'soon' into staging
|
8 years ago |
|
ansuz
|
521f99a3d6
|
support drag and drop for file upload
|
8 years ago |
|
ansuz
|
b4973b7610
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
|
ansuz
|
ae7d65c3fa
|
fix drag to select in chrome
|
8 years ago |
|
yflory
|
63710e1ccc
|
Move the code related to the title in another file
|
8 years ago |
|
yflory
|
48898c97e5
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
|
yflory
|
ce5cdce917
|
Fix an issue where the username was lost on websocket reconnect
|
8 years ago |
|
ansuz
|
1d4d4cffdb
|
correct some copypasted code
|
8 years ago |
|
ansuz
|
2b4f503aff
|
Merge branch 'master' of github.com:xwiki-labs/cryptpad
|
8 years ago |
|
ansuz
|
4a104052b4
|
handle errors in file
|
8 years ago |
|
yflory
|
b818fd8a37
|
Fix 'undefined' error with the context menu
|
8 years ago |
|
yflory
|
c34c1cb07c
|
Press enter to open a folder
|
8 years ago |
|
ansuz
|
7da01d0862
|
unlist removed examples
|
8 years ago |
|
ansuz
|
ea3dc8a852
|
remove file upload test
|
8 years ago |
|
ansuz
|
42dcfb9661
|
unceremoniously kick web clients when you 'log out everywhere'
|
8 years ago |
|
yflory
|
1547063b7f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a20a319a7a
|
Fix focus issues in the CryptDrive search bar
|
8 years ago |
|
ansuz
|
36ab38f3ac
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
9206d89531
|
Fix lint errors
|
8 years ago |
|
yflory
|
bbc08bbcfd
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
5a883d5a57
|
Use the new toolbar and move the userlist code in a separate file
|
8 years ago |
|
yflory
|
6847906ac9
|
Move the userlist code in a separate file
|
8 years ago |
|
ansuz
|
6471b572eb
|
correct off-by-one
|
8 years ago |
|
ansuz
|
3a338e0890
|
fix undefined reference
|
8 years ago |
|
ansuz
|
a173e4c7a0
|
add 'log out everywhere' functionality in settings
|
8 years ago |
|
yflory
|
5a5b02b82b
|
Don't store in the drive pads without a hash
|
8 years ago |
|
ansuz
|
c07d3e6162
|
update version strings for upcoming release
|
8 years ago |
|
ansuz
|
3e118c6a38
|
allow instance-wide custom salt for login
|
8 years ago |
|
ansuz
|
6a00d11a15
|
fix undefined reference
|
8 years ago |
|
ansuz
|
c3d1554e8c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
660cda6573
|
set title when uploading
|
8 years ago |
|
yflory
|
706120ae5b
|
Display images uploaded in the File app with the Media app
|
8 years ago |
|
yflory
|
28cb40d7ee
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
1b6fae4dd2
|
Update mediatag
|
8 years ago |
|
ansuz
|
a0c420af8e
|
jshint compliance
|
8 years ago |
|
ansuz
|
1864dac84f
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
78b11584f8
|
remove unused variables
|
8 years ago |
|
yflory
|
4335b050af
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a190c99426
|
Toolbar refactoring
|
8 years ago |
|
ansuz
|
5739c3d973
|
blow up if you ever run out of nonce-space
|
8 years ago |
|
ansuz
|
2232518c64
|
set title after uploading
|
8 years ago |
|
ansuz
|
f644dc6c0b
|
WIP support encrypted file upload via base64 chunks
|
8 years ago |
|
ansuz
|
7573b86946
|
call back with error if an RPC is made while disconnected
|
8 years ago |
|
ansuz
|
410a9dfb17
|
temporary solution for testing pin limits
|
8 years ago |
|
yflory
|
cd98fc6eab
|
Increase the z-index of the select area in the drive
|
8 years ago |
|
yflory
|
80115d0071
|
Fix an 'undefined' variable error in the drive
|
8 years ago |
|
yflory
|
c9d89debba
|
Fix lint errors
|
8 years ago |
|
yflory
|
79365a7a82
|
Use the shift key to select multiple files in CryptDrive
|
8 years ago |
|
yflory
|
3262787244
|
Update the icon mode in CryptDrive
|
8 years ago |
|
yflory
|
d52e9fba43
|
Use the arrow keys to change the selection in the drive
|
8 years ago |
|
yflory
|
ef89451a83
|
Display the storage limit in the drive
|
8 years ago |
|
yflory
|
1d3b8188b3
|
Add mobile support in the slide app
|
8 years ago |
|
yflory
|
d2e46d1378
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
092b98d235
|
Fix the offset of the drag&select feature in the drive
|
8 years ago |
|
ansuz
|
f2672d587a
|
fix variable redefinition
|
8 years ago |
|
ansuz
|
0e7eeb285c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
f414d480a9
|
Add the history mode to the CryptDrive
|
8 years ago |
|
ansuz
|
cf4dee28f7
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
28e4ef1b13
|
WIP RPC code
|
8 years ago |
|
yflory
|
afb0061d7b
|
Fix an issue with anonymous user unable to store new pads
|
8 years ago |
|
yflory
|
56aaeea003
|
Fix the drive toolbar not displaying the displayName
|
8 years ago |
|
yflory
|
538e85c080
|
Fix the context menu in the drive flowing off the screen if too long
|
8 years ago |
|
ansuz
|
841c9ee9de
|
don't close popup dialog when hitting enter if textarea has focus
|
8 years ago |
|
ansuz
|
3fa0a73025
|
prevent using string methods on undefined variable
|
8 years ago |
|
ansuz
|
1b3ce5aa96
|
fix typo
|
8 years ago |
|
yflory
|
a51a35da70
|
Fix an issue with hashes ending with a slash
|
8 years ago |
|
yflory
|
d9b5eb8a97
|
Fix an issue with the right click triggering the select area
|
8 years ago |
|
yflory
|
ef58120819
|
Prevent multiple concurrent clicks to get the history
|
8 years ago |
|
ansuz
|
38a115d8f8
|
feedback on anonymous drive
|
8 years ago |
|
yflory
|
16f6ab813c
|
Make it clear that the number is the history represents a version
|
8 years ago |
|
yflory
|
0ee228666b
|
Replace the IRC link by the Matrix one
|
8 years ago |
|
yflory
|
c820b3485c
|
Fix function undefined when loading a template
|
8 years ago |
|
yflory
|
0ef1c14d7f
|
Fix lint errors
|
8 years ago |
|
yflory
|
fc760b4820
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
a165332c15
|
Don't store a pad in the drive if the limit has been reached
|
8 years ago |
|
ansuz
|
e51c7f9cf0
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
e132ccf94a
|
prepare for upload
|
8 years ago |
|
yflory
|
bf7c7c45d0
|
Add the storage limit warning in the toolbar
|
8 years ago |
|
yflory
|
197b366712
|
Ability to drag&select in the drive
|
8 years ago |
|
ansuz
|
e2942f959b
|
add crypto for decrypting a chunked file
|
8 years ago |
|
ansuz
|
aedc46bdaf
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
a97e7223f1
|
implement getBlobPathFromHex
|
8 years ago |
|
yflory
|
520dabe094
|
Remove the unsorted files category
|
8 years ago |
|
yflory
|
f50aa5c29b
|
Move the mediatag viewer into a media app
|
8 years ago |
|
yflory
|
6a8274518b
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
9882a3a923
|
Add support for the file applicaiton in the drive
|
8 years ago |
|
ansuz
|
12898b3358
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
74bcec8b31
|
programming is hard okay
|
8 years ago |
|
yflory
|
2a417ddae8
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
d985b144cc
|
Add a new hash version for the file viewer
|
8 years ago |
|
ansuz
|
3309087277
|
send feedback if isArray is not supported
|
8 years ago |
|
ansuz
|
f196b836db
|
fix undefined reference
|
8 years ago |
|
ansuz
|
48973bccd6
|
add tests to assert for hash parsing
|
8 years ago |
|
ansuz
|
5194677443
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
c9c7d61ad1
|
Media tag viewer
|
8 years ago |
|
ansuz
|
729d1460b9
|
Merge branch 'master' into staging
|
8 years ago |
|
ansuz
|
a840fb9e85
|
add example hashes and start working on hash v2
|
8 years ago |
|
ansuz
|
d1fa68e30d
|
build UCF Media Tag
|
8 years ago |
|
ansuz
|
cc33c4abe9
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
a5ca461a73
|
update footer for new version
|
8 years ago |
|
yflory
|
fdd51ec18d
|
Don't remove a folder moved into unsorted or into itself
|
8 years ago |
|
ansuz
|
4b95a1da48
|
unbreak assert/translations
|
8 years ago |
|
ansuz
|
4fdc5f897e
|
only feedback migration if user had legacy store
|
8 years ago |
|
ansuz
|
218f2ff76c
|
feedback when logging in or registering
|
8 years ago |
|
yflory
|
4c3e842664
|
Fix focus issues with the history input in ckeditor
|
8 years ago |
|
ansuz
|
f7e96b4e8c
|
resolve merge conflicts and jquery errors
|
8 years ago |
|
yflory
|
5fc2e4cf71
|
Remove the toolbar in ckeditor history mode + history configurable
|
8 years ago |
|
ansuz
|
18e2e66b06
|
jshint compliance
|
8 years ago |
|
yflory
|
92ea03d7d9
|
View and restore the history of a pad
|
8 years ago |
|
ansuz
|
4c0d7bf8e8
|
support multiple calls to cryptpad.ready
|
8 years ago |
|
ansuz
|
ec041c88e2
|
console.log when providing feedback
also notify server if a users browser does not support proxies
|
8 years ago |
|
ansuz
|
c51073f211
|
support batch getFileSize calls
|
8 years ago |
|
ansuz
|
1af621bfe5
|
Merge remote-tracking branch 'origin/auth' into staging
|
8 years ago |
|
ansuz
|
3afaf029cb
|
feedback about how often we migrate an old drive
|
8 years ago |
|
Caleb James DeLisle
|
0e8b55edc0
|
Added an authentication page to allow getting the user pubkey
|
8 years ago |
|
ansuz
|
df9c312b7d
|
make new text translateable
|
8 years ago |
|
ansuz
|
e8b053e48b
|
use bootloader in feedback.html
|
8 years ago |
|
ansuz
|
a6dbfcecf3
|
remove old/unused assertions
|
8 years ago |
|
ansuz
|
b658bda421
|
use bootloader to fix paths to jquery and json.sortify
|
8 years ago |
|
ansuz
|
347459781c
|
show the size of your files, if you're logged in
|
8 years ago |
|
ansuz
|
2b8579e8b7
|
add pretty-printers for byte-counts
|
8 years ago |
|
ansuz
|
2a25afae5f
|
Merge branch 'soon' into staging
|
8 years ago |
|
ansuz
|
e0ecf651e2
|
add a note about showing pinned file usage
|
8 years ago |
|
Caleb James DeLisle
|
c341fa8e94
|
Pull jquery using require.js rather than as a script tag and fix require to pass jquery as a parameter
|
8 years ago |
|
ansuz
|
da69c1822c
|
ask users to sign back if signing keys are missing
|
8 years ago |
|
Pierre Bondoerffer
|
7a05462eb3
|
Some more poll changes <3
|
8 years ago |
|
ansuz
|
107e75b287
|
remove invalid semicolon
|
8 years ago |
|
ansuz
|
821c1a3ec6
|
annotate code which we hope to be able to deprecate in the future
|
8 years ago |
|
yflory
|
43c045721c
|
Get the channel history
|
8 years ago |
|
ansuz
|
f6d6f81d55
|
send feedback when a user registers
|
8 years ago |
|
ansuz
|
deeb47c40b
|
reportAppUsage for settings
|
8 years ago |
|
Pierre Bondoerffer
|
05785e96ea
|
small color change
|
8 years ago |
|
ansuz
|
5a83759ee2
|
add usage button to settings page
|
8 years ago |
|
ansuz
|
a27cc76fc0
|
uppercase LOL
|
8 years ago |
|
ansuz
|
402ce2db93
|
better validation of inputs
|
8 years ago |
|
ansuz
|
c7eae9675b
|
keep exporting isArray for backwards compatibility
but prevent internal use
|
8 years ago |
|
ansuz
|
fbebbf0dca
|
minor clean up
|
8 years ago |
|
ansuz
|
525d35c9ec
|
redefine alert
|
8 years ago |
|
Pierre Bondoerffer
|
20c252e5c6
|
fix placeholder styling in safari
|
8 years ago |
|
ansuz
|
f694a81a5c
|
move more interface code out of cryptpad-common
|
8 years ago |
|
ansuz
|
a4157b9908
|
remove more unused functions
|
8 years ago |
|
ansuz
|
e10901edb2
|
begin to move interface code out of cryptpad-common
|
8 years ago |
|
ansuz
|
95789d3cbe
|
expose rpc for pinned usage
|
8 years ago |
|
ansuz
|
8f4dbcf4c6
|
remove getPadTitle
|
8 years ago |
|
ansuz
|
f42da4ecd8
|
move hashChannelList into common-hash.js
|
8 years ago |
|
ansuz
|
63960bd38c
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
ansuz
|
520ae822fc
|
correct undefined reference
|
8 years ago |
|
ansuz
|
50277cb0ae
|
don't rely on 'info' in onRemote so we can call it anywhere
|
8 years ago |
|
ansuz
|
bf047fcf65
|
Merge pull request #110 from pbondoer/newpoll
Fix flash of autocomplete in poll
|
8 years ago |
|
Pierre Bondoerffer
|
96ff487271
|
fix flash of content
|
8 years ago |
|
ansuz
|
5a7eea08c8
|
Merge pull request #108 from pbondoer/newpoll
Poll fixes
|
8 years ago |
|
Pierre Bondoerffer
|
248f88034b
|
important fixes
|
8 years ago |
|
yflory
|
633d60ccd0
|
Remove a TODO
|
8 years ago |
|
Pierre Bondoerffer
|
6b57bb2bbb
|
poll: press enter to validate input
|
8 years ago |
|
Pierre Bondoerffer
|
d483e10e77
|
poll fixes
|
8 years ago |
|
yflory
|
81d83897ec
|
Rename hash.js
|
8 years ago |
|
yflory
|
2ad0a65b71
|
Remove shortcuts that override browser actions
|
8 years ago |
|
Pierre Bondoerffer
|
ea5301be13
|
poll improved(tm)
|
8 years ago |
|
Pierre Bondoerffer
|
7434dbcb0f
|
what i have
|
8 years ago |
|
yflory
|
07705cd5c1
|
Merge branch 'staging' of github.com:xwiki-labs/cryptpad into staging
|
8 years ago |
|
yflory
|
eb2a3c1bbf
|
Fix lint errors
|
8 years ago |
|
ansuz
|
607d9652f5
|
jshint compliance
|
8 years ago |
|
yflory
|
3ba90332bb
|
Merge branch 'refactor' into staging
|
8 years ago |