summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #4840 from owncloud/adding-tb-masterThomas Müller2013-09-132-33/+41
|\
| * 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
|\
| * 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
|\ \
| * | adding calls to \OCA\files\lib\Helper::determineIcon($i) in files, trashbin a...Thomas Müller2013-09-124-0/+18
| * | 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
|\ \ \
| * | | 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 on...kondou2013-09-052-9/+28
* | | | Merge pull request #4784 from owncloud/ocdialog_option_setterThomas Tanghus2013-09-111-6/+10
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 pull r...Thomas Müller2013-09-111-3/+3
* | | | | [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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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_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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | removing all ?> jutt in caseThomas Müller2013-09-1057-105/+0
| * | | | | removing ?> followed by whitespacesThomas Müller2013-09-105-10/+0
|/ / / / /
* | | | | Merge pull request #4647 from owncloud/fix_4619Thomas Müller2013-09-101-0/+3
|\ \ \ \ \
| * | | | | Workaround for IE 9 & 10 for clicking filelist after adding new itemringmaster2013-08-291-0/+3
* | | | | | Merge pull request #4726 from owncloud/files-ie8-missingfilecheckboxesThomas Tanghus2013-09-091-1/+6
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | Fixed missing checkboxes in IE8Vincent Petry2013-09-081-1/+6
| | |_|_|/ | |/| | |
* | | | | Merge pull request #4757 from owncloud/deleteAll-aliasThomas Müller2013-09-091-1/+1
|\ \ \ \ \
| * | | | | change View->deleteAll to an alias of View->rmdir since rmdir works recursiveRobin Appelman2013-09-071-1/+1
* | | | | | Merge pull request #4772 from owncloud/preview_improvementsThomas Müller2013-09-091-4/+4
|\ \ \ \ \ \
| * | | | | | use avconv instead of ffmpegGeorg Ehrke2013-09-051-4/+4
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-0823-107/+150
* | | | | | | Merge pull request #4761 from owncloud/fix_language_selection-kondouChristopher2013-09-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Fix language selection; Fix #4756kondou2013-09-071-1/+1
|/ / / / / / /