summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Improve changepassword route namingkondou2013-09-133-4/+4
* Move ajax/changepassword to changepassword/controller to use autoloadingkondou2013-09-132-3/+0
* Merge branch 'master' into split_personal-user_passwordchangekondou2013-09-11909-9947/+26248
|\
| * 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
| |/ / / / / /
| * | / / / / [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
| |\ \ \ \ \