summaryrefslogtreecommitdiffstats
path: root/apps/files_external
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfigVincent Petry2014-03-263-51/+242
|\
| * Fix merging of external storage configurationsVincent Petry2014-03-263-51/+242
* | Pretty print mount.json when possibleVincent Petry2014-03-261-1/+6
|/
* Merge pull request #7689 from owncloud/last_cron_logVincent Petry2014-03-251-7/+0
|\
| * Move success/error squircles to settingskondou2014-03-211-7/+0
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-241-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-221-0/+1
|/
* Merge pull request #7794 from owncloud/extstorage-obfuscatepasswordsLukas Reschke2014-03-204-16/+486
|\
| * Removed commentVincent Petry2014-03-201-2/+0
| * Lazy load phpseclib in ext storage configVincent Petry2014-03-201-1/+3
| * Fix typo in mount loadingRobin Appelman2014-03-201-1/+1
| * Fixed ext storage password field order issueVincent Petry2014-03-192-3/+10
| * Fixed ext storage unit test for groupsVincent Petry2014-03-191-30/+46
| * Added tests to check mount point list for a target userVincent Petry2014-03-192-7/+132
| * Moved external storage mounting code to files_external appVincent Petry2014-03-192-4/+86
| * Added IV for ext storage password encryptionVincent Petry2014-03-191-10/+33
| * Added password obfuscation for external storage configVincent Petry2014-03-193-3/+148
| * Added ext storage unit tests for writing then reload the mount configVincent Petry2014-03-191-1/+73
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-202-0/+3
|/
* Merge pull request #7792 from owncloud/extstorage-fixpersonalstorageVincent Petry2014-03-192-17/+136
|\
| * Added unit tests for when adding ext storage mount pointsVincent Petry2014-03-182-16/+135
| * Fix validation of allowed personal backendVincent Petry2014-03-181-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2014-03-192-0/+4
* | Fix smb4php to work with home sharesRobin McCorkell2014-03-171-11/+5
|/
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-162-0/+3
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-152-0/+4
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-133-0/+31
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-132-0/+3
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-1210-0/+20
* [tx-robot] updated from transifexJenkins for ownCloud2014-03-1152-57/+21
* Merge pull request #7529 from owncloud/getlocalfile-cacheicewind19912014-03-071-99/+94
|\
| * Add caching for getLocalFile on remote storagesRobin Appelman2014-03-041-99/+94
* | Merge pull request #7354 from pschmitt/masterLukas Reschke2014-03-051-1/+1
|\ \
| * | Use 'command -v' to detect whether and where software is installed (instead o...Philipp Schmitt2014-02-211-1/+1
* | | fix some spaces to tabs issues reported by ScrutinizerJan-Christoph Borchardt2014-03-051-1/+1
* | | Merge pull request #7261 from owncloud/issue/6793Jan-Christoph Borchardt2014-03-055-13/+74
|\ \ \
| * | | Allow admins to disable certain external storages for usersJoas Schilling2014-02-265-13/+74
| | |/ | |/|
* | | Merge pull request #7525 from owncloud/fix_S3stringThomas Müller2014-03-041-1/+1
|\ \ \ | |/ / |/| |
| * | fix https://github.com/owncloud/core/issues/6825Frank Karlitschek2014-03-041-1/+1
* | | Merge pull request #7335 from owncloud/fix-7333Vincent Petry2014-02-251-2/+4
|\ \ \ | |/ / |/| |
| * | Fixed mount config pathVincent Petry2014-02-241-3/+4
| * | Fix code to search for mount.json in custom data foldersLukas Reschke2014-02-201-1/+2
| |/
* | Merge branch 'master' into extstorage-configclassRobin Appelman2014-02-215-22/+58
|\|
| * Merge pull request #7290 from owncloud/issue/5463icewind19912014-02-201-1/+1
| |\
| | * Correctly redirect to settings page when not selecting cert file for uploadJoas Schilling2014-02-191-1/+1
| * | Merge pull request #6999 from kofemann/mount-configLukas Reschke2014-02-201-4/+2
| |\ \
| | * | mount: make location of mount.json configurableTigran Mkrtchyan2014-01-291-4/+2
| * | | Revert "Added extra checks for ext storage class"Vincent Petry2014-02-202-31/+1
| * | | Merge pull request #7294 from owncloud/extstorage-configclassLukas Reschke2014-02-202-1/+31
| |\ \ \
| | * | | Added extra checks for ext storage classVincent Petry2014-02-192-1/+31