summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [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
|/ / / / /
* | / / / [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
* | | | fix part file handling and real size calculation, this should also solve #4581Bjoern Schiessle2013-09-063-45/+24
* | | | check shares for the real file and not for the .part fileBjoern Schiessle2013-09-061-0/+5
* | | | first check if a extension exists before comparing itBjoern Schiessle2013-09-061-1/+1
* | | | handle part files correctlyBjoern Schiessle2013-09-061-6/+27
* | | | prefix #filestable to tbody trPete McFarlane2013-09-061-3/+3
* | | | Revert "fixes #4574"Thomas Müller2013-09-061-10/+5
* | | | Merge pull request #4704 from owncloud/rename-lostpassword-controllerBart Visscher2013-09-052-26/+26
|\ \ \ \
| * \ \ \ Merge branch 'master' into rename-lostpassword-controllerThomas Müller2013-09-0471-592/+718
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Use the namespaced variation of the classname.Bart Visscher2013-09-022-26/+26
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-09-0557-438/+560
| |_|/ / |/| | |
* | | | Merge pull request #4477 from owncloud/hooks-viewBernhard Posselt2013-09-042-33/+87
|\ \ \ \
| * | | | test case for hooks send from a non-default viewRobin Appelman2013-08-291-1/+30
| * | | | also emit hooks for views that are a subfolder of the user folderRobin Appelman2013-08-171-32/+57
* | | | | Merge pull request #4683 from owncloud/publicuploadjserrorThomas Müller2013-09-041-0/+1
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Fixed public upload error that prevents uploadVincent Petry2013-09-011-0/+1
* | | | | Merge pull request #4449 from owncloud/clean_up_utilMorris Jobke2013-09-0317-242/+318
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' into clean_up_utilkondou2013-09-02884-12621/+26367
| |\ \ \ \ \
| * | | | | | Fix some phpdoc and camelcasekondou2013-08-231-15/+17
| * | | | | | fixing typosThomas Müller2013-08-221-9/+10
| * | | | | | Merge branch 'master' into clean_up_utilkondou2013-08-201069-19632/+16788
| |\ \ \ \ \ \
| * | | | | | | Fix some naming and spacing in lib/util.phpkondou2013-08-184-15/+20
| * | | | | | | Clean up \OC\Utilkondou2013-08-1517-222/+290
* | | | | | | | Merge pull request #4709 from owncloud/previews_in_ocidalogs_filepickerMorris Jobke2013-09-031-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Add previews to OC.dialogs.filepicker(); Fix #4697kondou2013-09-031-1/+5
* | | | | | | | | Merge pull request #4707 from owncloud/use_on_instead_of_deprecated_bindChristopher2013-09-031-1/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | use on to add event listener instead of deprecated jquery bindJörn Friedrich Dreyer2013-09-031-1/+2
* | | | | | | | | | Merge pull request #4473 from owncloud/texteditor_polishingJörn Friedrich Dreyer2013-09-032-21/+30
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Revert "remove editor div in filelist", add "is deprecated" commentJörn Friedrich Dreyer2013-09-031-0/+1
| * | | | | | | | | | refactor OC.Breadcrumbs, allow injection of container to allow rendering crum...Jörn Friedrich Dreyer2013-08-161-20/+29