summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 4.5.7v4.5.7Frank Karlitschek2013-02-181-2/+2
|
* Merge pull request #1735 from owncloud/encodePathCorrectlyFrank Karlitschek2013-02-181-2/+2
|\ | | | | Use addslashes instead of addcslashes
| * Use addslashes instead of addcslashesLukas Reschke2013-02-161-2/+2
| |
* | backportFrank Karlitschek2013-02-182-2/+2
| | | | | | | | https://github.com/owncloud/core/pull/1751
* | Merge pull request #1716 from owncloud/backport_pr1493Thomas Müller2013-02-171-9/+8
|\ \ | | | | | | LDAP: backport basic fix from PR #1493 to fix bug #1450 in stable45
| * | LDAP: backport basic fix from PR #1493 to fix bug #1450 in stable45Arthur Schiwon2013-02-151-9/+8
| | |
* | | Add missing requesttokenLukas Reschke2013-02-161-3/+4
| |/ |/| | | | | This is a trivial fix for a regression caused by #1648
* | we should never drop a databaseThomas Mueller2013-02-151-0/+3
|/
* Merge pull request #1695 from owncloud/check_result_before_contionueBjörn Schießle2013-02-151-4/+6
|\ | | | | check results before continue
| * Check if glob() returns some matches before continue, this should fix issue 1690Björn Schießle2013-02-141-4/+6
| |
* | Invalidate existing HSTS headersLukas Reschke2013-02-141-0/+5
|/
* Merge pull request #1660 from owncloud/smb-fixes-stable45Lukas Reschke2013-02-132-58/+75
|\ | | | | smb/cifs fixes for stable45
| * backport of #1654, #1636 and https://github.com/owncloud/3rdparty/pull/12Thomas Mueller2013-02-132-58/+75
|/
* Check requesttokenLukas Reschke2013-02-123-0/+5
|
* Merge pull request #1641 from owncloud/backport-1569Thomas Müller2013-02-124-2/+12
|\ | | | | Remove invalid characters from app id to prevent loading of invalid ress...
| * Remove invalid characters from app id to prevent loading of invalid ressources.Lukas Reschke2013-02-114-2/+12
| | | | | | | | Backport of #1569
* | Merge pull request #1639 from owncloud/stable45-awsFrank Karlitschek2013-02-114-1087/+0
|\ \ | |/ |/| Remove uneeded AWS compatbility tests
| * Remove uneeded AWS compatbility testsLukas Reschke2013-02-114-1087/+0
|/
* Merge pull request #1567 from owncloud/fixing-1505-stable45Thomas Müller2013-02-091-6/+2
|\ | | | | know your libraries ;-)
| * know your libraries ;-)Thomas Müller2013-02-091-6/+2
|/ | | | strrpos fails in cases the file in the path has no dot but the parent folder
* Merge pull request #1528 from owncloud/simplify_file_mimetype_parsing_stable45icewind19912013-02-071-10/+4
|\ | | | | simplify mimetype parsing of 'file' output
| * simplify mimetype parsing of 'file' outputJörn Friedrich Dreyer2013-02-071-10/+4
|/
* TypoArthur Schiwon2013-02-071-1/+1
|
* merge backport e122fdbcb63cc4e36982dc23bd2a38c904417447Arthur Schiwon2013-02-071-0/+5
|
* Merge pull request #1499 from owncloud/backport-1357-stable45blizzz2013-02-074-0/+26
|\ | | | | backport #1357 to stable45
| * fixing <?php - thx @simonbuehlerThomas Mueller2013-02-061-1/+1
| |
| * backport #1357 to stable45Thomas Mueller2013-02-064-0/+26
|/
* Merge pull request #1479 from schiesbn/sharing_bugblizzz2013-02-061-1/+7
|\ | | | | sharing, unset the right item to avoid false positives during the check if resharing is allowed
| * use variable instead of a second array lookupBjörn Schießle2013-02-051-1/+1
| |
| * remember which item was switched to which id, so that later the correct item ↵Björn Schießle2013-02-051-1/+7
|/ | | | can be unset
* Merge pull request #1467 from owncloud/fix_change_passwordFrank Karlitschek2013-02-053-1/+25
|\ | | | | offer change password only when the action is supported by the user back...
| * offer change password only when the action is supported by the user backendArthur Schiwon2013-02-053-1/+25
|/
* Merge pull request #1433 from owncloud/add_requesttoken45blizzz2013-02-034-4/+11
|\ | | | | Add requesttoken - stable45
| * [user_ldap] Add requesttokenLukas Reschke2013-02-032-0/+4
| |
| * [user_webdavauth] Add requesttokenLukas Reschke2013-02-032-4/+7
| |
* | Merge pull request #1183 from owncloud/fix-388-stable45Michael Gapczynski2013-01-313-19/+86
|\ \ | | | | | | backport of #1066 to stabe45
| * | backport of #1066 to stabe45Thomas Mueller2013-01-143-19/+86
| | |
* | | Merge pull request #1249 from owncloud/backport_1234Thomas Müller2013-01-311-1/+1
|\ \ \ | | | | | | | | Backport #1234
| * | | Backport #1234 by @MTGapThomas Tanghus2013-01-211-1/+1
| | | |
* | | | Merge pull request #1400 from eMerzh/fix_1328Thomas Müller2013-01-311-1/+1
|\ \ \ \ | | | | | | | | | | Accept Language Header check is case sensitive ...
| * | | | Case insensitive Lang Detection fix #1328Brice Maron2013-01-311-1/+1
|/ / / /
* | | | Revoke DB rights on install only if the db is newly createdBrice Maron2013-01-281-2/+4
| | | |
* | | | Merge pull request #1322 from owncloud/logout-icon-stable45Jan-Christoph Borchardt2013-01-282-18/+100
|\ \ \ \ | | | | | | | | | | fix logout icon, hopefully also #969
| * | | | fix logout icon, hopefully also #969Jan-Christoph Borchardt2013-01-262-18/+100
| | | | |
* | | | | Merge pull request #1338 from owncloud/backport-1337-stable45Thomas Müller2013-01-281-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add create permission, fixes #780
| * | | | | Add create permission, fixes #780Thomas Mueller2013-01-281-0/+3
|/ / / / /
* | | | | Merge pull request #1325 from owncloud/undefined-4.5.5+4.5.6-stable45Lukas Reschke2013-01-262-3/+11
|\ \ \ \ \ | | | | | | | | | | | | Undefined 4.5.5+4.5.6 stable45
| * | | | | fixes #1015Thomas Mueller2013-01-261-1/+5
| | | | | |
| * | | | | fixes #1015Thomas Mueller2013-01-261-2/+6
|/ / / / /
* | | | | Merge pull request #1323 from eMerzh/backport_1113Thomas Müller2013-01-267-17/+24
|\ \ \ \ \ | |/ / / / |/| | | | Backport of #1113, Fix rendering of database connection error page