Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 4.5.7v4.5.7 | Frank Karlitschek | 2013-02-18 | 1 | -2/+2 |
| | |||||
* | Merge pull request #1735 from owncloud/encodePathCorrectly | Frank Karlitschek | 2013-02-18 | 1 | -2/+2 |
|\ | | | | | Use addslashes instead of addcslashes | ||||
| * | Use addslashes instead of addcslashes | Lukas Reschke | 2013-02-16 | 1 | -2/+2 |
| | | |||||
* | | backport | Frank Karlitschek | 2013-02-18 | 2 | -2/+2 |
| | | | | | | | | https://github.com/owncloud/core/pull/1751 | ||||
* | | Merge pull request #1716 from owncloud/backport_pr1493 | Thomas Müller | 2013-02-17 | 1 | -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 stable45 | Arthur Schiwon | 2013-02-15 | 1 | -9/+8 |
| | | | |||||
* | | | Add missing requesttoken | Lukas Reschke | 2013-02-16 | 1 | -3/+4 |
| |/ |/| | | | | | This is a trivial fix for a regression caused by #1648 | ||||
* | | we should never drop a database | Thomas Mueller | 2013-02-15 | 1 | -0/+3 |
|/ | |||||
* | Merge pull request #1695 from owncloud/check_result_before_contionue | Björn Schießle | 2013-02-15 | 1 | -4/+6 |
|\ | | | | | check results before continue | ||||
| * | Check if glob() returns some matches before continue, this should fix issue 1690 | Björn Schießle | 2013-02-14 | 1 | -4/+6 |
| | | |||||
* | | Invalidate existing HSTS headers | Lukas Reschke | 2013-02-14 | 1 | -0/+5 |
|/ | |||||
* | Merge pull request #1660 from owncloud/smb-fixes-stable45 | Lukas Reschke | 2013-02-13 | 2 | -58/+75 |
|\ | | | | | smb/cifs fixes for stable45 | ||||
| * | backport of #1654, #1636 and https://github.com/owncloud/3rdparty/pull/12 | Thomas Mueller | 2013-02-13 | 2 | -58/+75 |
|/ | |||||
* | Check requesttoken | Lukas Reschke | 2013-02-12 | 3 | -0/+5 |
| | |||||
* | Merge pull request #1641 from owncloud/backport-1569 | Thomas Müller | 2013-02-12 | 4 | -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 Reschke | 2013-02-11 | 4 | -2/+12 |
| | | | | | | | | Backport of #1569 | ||||
* | | Merge pull request #1639 from owncloud/stable45-aws | Frank Karlitschek | 2013-02-11 | 4 | -1087/+0 |
|\ \ | |/ |/| | Remove uneeded AWS compatbility tests | ||||
| * | Remove uneeded AWS compatbility tests | Lukas Reschke | 2013-02-11 | 4 | -1087/+0 |
|/ | |||||
* | Merge pull request #1567 from owncloud/fixing-1505-stable45 | Thomas Müller | 2013-02-09 | 1 | -6/+2 |
|\ | | | | | know your libraries ;-) | ||||
| * | know your libraries ;-) | Thomas Müller | 2013-02-09 | 1 | -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_stable45 | icewind1991 | 2013-02-07 | 1 | -10/+4 |
|\ | | | | | simplify mimetype parsing of 'file' output | ||||
| * | simplify mimetype parsing of 'file' output | Jörn Friedrich Dreyer | 2013-02-07 | 1 | -10/+4 |
|/ | |||||
* | Typo | Arthur Schiwon | 2013-02-07 | 1 | -1/+1 |
| | |||||
* | merge backport e122fdbcb63cc4e36982dc23bd2a38c904417447 | Arthur Schiwon | 2013-02-07 | 1 | -0/+5 |
| | |||||
* | Merge pull request #1499 from owncloud/backport-1357-stable45 | blizzz | 2013-02-07 | 4 | -0/+26 |
|\ | | | | | backport #1357 to stable45 | ||||
| * | fixing <?php - thx @simonbuehler | Thomas Mueller | 2013-02-06 | 1 | -1/+1 |
| | | |||||
| * | backport #1357 to stable45 | Thomas Mueller | 2013-02-06 | 4 | -0/+26 |
|/ | |||||
* | Merge pull request #1479 from schiesbn/sharing_bug | blizzz | 2013-02-06 | 1 | -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 lookup | Björn Schießle | 2013-02-05 | 1 | -1/+1 |
| | | |||||
| * | remember which item was switched to which id, so that later the correct item ↵ | Björn Schießle | 2013-02-05 | 1 | -1/+7 |
|/ | | | | can be unset | ||||
* | Merge pull request #1467 from owncloud/fix_change_password | Frank Karlitschek | 2013-02-05 | 3 | -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 backend | Arthur Schiwon | 2013-02-05 | 3 | -1/+25 |
|/ | |||||
* | Merge pull request #1433 from owncloud/add_requesttoken45 | blizzz | 2013-02-03 | 4 | -4/+11 |
|\ | | | | | Add requesttoken - stable45 | ||||
| * | [user_ldap] Add requesttoken | Lukas Reschke | 2013-02-03 | 2 | -0/+4 |
| | | |||||
| * | [user_webdavauth] Add requesttoken | Lukas Reschke | 2013-02-03 | 2 | -4/+7 |
| | | |||||
* | | Merge pull request #1183 from owncloud/fix-388-stable45 | Michael Gapczynski | 2013-01-31 | 3 | -19/+86 |
|\ \ | | | | | | | backport of #1066 to stabe45 | ||||
| * | | backport of #1066 to stabe45 | Thomas Mueller | 2013-01-14 | 3 | -19/+86 |
| | | | |||||
* | | | Merge pull request #1249 from owncloud/backport_1234 | Thomas Müller | 2013-01-31 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Backport #1234 | ||||
| * | | | Backport #1234 by @MTGap | Thomas Tanghus | 2013-01-21 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #1400 from eMerzh/fix_1328 | Thomas Müller | 2013-01-31 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | Accept Language Header check is case sensitive ... | ||||
| * | | | | Case insensitive Lang Detection fix #1328 | Brice Maron | 2013-01-31 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Revoke DB rights on install only if the db is newly created | Brice Maron | 2013-01-28 | 1 | -2/+4 |
| | | | | |||||
* | | | | Merge pull request #1322 from owncloud/logout-icon-stable45 | Jan-Christoph Borchardt | 2013-01-28 | 2 | -18/+100 |
|\ \ \ \ | | | | | | | | | | | fix logout icon, hopefully also #969 | ||||
| * | | | | fix logout icon, hopefully also #969 | Jan-Christoph Borchardt | 2013-01-26 | 2 | -18/+100 |
| | | | | | |||||
* | | | | | Merge pull request #1338 from owncloud/backport-1337-stable45 | Thomas Müller | 2013-01-28 | 1 | -0/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Add create permission, fixes #780 | ||||
| * | | | | | Add create permission, fixes #780 | Thomas Mueller | 2013-01-28 | 1 | -0/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #1325 from owncloud/undefined-4.5.5+4.5.6-stable45 | Lukas Reschke | 2013-01-26 | 2 | -3/+11 |
|\ \ \ \ \ | | | | | | | | | | | | | Undefined 4.5.5+4.5.6 stable45 | ||||
| * | | | | | fixes #1015 | Thomas Mueller | 2013-01-26 | 1 | -1/+5 |
| | | | | | | |||||
| * | | | | | fixes #1015 | Thomas Mueller | 2013-01-26 | 1 | -2/+6 |
|/ / / / / | |||||
* | | | | | Merge pull request #1323 from eMerzh/backport_1113 | Thomas Müller | 2013-01-26 | 7 | -17/+24 |
|\ \ \ \ \ | |/ / / / |/| | | | | Backport of #1113, Fix rendering of database connection error page |