summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #16991 from owncloud/stable7-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 #16969 from owncloud/stable7-backport-15549Morris Jobke2015-06-171-1/+8
|\
| * clarify the duplication of the $params arrayJens-Christian Fischer2015-06-161-1/+2
| * don't update identical valuesJens-Christian Fischer2015-06-161-1/+7
|/
* Merge pull request #16864 from owncloud/backport-concatenation-7Thomas Müller2015-06-111-3/+3
|\
| * Don't use command concatenationLukas Reschke2015-06-101-3/+3
* | Merge pull request #16863 from owncloud/stable7-backport-16840Morris Jobke2015-06-102-1/+2
|\ \ | |/ |/|
| * Disable video preview if previews are disabledMorris Jobke2015-06-102-1/+2
|/
* Merge pull request #16759 from owncloud/backport-16748-stable7Morris 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 #16682 from owncloud/stable7-check-for-arryMorris Jobke2015-06-101-5/+7
|\ \
| * | Check if arrayLukas Reschke2015-06-021-5/+7
* | | Merge pull request #16707 from owncloud/stable7-fix-ie8-ie9Morris Jobke2015-06-101-0/+1
|\ \ \
| * | | Add min-height to login page for IE8 and IE9Morris Jobke2015-06-031-0/+1
| |/ /
* | | Merge pull request #16773 from owncloud/fix-16582blizzz2015-06-091-1/+1
|\ \ \ | |_|/ |/| |
| * | return name instead of false, as it is on oc8 and master, so groups are displ...Arthur Schiwon2015-06-051-1/+1
|/ /
* / 7.0.6v7.0.6Frank Karlitschek2015-06-031-2/+2
|/
* 7.0.6RC2v7.0.6RC2Frank Karlitschek2015-06-011-2/+2
* Merge pull request #16666 from owncloud/fix-codeThomas Müller2015-06-011-1/+1
|\
| * Fix compatibility with 5.4 againLukas Reschke2015-06-011-1/+1
|/
* Disallow semicolons in passed commandsLukas Reschke2015-06-011-0/+5
* Ensure that passed argument is always a stringLukas Reschke2015-06-012-1/+10
* Clean application identifier before processingLukas Reschke2015-06-011-0/+2
* Revert custom patch that can cause problemsLukas Reschke2015-06-011-2/+8
* Merge pull request #16635 from owncloud/stable7-fix-themes-readmeMorris Jobke2015-05-301-1/+0
|\
| * Fix themes READMEMorris Jobke2015-05-301-1/+0
|/
* 7.0.6 RC1v7.0.6RC1Frank Karlitschek2015-05-291-2/+2
* Merge pull request #16608 from owncloud/fix_14588Vincent Petry2015-05-282-1/+77
|\
| * make sure to get the right list of users with access to the file, including t...Bjoern Schiessle2015-05-282-1/+77
|/
* Merge pull request #13742 from owncloud/fix-12190-2-stable7Thomas Müller2015-05-265-30/+164
|\
| * add primary group users to resultset before cachingArthur Schiwon2015-05-141-1/+2
| * Fixes returns of group memberships and counting if all members have the speci...Arthur Schiwon2015-04-142-9/+77
| * Backport of #13740Arthur Schiwon2015-04-145-26/+91
* | Merge pull request #15402 from owncloud/response-setContentLengthHeader-stable7Morris Jobke2015-05-205-4/+33
|\ \
| * | Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround.Andreas Fischer2015-04-045-4/+33
* | | Merge pull request #15077 from owncloud/fix-smb-oc-admin-stable7Morris Jobke2015-05-201-4/+10
|\ \ \
| * | | Support constructing an SMB_OC without saved session credentialsRobin McCorkell2015-03-201-4/+10
* | | | Merge pull request #15271 from owncloud/stable7-fix-ext-owncloudMorris Jobke2015-05-132-2/+10
|\ \ \ \
| * | | | Fix bugs in ownCloud external storageRobin McCorkell2015-03-272-2/+10
* | | | | Merge pull request #16291 from RealRancor/asset_pipe_noteThomas Müller2015-05-131-0/+3
|\ \ \ \ \
| * | | | | Add note for asset pipeline and third-party apps on stable7RealRancor2015-05-121-0/+3
|/ / / / /
* | | | | Merge pull request #15863 from owncloud/public-reshare-webdav-stable7Morris Jobke2015-05-081-1/+2
|\ \ \ \ \
| * | | | | fix subfolder reshares over webdavRobin Appelman2015-04-241-2/+2
| * | | | | resolve reshares in public webdavRobin Appelman2015-04-241-3/+4
* | | | | | Merge pull request #16114 from owncloud/stable7-backport-15510-and-15465Lukas Reschke2015-05-085-16/+36
|\ \ \ \ \ \
| * | | | | | Fix singe user mode on public.php - take twoThomas Müller2015-05-062-2/+6
| * | | | | | Fix single user check in case no user is logged inThomas Müller2015-05-061-13/+19
| * | | | | | block ocs in single user modeRobin Appelman2015-05-061-1/+3