summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | Merge pull request #17001 from owncloud/fix_15664Thomas Müller2015-06-221-2/+6
|\ \ \ \ \ \
| * | | | | | only try to determine unencrypted size if a encrypted file is readBjoern Schiessle2015-06-171-2/+6
* | | | | | | Merge pull request #16734 from owncloud/stable8-dav-getremoteetagThomas Müller2015-06-222-3/+35
|\ \ \ \ \ \ \
| * | | | | | | Disable update check test when testing wrappersVincent Petry2015-06-031-0/+3
| * | | | | | | Added storage backend test for checkUpdateVincent Petry2015-06-031-0/+15
| * | | | | | | Get etag from remote OC serverVincent Petry2015-06-031-3/+17
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge pull request #17074 from owncloud/appframework-type-cast-stable8Morris Jobke2015-06-222-1/+15
|\ \ \ \ \ \ \
| * | | | | | | AppFramework annotation whitespace unit testRobin McCorkell2015-06-221-0/+14
| * | | | | | | Allow multiple whitespace in type hints in AppFrameworkRobin McCorkell2015-06-221-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #16747 from owncloud/stable8-backport-16403Thomas Müller2015-06-191-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Only load commands of enabled appsMorris Jobke2015-06-041-0/+4
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #17022 from owncloud/stable8-verify-pathThomas Müller2015-06-191-0/+4
|\ \ \ \ \ \ \
| * | | | | | | Verify if path existsLukas Reschke2015-06-181-0/+4
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #16996 from owncloud/stable8-backport-16985-and-16995Lukas Reschke2015-06-192-5/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix return value for OCP PHPDocMorris Jobke2015-06-172-2/+2
| * | | | | | Fix OCP PHPDocMorris Jobke2015-06-171-3/+3
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #16627 from owncloud/stable8-multiselectsaveraceconditionblizzz2015-06-171-3/+18
|\ \ \ \ \ \
| * | | | | | save multiselect box on close, not on click. Makes it less frequent and less ...Arthur Schiwon2015-06-051-1/+1
| * | | | | | Fix LDAP wizard saveMultiSelect race conditionVincent Petry2015-06-011-2/+17
* | | | | | | Merge pull request #16992 from owncloud/stable8-verify-if-path-existsMorris Jobke2015-06-171-0/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | Throw nicer error message instead 500Lukas Reschke2015-06-171-1/+3
| * | | | | | Verify if path existsLukas Reschke2015-06-171-0/+5
|/ / / / / /
* | | | | | Merge pull request #16978 from owncloud/nomssqlVincent Petry2015-06-171-1/+0
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | remove mssql from supported dbsCarla Schroder2015-06-161-1/+0
|/ / / / /
* | | | | Merge pull request #16744 from owncloud/backport-15260Vincent Petry2015-06-162-1/+61
|\ \ \ \ \
| * | | | | fix scrutinizer issuesJan-Christoph Borchardt2015-06-041-6/+9
| * | | | | adjust controls bar width to not overlay scrollbarJan-Christoph Borchardt2015-06-042-1/+58
| | |/ / / | |/| | |
* | | | | Merge pull request #16862 from owncloud/use-single-actionThomas Müller2015-06-111-3/+3
|\ \ \ \ \
| * | | | | Don't use command concatenationLukas Reschke2015-06-101-3/+3
* | | | | | Merge pull request #16861 from owncloud/stable8-backport-16840Morris Jobke2015-06-103-1/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Disable video preview if previews are disabledMorris Jobke2015-06-103-1/+3
|/ / / / /
* | | | | Merge pull request #16758 from owncloud/backport-16748-stable8Morris Jobke2015-06-101-13/+21
|\ \ \ \ \
| * | | | | port detection needs to take care of now thrown exceptions when LDAP server i...Arthur Schiwon2015-06-051-13/+21
| |/ / / /
* | | | | Merge pull request #16630 from owncloud/stable8-quota-onlyforfilesMorris Jobke2015-06-094-19/+108
|\ \ \ \ \
| * | | | | Backported unit tests from 31e94708f86e21174e4bcfaf33f645dbba1efc1eVincent Petry2015-06-011-4/+79
| * | | | | Make getSourcePath accessible for storage wrappersRobin Appelman2015-06-011-1/+1
| * | | | | Only use quota stream wrapper on "files"Vincent Petry2015-05-292-14/+28
| | |/ / / | |/| | |
* | | | | Merge pull request #16738 from rullzer/ocs_set_password_backportMorris Jobke2015-06-094-34/+387
|\ \ \ \ \
| * | | | | Added unit testRoeland Jago Douma2015-06-031-0/+46
| * | | | | Password set via OCS API should not be double escapedRoeland Jago Douma2015-06-031-1/+1
| * | | | | Fix unit testRoeland Jago Douma2015-06-031-0/+4
| * | | | | No injectionsRoeland Jago Douma2015-06-031-3/+7
| * | | | | OCS Fixes to allow setting of password without removing additional settingsRoeland Jago Douma2015-06-034-34/+333
| | |_|/ / | |/| | |
* | | | | Merge pull request #16596 from owncloud/backport-16565Joas Schilling2015-06-092-0/+23
|\ \ \ \ \
| * | | | | Add check for availability of /dev/urandomLukas Reschke2015-05-272-0/+23
* | | | | | Merge pull request #16660 from owncloud/stable8-returnfileidbugJoas Schilling2015-06-092-0/+10
|\ \ \ \ \ \
| * | | | | | Properly return fileid when scanFile() did not find differencesVincent Petry2015-06-012-0/+10
* | | | | | | Merge pull request #16680 from owncloud/check-for-arrayJoas Schilling2015-06-091-5/+7
|\ \ \ \ \ \ \
| * | | | | | | Check if arrayLukas Reschke2015-06-021-5/+7
* | | | | | | | Merge pull request #16822 from owncloud/stable8-backport-16818Joas Schilling2015-06-098-516/+545
|\ \ \ \ \ \ \ \