Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | if we download a public shared file we need to retrieve the user from the path | Bjoern Schiessle | 2015-01-13 | 3 | -25/+14 | |
| | | ||||||
* | | Merge pull request #13311 from owncloud/fix_restore_keys | Björn Schießle | 2015-01-14 | 2 | -21/+135 | |
|\ \ | | | | | | | adapt decrypt all to the new folder structure | |||||
| * | | adapt decrypt all and restore/delete key backups to the new folder structure ↵ | Bjoern Schiessle | 2015-01-13 | 2 | -21/+135 | |
| | | | | | | | | | | | | for encryption key introduced with OC8 | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-14 | 2 | -0/+12 | |
|/ / | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-13 | 2 | -6/+6 | |
| | | ||||||
* | | Check array size, before using the 3rd element from it | Joas Schilling | 2015-01-12 | 1 | -0/+9 | |
|/ | ||||||
* | Merge pull request #13182 from owncloud/download_versions | Björn Schießle | 2015-01-12 | 9 | -143/+393 | |
|\ | | | | | make versions of shared files downloadable | |||||
| * | make versions of shared files downloadable | Bjoern Schiessle | 2015-01-09 | 9 | -143/+393 | |
| | | ||||||
* | | unit tests | Bjoern Schiessle | 2015-01-09 | 1 | -4/+86 | |
| | | ||||||
* | | don't move encryption keys if a mount point was renamed | Bjoern Schiessle | 2015-01-09 | 1 | -626/+628 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-09 | 2 | -50/+50 | |
|/ | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-05 | 10 | -24/+70 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-04 | 2 | -12/+12 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-02 | 4 | -28/+32 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-01-01 | 2 | -0/+6 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-31 | 2 | -0/+12 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-27 | 2 | -4/+6 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-26 | 2 | -0/+2 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-23 | 2 | -2/+4 | |
| | ||||||
* | Merge pull request #12961 from owncloud/try_to_cache_keys | Morris Jobke | 2014-12-22 | 4 | -19/+91 | |
|\ | | | | | cache keys to read them only once from the hard disc | |||||
| * | cache keys to read them only once from the hard disc | Bjoern Schiessle | 2014-12-19 | 4 | -19/+91 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-22 | 2 | -0/+12 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-21 | 2 | -4/+6 | |
| | | ||||||
* | | Next step in server-to-server sharing next generation, see #12285 | Bjoern Schiessle | 2014-12-19 | 3 | -21/+99 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
* | | Merge pull request #12896 from owncloud/drop-deprecated | Jörn Friedrich Dreyer | 2014-12-18 | 2 | -9/+14 | |
|\ \ | |/ |/| | first step to drop \OCP\Config:: in favour of IConfig | |||||
| * | first step to drop \OCP\Config:: in favour of IConfig | Morris Jobke | 2014-12-17 | 2 | -9/+14 | |
| | | ||||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-17 | 2 | -6/+6 | |
|/ | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-10 | 4 | -8/+12 | |
| | ||||||
* | Merge pull request #12568 from owncloud/autoload-encryption-classes | Joas Schilling | 2014-12-09 | 38 | -701/+678 | |
|\ | | | | | Fix namespaces of encryption classes and encryption tests | |||||
| * | Correctly namespace encryption tests | Joas Schilling | 2014-12-09 | 12 | -185/+181 | |
| | | ||||||
| * | Use self:: instead of the class name in encryption tests | Joas Schilling | 2014-12-09 | 10 | -361/+361 | |
| | | ||||||
| * | Update OCA\Encryption to OCA\Files_Encryption in the encryption app itself | Joas Schilling | 2014-12-09 | 34 | -252/+248 | |
| | | ||||||
| * | Fix namespace of files_encryption classes and autoload them | Joas Schilling | 2014-12-09 | 13 | -27/+12 | |
| | | ||||||
* | | Merge pull request #12715 from owncloud/fix-broken-personal-page | Lukas Reschke | 2014-12-09 | 1 | -1/+0 | |
|\ \ | |/ |/| | remove duplicate loaded personal.js - fixes #12674 | |||||
| * | remove duplicate loaded personal.js - fixes #12674 | Morris Jobke | 2014-12-09 | 1 | -1/+0 | |
| | | ||||||
* | | reduce OC_Preferences, OC_Config and \OCP\Config usage | Morris Jobke | 2014-12-08 | 3 | -7/+19 | |
|/ | | | | | | | | | | * files_encryption * files_versions * files_trashbin * tests * status.php * core * server container | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-08 | 2 | -0/+2 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-07 | 8 | -0/+8 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-06 | 14 | -0/+14 | |
| | ||||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-12-05 | 74 | -82/+14 | |
| | ||||||
* | update error message | Bjoern Schiessle | 2014-12-04 | 1 | -1/+1 | |
| | ||||||
* | OC8 and later requires PHP >= 5.4, so we can remove the check from the ↵ | Bjoern Schiessle | 2014-12-04 | 1 | -5/+1 | |
| | | | | encryption app | |||||
* | fix typo | Bjoern Schiessle | 2014-12-03 | 1 | -1/+1 | |
| | ||||||
* | small fixes | Bjoern Schiessle | 2014-12-02 | 1 | -2/+2 | |
| | ||||||
* | delete old keys if file was moved to a different mount point | Bjoern Schiessle | 2014-12-02 | 1 | -4/+10 | |
| | ||||||
* | upgrade to new folder structure | Bjoern Schiessle | 2014-12-02 | 18 | -341/+483 | |
| | ||||||
* | change private/public key names for consistency reasons | Bjoern Schiessle | 2014-11-26 | 11 | -226/+202 | |
| | ||||||
* | harmonize copyright notice | Bjoern Schiessle | 2014-11-26 | 7 | -18/+28 | |
| | ||||||
* | new folder structure for keys | Bjoern Schiessle | 2014-11-26 | 14 | -1010/+497 | |
| | | | | | | all keys are now in files_encryption/key/path_to_file/filename/ share keys are named: user.shareKey file key is named: fileKey | |||||
* | Merge pull request #12421 from ↵ | Morris Jobke | 2014-11-26 | 2 | -12/+12 | |
|\ | | | | | | | | | owncloud/issue/6101-remove-namespace-permission-constants Issue/6101 remove namespace permission constants |