5745b68fa9
Merge pull request #13311 from owncloud/fix_restore_keys
...
adapt decrypt all to the new folder structure
2015-01-14 11:40:22 +01:00
f367bbb49d
[tx-robot] updated from transifex
2015-01-14 01:55:16 -05:00
83574053a3
if we download a public shared file we need to retrieve the user from the path
2015-01-13 14:22:54 +01:00
89f17ef6fe
adapt decrypt all and restore/delete key backups to the new folder structure for encryption key introduced with OC8
2015-01-13 12:45:33 +01:00
3ece0a7767
[tx-robot] updated from transifex
2015-01-13 01:56:58 -05:00
5c03e2207b
Check array size, before using the 3rd element from it
2015-01-12 17:05:51 +01:00
331d73c3a3
Merge pull request #13182 from owncloud/download_versions
...
make versions of shared files downloadable
2015-01-12 12:03:21 +01:00
0500d3a506
unit tests
2015-01-09 15:49:44 +01:00
6cc40552b1
don't move encryption keys if a mount point was renamed
2015-01-09 15:39:36 +01:00
d699d31518
make versions of shared files downloadable
2015-01-09 12:46:24 +01:00
d4fc2f555b
[tx-robot] updated from transifex
2015-01-09 01:55:22 -05:00
8776271103
[tx-robot] updated from transifex
2015-01-05 01:54:36 -05:00
84ed1034b4
[tx-robot] updated from transifex
2015-01-04 01:54:53 -05:00
4b357274bb
[tx-robot] updated from transifex
2015-01-02 01:54:28 -05:00
ec6e70889a
[tx-robot] updated from transifex
2015-01-01 01:54:30 -05:00
573be9092d
[tx-robot] updated from transifex
2014-12-31 01:54:33 -05:00
d2e53d1022
[tx-robot] updated from transifex
2014-12-27 01:54:33 -05:00
0836ce9cd8
[tx-robot] updated from transifex
2014-12-26 01:54:28 -05:00
d8f04f5a97
[tx-robot] updated from transifex
2014-12-23 01:55:23 -05:00
eab4c029c2
Merge pull request #12961 from owncloud/try_to_cache_keys
...
cache keys to read them only once from the hard disc
2014-12-22 09:50:29 +01:00
92c8cd3933
[tx-robot] updated from transifex
2014-12-22 01:54:49 -05:00
312891c603
[tx-robot] updated from transifex
2014-12-21 01:54:36 -05:00
aea991c22e
cache keys to read them only once from the hard disc
2014-12-19 16:04:13 +01:00
24993280ed
Next step in server-to-server sharing next generation, see #12285
...
Beside some small improvements and bug fixes this will probably the final state for OC8.
To test this you need to set up two ownCloud instances. Let's say:
URL: myPC/firstOwnCloud user: user1
URL: myPC/secondOwnCloud user: user2
Now user1 can share a file with user2 by entering the username and the URL to the second ownCloud to the share-drop-down, in this case "user2@myPC/secondOwnCloud".
The next time user2 login he will get a notification that he received a server-to-server share with the option to accept/decline it. If he accept it the share will be mounted. In both cases a event will be send back to user1 and add a notification to the activity stream that the share was accepted/declined.
If user1 decides to unshare the file again from user2 the share will automatically be removed from the second ownCloud server and user2 will see a notification in his activity stream that user1@myPC/firstOwnCloud has unshared the file/folder from him.
2014-12-19 15:20:24 +01:00
49318b4d93
Merge pull request #12896 from owncloud/drop-deprecated
...
first step to drop \OCP\Config:: in favour of IConfig
2014-12-18 23:01:49 +01:00
e426375114
update enc stream
2014-12-17 15:48:05 +01:00
d41082f4d6
first step to drop \OCP\Config:: in favour of IConfig
2014-12-17 11:12:37 +01:00
6d80524e67
[tx-robot] updated from transifex
2014-12-17 01:56:41 -05:00
ea95bb0189
[tx-robot] updated from transifex
2014-12-10 01:55:34 -05:00
26861a98c5
Merge pull request #12568 from owncloud/autoload-encryption-classes
...
Fix namespaces of encryption classes and encryption tests
2014-12-09 12:56:57 +01:00
3566edbcec
Merge pull request #12715 from owncloud/fix-broken-personal-page
...
remove duplicate loaded personal.js - fixes #12674
2014-12-09 10:35:08 +01:00
b85e34c1da
Correctly namespace encryption tests
2014-12-09 09:47:27 +01:00
e67fe0336b
Use self:: instead of the class name in encryption tests
2014-12-09 09:47:27 +01:00
efac8ced90
Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself
2014-12-09 09:47:26 +01:00
7f7006643f
Fix namespace of files_encryption classes and autoload them
2014-12-09 09:47:26 +01:00
b9fab7441c
remove duplicate loaded personal.js - fixes #12674
2014-12-09 09:27:10 +01:00
0d4f0ab871
reduce OC_Preferences, OC_Config and \OCP\Config usage
...
* files_encryption
* files_versions
* files_trashbin
* tests
* status.php
* core
* server container
2014-12-08 22:42:37 +01:00
2784d580bd
[tx-robot] updated from transifex
2014-12-08 01:54:57 -05:00
8ee9ee29ea
[tx-robot] updated from transifex
2014-12-07 01:54:32 -05:00
94eb2e782f
[tx-robot] updated from transifex
2014-12-06 01:54:56 -05:00
4d53f163fd
[tx-robot] updated from transifex
2014-12-05 01:55:52 -05:00
1509dd1358
update error message
2014-12-04 12:01:11 +01:00
0dd44eaf27
OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app
2014-12-04 11:17:44 +01:00
0a173e2b58
fix typo
2014-12-03 19:46:32 +01:00
9ca9acf3f8
small fixes
2014-12-02 16:08:06 +01:00
2e78217f17
delete old keys if file was moved to a different mount point
2014-12-02 16:03:54 +01:00
49cfc30359
upgrade to new folder structure
2014-12-02 16:03:54 +01:00
a90606fb14
change private/public key names for consistency reasons
2014-11-26 10:57:47 +01:00
266f1a2afa
harmonize copyright notice
2014-11-26 10:57:47 +01:00
fd86d76f98
new folder structure for keys
...
all keys are now in files_encryption/key/path_to_file/filename/
share keys are named: user.shareKey
file key is named: fileKey
2014-11-26 10:57:47 +01:00
c5fa8f1bdc
Merge pull request #12421 from owncloud/issue/6101-remove-namespace-permission-constants
...
Issue/6101 remove namespace permission constants
2014-11-26 08:31:23 +01:00
2c39aec8cb
Replace deprecated constant with new class constant
2014-11-25 16:30:21 +01:00
4643a5d238
replace \OC:: with \OC::->getSession()
2014-11-25 16:15:32 +01:00
917bef39b7
don't store private public-share-key in session
2014-11-25 12:32:25 +01:00
f274833403
remove unused variable
2014-11-25 10:12:10 +01:00
1645c8f819
use login name to verify password
2014-11-24 15:44:43 +01:00
fa3f7ad9e9
[tx-robot] updated from transifex
2014-11-22 01:55:21 -05:00
f8421958b3
[tx-robot] updated from transifex
2014-11-21 02:54:26 -05:00
391ece46e3
Fix file upload to ext storage when recovery key is enabled
...
Fixes an issue when uploading files to external storage when recovery
keys are enabled
The Util class only works with real users, so instantiating it with the
virtual recovery key user or public key user can cause issues.
2014-11-20 16:43:44 +01:00
713c8e0dac
Merge pull request #12325 from owncloud/removeunneccessarylang
...
cleanup languages. closes #11274
2014-11-20 16:12:49 +01:00
995fe4a176
cleanup languages. closes #11274
2014-11-20 14:46:17 +01:00
76ebd3a050
Make apps/ extend the \Test\TestCase and fix overwritten methods
2014-11-19 14:52:09 +01:00
1c8f9564a4
Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
...
Warn for password reset when files_encryption is enabled
2014-11-19 13:05:02 +01:00
91f7c0af6e
[tx-robot] updated from transifex
2014-11-18 01:54:31 -05:00
f6efbfcf0b
listen to the post_passwordReset hook, backup the old keys and create a new key pair for the user
2014-11-17 17:50:20 +01:00
146cb920c9
Merge pull request #12218 from owncloud/issue/10991-fixes
...
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
b228226700
Fix single run of encryption tests and usages of uniqid() and fopen()
2014-11-17 10:48:13 +01:00
a3a064fe96
Skip some more tests on Windows which just can not work at all
2014-11-17 10:48:06 +01:00
9df50c7be6
[tx-robot] updated from transifex
2014-11-17 01:54:33 -05:00
5ca869c324
Merge pull request #9177 from owncloud/jsdocexperiment
...
Improved JS Docs + added build script for JS Docs
2014-11-13 11:16:08 +01:00
a069171cda
[tx-robot] updated from transifex
2014-11-13 01:54:36 -05:00
1846fb0285
[tx-robot] updated from transifex
2014-11-12 01:55:24 -05:00
664cc4ac0e
[tx-robot] updated from transifex
2014-11-11 01:55:23 -05:00
676b911b22
Merge pull request #12027 from owncloud/cleanup_exceptions
...
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
c3e3432662
[tx-robot] updated from transifex
2014-11-10 01:54:30 -05:00
46010655d2
[tx-robot] updated from transifex
2014-11-09 01:54:30 -05:00
da14a605d5
[tx-robot] updated from transifex
2014-11-08 01:54:35 -05:00
2af7256267
only set the values we need and make sure that we write the file info for both
...
the real file and the part file, because some information from the part file
might be needed later
2014-11-07 15:20:52 +01:00
3d19bb2e51
also try to get file info from part file
2014-11-07 15:17:24 +01:00
a10ae2816e
clean up encryption exceptions
2014-11-07 13:48:31 +01:00
e345697cab
Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
...
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
7d47d50724
[tx-robot] updated from transifex
2014-11-07 01:55:10 -05:00
8104a4e24e
check if the provided password is really the current log-in password
2014-11-06 11:12:20 +01:00
c2a45c1238
throw exception if private key is missing
2014-11-05 13:05:46 +01:00
c8f55e7f87
[tx-robot] updated from transifex
2014-11-05 01:54:36 -05:00
0580c232d7
still try to encrypt files, even if the session is not initialized. The stream wrapper will throw an error which is better than silently continue.
2014-11-04 17:16:36 +01:00
0f3e6cb50a
Improved Javascript docs for JSDoc
...
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
2014-10-31 13:43:30 +01:00
e0528c7598
Merge pull request #11876 from owncloud/remove-pointless-requires
...
remove unnecessary require calls - the ownCloud class loader is supposed...
2014-10-31 13:10:59 +01:00
146c46b73a
Merge pull request #11659 from jknockaert/master
...
rework getFileSize
2014-10-30 18:06:25 +01:00
f776bcd4a0
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
2014-10-30 17:20:40 +01:00
5536f6edd0
Properly register sharing hooks and proxies
...
This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.
Added login for user1 in setUp().
2014-10-30 12:05:15 +01:00
ea55848fa1
[tx-robot] updated from transifex
2014-10-30 01:55:14 -04:00
7d10ec41e6
Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder
...
Fix moving share keys as non-owner to subdir
2014-10-29 15:59:42 +01:00
e8f9b929bd
Added encryption test when moving file as non-owner
2014-10-29 12:57:12 +01:00
b920f888ae
Fix moving share keys as non-owner to subdir
...
This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.
After the move/copy operation the keys are moved/copied to the target
dir.
Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
2014-10-29 12:22:50 +01:00
9f7c571e40
update all translation files to js and json
2014-10-29 10:13:50 +01:00
ec1a73fab9
Added OC.L10N namespace with translation functions
...
Added addTranslations and fixed de.js file
Fixed de.js to use OC.L10N.register() and use to correct expected
format.
Added JS unit tests for OC.L10N class
Include translations JS script for all apps
2014-10-29 10:09:12 +01:00
cb944814d9
[tx-robot] updated from transifex
2014-10-29 01:54:45 -04:00
4faee4011d
initialisation of cipher
2014-10-28 19:19:10 +01:00
23873d80fe
[tx-robot] updated from transifex
2014-10-28 01:55:38 -04:00
b3a04840b5
Add type hinting to functions
...
It's only reasonable to have proper type hinting here which might even help us to catch bugs.
2014-10-24 14:13:40 +02:00
2d2a4741ce
Make files non executable
...
There is not much sense in having these files marked executable, we should avoid that.
2014-10-24 11:14:51 +02:00
9babcfb9e2
[tx-robot] updated from transifex
2014-10-24 01:55:11 -04:00
916e710ece
[tx-robot] updated from transifex
2014-10-22 01:55:22 -04:00
8485743e33
[tx-robot] updated from transifex
2014-10-21 01:55:45 -04:00
da44150a15
small fix
2014-10-20 23:25:54 +02:00
d277ef6ac2
bugfixes
2014-10-20 23:04:11 +02:00
cb3a4d22b1
make tests compatible with hook based skeleton generation
2014-10-20 11:29:20 +02:00
87da62072b
[tx-robot] updated from transifex
2014-10-20 01:54:34 -04:00
1b7e9d66b3
ok; still some bugs that had to be fixed
2014-10-20 00:28:41 +02:00
3be57d0169
small fix
2014-10-19 22:54:34 +02:00
e318858152
rework getFileSize
2014-10-19 22:27:15 +02:00
68dd1edbfe
[tx-robot] updated from transifex
2014-10-18 01:55:30 -04:00
d37eee09a5
fixing usage of EncryptionException
2014-10-17 11:46:22 +02:00
c8d8578d1a
[tx-robot] updated from transifex
2014-10-16 01:56:30 -04:00
b091394a90
introduce new app page layout
...
filter installed and not-installed apps properly
kill unneeded file
load category 'Installed' on page load
adding documentation links
new apps mgmt: first style adjustment
apps mgmt: only show license and preview if they exist
adding buttons
new apps mgmt: fix for mobile
use app icon if available
new apps mgmt: position enable/disable toggle to the right
new apps mgmt: proper display of icons or previews
new apps mgmt: fix loading spinner
reenable group selection for apps
new apps mgmt: position enable button normally again
new apps mgmt: clarify wording from 'Installed' to 'Enabled'
reintroduce enable/disable
Move rating image path generation to client-side
Move expression outside of l10n
fix group handling
add buttons for 'More apps' and 'Add your app' again
disable changed date of app for now
adding recommended label
style 'Recommended' app tag
fixing php warning
sort by rating
adding meta-category 'Recommended'
Only show existing documentation links
lacy loading of screenshots
making group based app activation work again
adding support to get the app icon not only by the app name but also simply by the fixed name 'app.svg'
adding app.svg for all core apps
query string '?installed' is not longer needed
update and uninstall is back + error feedback
remove unneeded parameter
fix alignment of 'recommended' label
2014-10-15 15:21:40 +02:00
526abf1ad6
[tx-robot] updated from transifex
2014-10-14 01:54:28 -04:00
4b9465b937
[tx-robot] updated from transifex
2014-10-13 01:54:35 -04:00
a3635fedbb
[tx-robot] updated from transifex
2014-10-12 01:54:39 -04:00
a0db01ecd3
[tx-robot] updated from transifex
2014-10-11 01:55:02 -04:00
2cc26c9022
[tx-robot] updated from transifex
2014-10-10 01:55:10 -04:00
16cd749065
Add support for keys in the info.xml
...
This allows to have links to different doc base URLs
a.
2014-10-09 15:48:30 +02:00
295c46ccb5
[tx-robot] updated from transifex
2014-10-09 01:55:33 -04:00
d532683e20
Updated info.xml app description
...
Added new app description
Removed links to CE documentation
2014-10-08 20:48:00 -04:00
b060123155
improved visual feedback if user enabled recovery key
2014-10-07 12:52:01 +02:00
794d3ef949
improved visual feedback if recovery key password gets changed
2014-10-07 12:32:09 +02:00
5fa1cbc4e5
improved visual feedback if recovery key gets enabled/disabled
2014-10-07 12:32:09 +02:00
9147219377
we also encrypt/decrypt files in the versions folder for previews and if encryption is enabled/disabled
2014-10-06 12:02:08 +02:00
1b9c31d349
Add clickable labels to encryption recovery radios
...
Add clickable radio button labels to the encryption recovery settings
pages:
* settings-admin
* settings-personal
Pressing on the radio button text now toggles the state of the radio
button.
2014-09-27 16:20:06 +01:00
75593f87d5
Merge pull request #11137 from owncloud/enc-pregfix
...
Fix share key pattern matching
2014-09-23 12:36:34 +02:00
1e631754d7
Fix share key finding algorithm in various cases
...
Instead of inaccurate pattern matching, use the list of users who we
know have access to the file to build the list of share keys.
This covers the following cases:
- Move/copy files into a subfolder within a share
- Unsharing from a user
- Deleting files directlry / moving share keys to trashbin
2014-09-23 12:33:07 +02:00
ff6c5331e9
Merge pull request #11224 from owncloud/fix_recovery_admin_user
...
first check if a private key exists, if not it is always a recovery szenario
2014-09-23 10:13:58 +02:00
479e4410c5
[tx-robot] updated from transifex
2014-09-23 02:05:45 -04:00
70937dabcd
Merge pull request #11167 from owncloud/env-movetomountreenableproxy
...
Reenable file proxy when renaming between mount points
2014-09-22 16:30:19 +02:00
744110905b
first check if a private key exists, if not it is always a recovery szenario
2014-09-22 15:05:03 +02:00
01808c8c84
fix typo
2014-09-19 18:22:09 +02:00
fb033cce98
Merge pull request #11104 from owncloud/enc_create_backup_on_recovery
...
[encryption] create backup from all keys before recovery
2014-09-19 16:40:19 +02:00
a280859bf8
make sure that we really catch the files folder only
2014-09-19 11:47:18 +02:00
2ee14c4734
create backup from all keys before recovery
2014-09-19 11:47:18 +02:00
786312d0e8
[tx-robot] updated from transifex
2014-09-19 01:55:44 -04:00
f2a01dddbc
Reenable file proxy when renaming between mount points
...
When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.
In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.
2014-09-18 19:21:04 +02:00
112e570989
Merge pull request #11141 from owncloud/update_encrytionlink
...
update encryption doc link
2014-09-18 18:19:53 +02:00
ccaea93d6b
update encryption doc link
...
I don't know how we missed to update this :/
update ldap doc link
2014-09-18 18:14:51 +02:00
338db48c0b
Merge pull request #9541 from owncloud/force_loading_of_encryption_app
...
force loading of encryption app to show correct error
2014-09-18 09:04:53 +02:00
dd6b0b1319
[tx-robot] updated from transifex
2014-09-18 01:54:39 -04:00
14571d4103
force loading of encryption app
2014-09-17 17:13:25 +02:00
2a89bc7b51
[tx-robot] updated from transifex
2014-09-17 01:55:27 -04:00
1e6ac31bde
[tx-robot] updated from transifex
2014-09-16 01:54:33 -04:00
90e91a9d10
Merge pull request #11050 from owncloud/enc-flockfix
...
Remove passing by reference to allow for proper GC
2014-09-15 00:31:10 +02:00
da9f9ae9b3
Remove passing by reference to allow for proper GC
...
The garbage collector in PHP 5.3.10 does not properly release the file
handle when calling fclose() due to the fact that it is passed by
reference.
This has the side-effect of preventing file locks to be released as well
when the files_locking app is enabled.
This fix removes the useless passing by reference and now the file
handle and file lock are freed properly.
2014-09-12 19:51:47 +02:00
Björn Schießle
Jenkins for ownCloud
Bjoern Schiessle
Joas Schilling
Morris Jobke
Jörn Friedrich Dreyer
jknockaert
Lukas Reschke
Vincent Petry
Volkan Gezer
Thomas Müller
MTRichards
Dan Bartram
Volkan Gezer