aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Test whether an expired user share is still accessible.Andreas Fischer2013-09-121-0/+33
|
* 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
| * | | | 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 item
| * | | | 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 IE8
| * | | | Fixed missing checkboxes in IE8Vincent Petry2013-09-081-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | IE8 is not happy with the :checked CSS3 selector which causes it to ignore the whole rule. Replace it with a more compatible selector.
* | | | | 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 recursive
| * | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | oc\preview use avconv instead of ffmpeg
| * | | | | | 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 language selection; Fix #4756kondou2013-09-071-1/+1
|/ / / / / / /
* | / / / / / [tx-robot] updated from transifexJenkins for ownCloud2013-09-07347-2189/+10627
| |/ / / / / |/| | | | |
* | | | | | remove some more debug outputBjoern Schiessle2013-09-061-2/+0
| | | | | |
* | | | | | remove some error_logsBjoern Schiessle2013-09-061-1/+0
| | | | | |
* | | | | | remove error logsBjoern Schiessle2013-09-061-2/+2
| | | | | |
* | | | | | coding style fixesBjoern Schiessle2013-09-061-1/+2
| | | | | |
* | | | | | if the files doesn't exist yet we start with the parent to search for sharesBjoern Schiessle2013-09-061-4/+12
| | | | | |