Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix namespace duplication and other issues in repairlegacystorages | Joas Schilling | 2015-04-13 | 3 | -27/+77 |
* | Merge pull request #15568 from owncloud/cache_user_folder_for_file_search_res... | Thomas Müller | 2015-04-13 | 1 | -2/+11 |
|\ | |||||
| * | cach user folder for file search results | Jörn Friedrich Dreyer | 2015-04-13 | 1 | -2/+11 |
* | | Merge pull request #15570 from owncloud/shares-properlyformatmountpoint | Morris Jobke | 2015-04-13 | 3 | -4/+16 |
|\ \ | |||||
| * | | Properly add trailing slash to mount point | Vincent Petry | 2015-04-13 | 3 | -4/+16 |
| |/ | |||||
* | | Merge pull request #15564 from rullzer/fix_13709 | Vincent Petry | 2015-04-13 | 2 | -0/+29 |
|\ \ | |/ |/| | |||||
| * | Do not try to make user subadmin of group twice | Roeland Jago Douma | 2015-04-13 | 2 | -0/+29 |
* | | Merge pull request #15563 from owncloud/fix-try-getting-propert-of-non-object... | Morris Jobke | 2015-04-13 | 2 | -0/+48 |
|\ \ | |/ |/| | |||||
| * | Prevent php message: "Trying to get property of non-object at /xxx/lib/privat... | Thomas Müller | 2015-04-13 | 2 | -0/+48 |
* | | Merge pull request #15562 from owncloud/fix-15560 | Joas Schilling | 2015-04-13 | 1 | -35/+48 |
|\ \ | |/ |/| | |||||
| * | Properly import used classes | Thomas Müller | 2015-04-13 | 1 | -35/+48 |
|/ | |||||
* | Merge pull request #15555 from rullzer/fix_15494 | Morris Jobke | 2015-04-12 | 1 | -1/+1 |
|\ | |||||
| * | Initial fix for #15494 | Roeland Jago Douma | 2015-04-12 | 1 | -1/+1 |
* | | Merge pull request #15541 from owncloud/add-reply-to-support | Lukas Reschke | 2015-04-12 | 5 | -62/+392 |
|\ \ | |||||
| * | | Add "Reply-To" support to sharing mails and refactor code | Lukas Reschke | 2015-04-10 | 4 | -62/+370 |
| * | | Add "Reply-To" support for mails | Lukas Reschke | 2015-04-10 | 1 | -0/+22 |
* | | | Merge pull request #15545 from owncloud/fix-fonts | Morris Jobke | 2015-04-12 | 1 | -0/+7 |
|\ \ \ | |_|/ |/| | | |||||
| * | | fix wrong typeface being used for some buttons | Jan-Christoph Borchardt | 2015-04-11 | 1 | -0/+7 |
|/ / | |||||
* | | Merge pull request #15535 from owncloud/smb-1.0.0 | Morris Jobke | 2015-04-10 | 7 | -16/+38 |
|\ \ | |||||
| * | | update icewind/smb to 1.0.0 | Robin Appelman | 2015-04-10 | 7 | -16/+38 |
* | | | Merge pull request #15536 from owncloud/fix-mysql-autotest | Robin McCorkell | 2015-04-10 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | [autotest.sh] use the DATABASEHOST for the mysql DB drop | Morris Jobke | 2015-04-10 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #15458 from owncloud/web-shell-master | Lukas Reschke | 2015-04-10 | 2 | -32/+81 |
|\ \ \ | |||||
| * | | | Throw an exception in case checkServer() returns errors | Thomas Müller | 2015-04-09 | 1 | -0/+1 |
| * | | | Introduce own console application class | Thomas Müller | 2015-04-09 | 2 | -32/+80 |
* | | | | Merge pull request #15538 from owncloud/encryption-crypt-tests | Clark Tomlinson | 2015-04-10 | 2 | -29/+283 |
|\ \ \ \ | |||||
| * | | | | add unit test for crypt.php | Bjoern Schiessle | 2015-04-10 | 2 | -29/+283 |
* | | | | | Merge pull request #15395 from owncloud/fix-imagepath | Vincent Petry | 2015-04-10 | 1 | -4/+6 |
|\ \ \ \ \ | |||||
| * | | | | | Fix UrlGenerator::imagePath() for app paths | Robin McCorkell | 2015-04-03 | 1 | -4/+6 |
* | | | | | | Merge pull request #15489 from owncloud/dont_hide_exceptions_master | Thomas Müller | 2015-04-10 | 13 | -134/+348 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Throw ServerNotAvailableException always | Morris Jobke | 2015-04-10 | 1 | -1/+1 |
| * | | | | | | fix cherrypicking | Jörn Friedrich Dreyer | 2015-04-10 | 6 | -44/+56 |
| * | | | | | | fix typo and comment | Morris Jobke | 2015-04-10 | 2 | -3/+3 |
| * | | | | | | fix filesystem and encryption tests | Jörn Friedrich Dreyer | 2015-04-10 | 1 | -7/+4 |
| * | | | | | | throw exception when backends don't provide a user instead of creating legacy... | Jörn Friedrich Dreyer | 2015-04-10 | 2 | -31/+45 |
| * | | | | | | throw exception if setup is incomplete | Morris Jobke | 2015-04-10 | 3 | -1/+33 |
| * | | | | | | more robust share dialog | Morris Jobke | 2015-04-10 | 1 | -0/+4 |
| * | | | | | | fix_tests | Jörn Friedrich Dreyer | 2015-04-10 | 3 | -49/+201 |
| * | | | | | | do not disclose information, show generic error on login page | Jörn Friedrich Dreyer | 2015-04-10 | 2 | -0/+10 |
| * | | | | | | do not hide exception when ldap server has a hiccup | Jörn Friedrich Dreyer | 2015-04-10 | 3 | -17/+10 |
* | | | | | | | Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedsh... | Morris Jobke | 2015-04-10 | 1 | -1/+3 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | Clear leftover shares from other tests | Vincent Petry | 2015-04-10 | 1 | -1/+3 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | Merge pull request #15510 from owncloud/cron-singleuser | Thomas Müller | 2015-04-10 | 5 | -16/+36 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Fix singe user mode on public.php - take two | Thomas Müller | 2015-04-10 | 2 | -2/+6 |
| * | | | | | Fix single user check in case no user is logged in | Thomas Müller | 2015-04-09 | 1 | -13/+19 |
| * | | | | | block ocs in single user mode | Robin Appelman | 2015-04-09 | 1 | -1/+3 |
| * | | | | | block webdav in single user mode | Robin Appelman | 2015-04-09 | 1 | -0/+3 |
| * | | | | | block cron when in single user mode | Robin Appelman | 2015-04-09 | 1 | -0/+5 |
* | | | | | | Merge pull request #15530 from owncloud/davclient-catchmoreexceptions | Morris Jobke | 2015-04-10 | 2 | -68/+72 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | Fix converting Guzzle error codes in s2s storage | Vincent Petry | 2015-04-10 | 1 | -10/+13 |