summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-172-2/+2
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-032-2/+2
* Merge pull request #14573 from owncloud/enc-migrate-disable-updaterVincent Petry2015-03-021-11/+17
|\
| * Move keys instead of copy during encryption key migrationVincent Petry2015-02-271-2/+2
| * Disable the cache updater when doing the encryption migrationRobin Appelman2015-02-271-9/+15
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-022-2/+70
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-282-2/+4
|/
* Merge pull request #14530 from owncloud/revert-14403Thomas Müller2015-02-2737-731/+379
|\
| * Revert "Updating license headers"Morris Jobke2015-02-2637-731/+379
* | Merge pull request #14300 from owncloud/commandbusMorris Jobke2015-02-261-0/+2
|\ \ | |/ |/|
| * Rename getAsyncCommandBus to getCommandBusRobin Appelman2015-02-251-1/+1
| * require command that do file access to be run sync when encryption is enabledRobin Appelman2015-02-251-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-262-2/+6
|/
* Merge pull request #14151 from owncloud/update-sabre2.1Thomas Müller2015-02-251-274/+0
|\
| * Removed broken webdav testsVincent Petry2015-02-231-272/+0
| * Sabre Update to 2.1Vincent Petry2015-02-231-7/+5
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-252-0/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-242-6/+90
|/
* Merge pull request #14403 from owncloud/update-license-headersThomas Müller2015-02-2338-392/+750
|\
| * Updating license headersJenkins for ownCloud2015-02-2338-392/+750
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-232-2/+4
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-224-6/+8
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-212-0/+2
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-202-2/+4
* Merge pull request #14366 from owncloud/remove-old-l10n-filesLukas Reschke2015-02-194-20/+0
|\
| * Remove some old l10n files they arent loaded anymoreJoas Schilling2015-02-194-20/+0
* | Merge pull request #14199 from owncloud/cast-type-manuallyMorris Jobke2015-02-195-10/+10
|\ \ | |/ |/|
| * Manually type-case all AJAX filesLukas Reschke2015-02-135-10/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-192-10/+10
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-142-2/+2
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-122-6/+6
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-116-4/+6
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-092-6/+6
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-082-4/+14
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-072-0/+4
* Merge pull request #13954 from owncloud/fix-enc-mig-user-retrievalThomas Müller2015-02-062-7/+18
|\
| * always specify limit, except you do like questionable surprisesArthur Schiwon2015-02-062-7/+18
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-062-0/+2
* | don't check if we have a valid userBjoern Schiessle2015-02-061-5/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-062-0/+10
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-044-6/+10
* [tx-robot] updated from transifexJenkins for ownCloud2015-02-032-4/+4
* Merge pull request #13817 from owncloud/core-apps-dependenciesMorris Jobke2015-02-021-0/+3
|\
| * encryption requires openssl and user_ldap requires ldap :speak_no_evil:Thomas Müller2015-02-021-0/+3
* | [tx-robot] updated from transifexJenkins for ownCloud2015-02-012-0/+2
* | Merge pull request #13797 from owncloud/fix_move_del_of_remote_sharesLukas Reschke2015-01-312-2/+3
|\ \
| * | get correct user for paths to the trash bin, needed for remote shares if the ...Bjoern Schiessle2015-01-302-2/+3
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2015-01-316-8/+14
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-01-302-0/+16
* Merge pull request #13760 from owncloud/create_enc_key_for_remote_sharesMorris Jobke2015-01-292-57/+118
|\