summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Fix namespace duplication and other issues in repairlegacystoragesJoas Schilling2015-04-133-27/+77
* Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_res...Thomas Müller2015-04-131-2/+11
|\
| * cach user folder for file search resultsJörn Friedrich Dreyer2015-04-131-2/+11
* | Merge pull request #15570 from owncloud/shares-properlyformatmountpointMorris Jobke2015-04-133-4/+16
|\ \
| * | Properly add trailing slash to mount pointVincent Petry2015-04-133-4/+16
| |/
* | Merge pull request #15564 from rullzer/fix_13709Vincent Petry2015-04-132-0/+29
|\ \ | |/ |/|
| * Do not try to make user subadmin of group twiceRoeland Jago Douma2015-04-132-0/+29
* | Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object...Morris Jobke2015-04-132-0/+48
|\ \ | |/ |/|
| * Prevent php message: "Trying to get property of non-object at /xxx/lib/privat...Thomas Müller2015-04-132-0/+48
* | Merge pull request #15562 from owncloud/fix-15560Joas Schilling2015-04-131-35/+48
|\ \ | |/ |/|
| * Properly import used classesThomas Müller2015-04-131-35/+48
|/
* Merge pull request #15555 from rullzer/fix_15494Morris Jobke2015-04-121-1/+1
|\
| * Initial fix for #15494Roeland Jago Douma2015-04-121-1/+1
* | Merge pull request #15541 from owncloud/add-reply-to-supportLukas Reschke2015-04-125-62/+392
|\ \
| * | Add "Reply-To" support to sharing mails and refactor codeLukas Reschke2015-04-104-62/+370
| * | Add "Reply-To" support for mailsLukas Reschke2015-04-101-0/+22
* | | Merge pull request #15545 from owncloud/fix-fontsMorris Jobke2015-04-121-0/+7
|\ \ \ | |_|/ |/| |
| * | fix wrong typeface being used for some buttonsJan-Christoph Borchardt2015-04-111-0/+7
|/ /
* | Merge pull request #15535 from owncloud/smb-1.0.0Morris Jobke2015-04-107-16/+38
|\ \
| * | update icewind/smb to 1.0.0Robin Appelman2015-04-107-16/+38
* | | Merge pull request #15536 from owncloud/fix-mysql-autotestRobin McCorkell2015-04-101-1/+1
|\ \ \
| * | | [autotest.sh] use the DATABASEHOST for the mysql DB dropMorris Jobke2015-04-101-1/+1
| |/ /
* | | Merge pull request #15458 from owncloud/web-shell-masterLukas Reschke2015-04-102-32/+81
|\ \ \
| * | | Throw an exception in case checkServer() returns errorsThomas Müller2015-04-091-0/+1
| * | | Introduce own console application classThomas Müller2015-04-092-32/+80
* | | | Merge pull request #15538 from owncloud/encryption-crypt-testsClark Tomlinson2015-04-102-29/+283
|\ \ \ \
| * | | | add unit test for crypt.phpBjoern Schiessle2015-04-102-29/+283
* | | | | Merge pull request #15395 from owncloud/fix-imagepathVincent Petry2015-04-101-4/+6
|\ \ \ \ \
| * | | | | Fix UrlGenerator::imagePath() for app pathsRobin McCorkell2015-04-031-4/+6
* | | | | | Merge pull request #15489 from owncloud/dont_hide_exceptions_masterThomas Müller2015-04-1013-134/+348
|\ \ \ \ \ \
| * | | | | | Throw ServerNotAvailableException alwaysMorris Jobke2015-04-101-1/+1
| * | | | | | fix cherrypickingJörn Friedrich Dreyer2015-04-106-44/+56
| * | | | | | fix typo and commentMorris Jobke2015-04-102-3/+3
| * | | | | | fix filesystem and encryption testsJörn Friedrich Dreyer2015-04-101-7/+4
| * | | | | | throw exception when backends don't provide a user instead of creating legacy...Jörn Friedrich Dreyer2015-04-102-31/+45
| * | | | | | throw exception if setup is incompleteMorris Jobke2015-04-103-1/+33
| * | | | | | more robust share dialogMorris Jobke2015-04-101-0/+4
| * | | | | | fix_testsJörn Friedrich Dreyer2015-04-103-49/+201
| * | | | | | do not disclose information, show generic error on login pageJörn Friedrich Dreyer2015-04-102-0/+10
| * | | | | | do not hide exception when ldap server has a hiccupJörn Friedrich Dreyer2015-04-103-17/+10
* | | | | | | Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedsh...Morris Jobke2015-04-101-1/+3
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Clear leftover shares from other testsVincent Petry2015-04-101-1/+3
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #15510 from owncloud/cron-singleuserThomas Müller2015-04-105-16/+36
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | Fix singe user mode on public.php - take twoThomas Müller2015-04-102-2/+6
| * | | | | Fix single user check in case no user is logged inThomas Müller2015-04-091-13/+19
| * | | | | block ocs in single user modeRobin Appelman2015-04-091-1/+3
| * | | | | block webdav in single user modeRobin Appelman2015-04-091-0/+3
| * | | | | block cron when in single user modeRobin Appelman2015-04-091-0/+5
* | | | | | Merge pull request #15530 from owncloud/davclient-catchmoreexceptionsMorris Jobke2015-04-102-68/+72
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix converting Guzzle error codes in s2s storageVincent Petry2015-04-101-10/+13