summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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 ressources.Lukas Reschke2013-02-114-2/+12
* | Merge pull request #1639 from owncloud/stable45-awsFrank Karlitschek2013-02-114-1087/+0
|\ \ | |/ |/|
| * 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 ;-)Thomas Müller2013-02-091-6/+2
|/
* Merge pull request #1528 from owncloud/simplify_file_mimetype_parsing_stable45icewind19912013-02-071-10/+4
|\
| * 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
|\
| * 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
|\
| * 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
|/
* 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 backendArthur Schiwon2013-02-053-1/+25
|/
* Merge pull request #1433 from owncloud/add_requesttoken45blizzz2013-02-034-4/+11
|\
| * [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 stabe45Thomas Mueller2013-01-143-19/+86
* | | Merge pull request #1249 from owncloud/backport_1234Thomas Müller2013-01-311-1/+1
|\ \ \
| * | | Backport #1234 by @MTGapThomas Tanghus2013-01-211-1/+1
* | | | Merge pull request #1400 from eMerzh/fix_1328Thomas Müller2013-01-311-1/+1
|\ \ \ \
| * | | | 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 #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 #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
|\ \ \ \ \
| * | | | | 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 should fix #622Brice Maron2013-01-267-17/+24
|/ / / /
* | | | Merge pull request #1282 from owncloud/connect_hooksBjörn Schießle2013-01-252-2/+5
|\ \ \ \
| * | | | move hooks to base.phpBjörn Schießle2013-01-255-5/+5
| * | | | load subadmin.php to make sure that the hooks are connectedBjörn Schießle2013-01-233-0/+3
* | | | | Merge pull request #1283 from owncloud/fix_1278Thomas Müller2013-01-241-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | LDAP: update quota on every uncached userExists, i.e. also on every isLoggedI...Arthur Schiwon2013-01-231-0/+1
|/ / / /
* | | | 4.5.6v4.5.6Frank Karlitschek2013-01-211-2/+2
* | | | Merge pull request #1248 from owncloud/remove_ctrl_M_charsLukas Reschke2013-01-211-50/+50
|\| | |
| * | | Remove eol ^M chars.Thomas Tanghus2013-01-211-50/+50
* | | | Merge pull request #1253 from owncloud/backport-766-to-stable45-fixes-1245Thomas Müller2013-01-211-2/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the loop to search al the available languages, not only the las element.Sergi Almacellas Abellana2013-01-211-4/+4
| * | | Improve autodetection of language.Sergi Almacellas Abellana2013-01-211-2/+8
|/ / /
* | | Merge pull request #1240 from owncloud/fixing-1223-stable45Thomas Müller2013-01-209-20/+46
|\ \ \ | |_|/ |/| |
| * | Update SabreDAV to 1.6.6 - fixes #1223Thomas Mueller2013-01-209-20/+46
|/ /