summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #4712 from owncloud/fileapi-forewardThomas Müller2013-09-1321-2/+3696
|\ | | | | Provide an implementation of the fileapi for oc6 build on top of the old api
| * - giving the user a new id for each test run in order to prevent reuse of ↵Thomas Müller2013-09-131-1/+2
| | | | | | | | | | | | e.g. permissions data in the database - setting the current user id because \OC\FilesView relies on \OC_User::getUser()
| * cleanup public storage interface a bitRobin Appelman2013-09-121-46/+0
| |
| * Merge branch 'master' into fileapi-forewardRobin Appelman2013-09-12687-5744/+14825
| |\
| * | adjust test cases to namespace changesRobin Appelman2013-09-105-26/+26
| | |
| * | add storage backend interface to public namespaceRobin Appelman2013-09-103-2/+345
| | |
| * | improve phpdoc for the public files interfaceRobin Appelman2013-09-104-51/+105
| | |
| * | move filesystem expceptions to global namespaceRobin Appelman2013-09-1010-57/+99
| | |
| * | move public files api to a clearer namespaceRobin Appelman2013-09-103-13/+13
| | |
| * | update phpdoc for public fileapiRobin Appelman2013-09-062-10/+10
| | |
| * | extract interfaces from fileapi for public namespaceRobin Appelman2013-09-066-3/+259
| | |
| * | use ===Robin Appelman2013-09-061-1/+1
| | |
| * | Provide an implementation of the fileapi for oc6 build on top of the old apiRobin Appelman2013-09-0113-1/+3045
| | |
* | | Merge pull request #4840 from owncloud/adding-tb-masterThomas Müller2013-09-132-33/+41
|\ \ \ | | | | | | | | adding TB and GB to OC_Helper::humanFileSize
| * | | remove unused OC_L10NThomas Müller2013-09-131-1/+0
| | | |
| * | | adding TB and GB to OC_Helper::humanFileSizeThomas Müller2013-09-132-32/+41
|/ / /
* | | Allow numeric group namesringmaster2013-09-131-3/+3
| | |
* | | Merge pull request #4719 from owncloud/port_4701_masterThomas Müller2013-09-1220-183/+227
|\ \ \ | |_|/ |/| | Always check variable type before using readdir to avoid surprises
| * | more is_resource checks before readdirArthur Schiwon2013-09-056-85/+94
| | |
| * | Always check variable type before using readdir to avoid surprisesArthur Schiwon2013-09-0414-98/+133
| | |
* | | Merge pull request #4816 from owncloud/fixing-723-masterJan-Christoph Borchardt2013-09-127-22/+56
|\ \ \ | | | | | | | | Fixing 723 master
| * | | adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin ↵Thomas Müller2013-09-124-0/+18
| | | | | | | | | | | | | | | | and sharing
| * | | added determineIcon to \OCA\files\lib\HelperThomas Müller2013-09-121-0/+29
| | | |
| * | | remove unused $relativePathThomas Müller2013-09-121-2/+0
| | | |
| * | | move icon generation logic out of the templateThomas Müller2013-09-121-20/+1
| | | |
| * | | adding icons for shared folders and external foldersThomas Müller2013-09-121-0/+8
| | | |
* | | | Merge pull request #4735 from owncloud/multiple_mimetypes_rawlistThomas Tanghus2013-09-112-12/+53
|\ \ \ \ | | | | | | | | | | Make it possible to pass rawlist.php an JSON array, to filter by more than one mimetype
| * | | | Clean up rawlist.php and fix non-array requestkondou2013-09-121-20/+30
| | | | |
| * | | | Split some lines, use ===, avoid unnecessary operationkondou2013-09-111-5/+7
| | | | |
| * | | | Use shorter array-conversionkondou2013-09-061-3/+1
| | | | |
| * | | | Use usort() instead of uasort() to not maintain keyskondou2013-09-061-1/+1
| | | | |
| * | | | Sort files by name, not by mimetypekondou2013-09-051-0/+9
| | | | |
| * | | | Only use mimetype_list and clean up a bitkondou2013-09-052-19/+22
| | | | |
| * | | | Make it possible to pass rawlist.php an JSON array, to filter by more than ↵kondou2013-09-052-9/+28
| | | | | | | | | | | | | | | | | | | | one mimetype
* | | | | Merge pull request #4784 from owncloud/ocdialog_option_setterThomas Tanghus2013-09-111-6/+10
|\ \ \ \ \ | |_|/ / / |/| | | | Fix setting ocdialog options after initialization.
| * | | | Fix double destroy on escape.Thomas Tanghus2013-09-111-1/+2
| | | | |
| * | | | Remove console loggingThomas Tanghus2013-09-101-1/+0
| | | | |
| * | | | Fix setting ocdialog options after initialization.Thomas Tanghus2013-09-101-5/+9
| | | | |
* | | | | Merge pull request #4798 from owncloud/fixing-variable-typos-masterVicDeo2013-09-111-3/+3
|\ \ \ \ \ | | | | | | | | | | | | no further comment - which dev did not test this BEFORE submitting the p...
| * | | | | no further comment - which dev did not test this BEFORE submitting the pull ↵Thomas Müller2013-09-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | request? which reviewer did not test the pull request?
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-1125-138/+178
| | | | | |
* | | | | | Merge pull request #4788 from owncloud/fixin-irods-session-masterBart Visscher2013-09-111-9/+10
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fixing session handling in iRODS
| * | | | | never hack late nightThomas Müller2013-09-111-1/+1
| | | | | |
| * | | | | fixing boolean handlingThomas Müller2013-09-111-2/+2
| | | | | |
| * | | | | proper test for use_logon_credentialsThomas Müller2013-09-101-1/+1
| | | | | |
| * | | | | use \OC::$session instead of $_SESSIONThomas Müller2013-09-101-8/+9
| | | | | |
* | | | | | Merge pull request #4472 from owncloud/remove-disconnectAndreas Fischer2013-09-101-12/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove disconnect function from OC_DB * owncloud/remove-disconnect: Remove disconnect function from OC_DB
| * | | | | | Remove disconnect function from OC_DBBart Visscher2013-08-161-12/+0
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-1054-363/+438
| | | | | | |
* | | | | | | Merge pull request #4787 from owncloud/fixing-php-end-tags-irods-masterThomas Müller2013-09-1062-115/+0
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Fixing php end tags irods master