summaryrefslogtreecommitdiffstats
path: root/apps/files_encryption
Commit message (Expand)AuthorAgeFilesLines
* remove old encryption appBjoern Schiessle2015-04-07195-16586/+0
* Updating keystorage movement and fixing hooksClark Tomlinson2015-04-071-0/+226
* Initial commitClark Tomlinson2015-04-071-226/+0
* Move core apps from private to public functionsRoeland Jago Douma2015-04-013-3/+3
* replace share proxy with hookRobin Appelman2015-03-261-3/+0
* Update license headersJenkins for ownCloud2015-03-2637-329/+740
* Merge pull request #15195 from owncloud/reanimate-add-guzzleMorris Jobke2015-03-261-2/+2
|\
| * Add wrapper for GuzzleLukas Reschke2015-03-251-2/+2
* | [tx-robot] updated from transifexJenkins for ownCloud2015-03-262-0/+6
* | tearDown the file system before reinitializing - fixes #14775Thomas Müller2015-03-251-0/+1
|/
* [tx-robot] updated from transifexJenkins for ownCloud2015-03-242-0/+10
* Merge pull request #14383 from jknockaert/newbranchClark Tomlinson2015-03-231-130/+160
|\
| * againjknockaert2015-02-191-36/+0
| * try againjknockaert2015-02-191-0/+36
| |\
| | * Merge remote-tracking branch 'origin/master'jknockaert2015-02-191-1/+9
| | |\
| | | * OC8 versionjknockaert2015-02-191-196/+170
| | | * update enc streamjknockaert2014-12-171-136/+161
| | * | backjknockaert2015-02-191-35/+34
| | |/
| * | new tryjknockaert2015-02-191-130/+160
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-204-2/+6
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-03-192-2/+2
* | | [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