summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #14458 from owncloud/revive/11157Thomas Müller2015-02-252-3/+30
|\
| * Use [0] instead of current as HHVM might have problems with thatLukas Reschke2015-02-241-1/+1
| * Get the real protocol behind several proxiesLukas Reschke2015-02-242-3/+30
* | Merge pull request #14475 from owncloud/fix-ext-owncloudRobin McCorkell2015-02-252-2/+10
|\ \
| * | Fix bugs in ownCloud external storageRobin McCorkell2015-02-252-2/+10
* | | Merge pull request #13741 from owncloud/autotest_improvementsThomas Müller2015-02-254-24/+32
|\ \ \
| * | | Better cleanup in autotest.shRobin McCorkell2015-01-284-24/+32
* | | | Merge pull request #14151 from owncloud/update-sabre2.1Thomas Müller2015-02-2540-1780/+1556
|\ \ \ \
| * | | | Remove locks plugin.Thomas Müller2015-02-253-175/+0
| * | | | Show a empty response for GET on non-files instead of the Browser PluginLukas Reschke2015-02-232-1/+45
| * | | | Removed broken webdav testsVincent Petry2015-02-231-272/+0
| * | | | Sabre Update to 2.1Vincent Petry2015-02-2339-1355/+1534
* | | | | Merge pull request #14213 from AW-UC/naturalsort_defaultcollator-patch-file-s...Vincent Petry2015-02-253-12/+115
|\ \ \ \ \
| * | | | | Add PHPunit test for DefaultCollatorAW-UC2015-02-241-9/+95
| * | | | | Fix sorting for files that only differ in case.AW-UC2015-02-241-5/+8
| * | | | | Add constructor to inject collatorAW-UC2015-02-201-0/+13
| * | | | | provide case-insensitive natural sortingAW-UC2015-02-181-4/+5
* | | | | | Merge pull request #14471 from owncloud/always-load-authentication-appsThomas Müller2015-02-241-3/+4
|\ \ \ \ \ \
| * | | | | | Always load authentication appsLukas Reschke2015-02-241-3/+4
| | |_|_|/ / | |/| | | |
* / | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-25222-320/+176
|/ / / / /
* | | | | Merge pull request #14068 from owncloud/autotest-external-sftpThomas Müller2015-02-243-4/+105
|\ \ \ \ \
| * | | | | [files_external] sftp testsMorris Jobke2015-02-103-4/+105
* | | | | | Merge pull request #13740 from owncloud/fix-12190-2Lukas Reschke2015-02-245-26/+85
|\ \ \ \ \ \
| * | | | | | and escape the search termArthur Schiwon2015-01-293-1/+5
| * | | | | | :lipstick:Arthur Schiwon2015-01-281-4/+4
| * | | | | | fix counting of users in primary groupArthur Schiwon2015-01-282-24/+69
| * | | | | | inlcude AD primary group in user filter, if a group is selected. fixes #12190Arthur Schiwon2015-01-281-2/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge pull request #14400 from owncloud/fix-cron-deadlockLukas Reschke2015-02-242-46/+41
|\ \ \ \ \ \
| * | | | | | use flock instead of just checking if there is a file to prevent deadlocks wh...Bernhard Posselt2015-02-242-46/+41
|/ / / / / /
* | | | | | Merge pull request #14195 from owncloud/activity-manager-performance-improvem...Lukas Reschke2015-02-244-107/+151
|\ \ \ \ \ \
| * | | | | | Fix test with the invalid filter check being addedJoas Schilling2015-02-131-43/+45
| * | | | | | Order methods to by grouped by their taskJoas Schilling2015-02-133-74/+74
| * | | | | | Check whether filter is valid, before doing stuff for itJoas Schilling2015-02-131-1/+12
| * | | | | | Cache some values from the extensionsJoas Schilling2015-02-131-0/+31
* | | | | | | Merge pull request #14282 from owncloud/disable-non-shipped-apps-masterThomas Müller2015-02-247-85/+115
|\ \ \ \ \ \ \
| * | | | | | | print app upgrade information to console as wellThomas Müller2015-02-241-0/+6
| * | | | | | | 3rd-party apps are only disabled in case core is upgradedThomas Müller2015-02-241-0/+14
| * | | | | | | shipped and 3rd-party apps of type authentication and session will remain ena...Thomas Müller2015-02-241-3/+11
| * | | | | | | 3rd-party apps are disabled on upgrade - refs #14026Thomas Müller2015-02-247-85/+87
* | | | | | | | Merge pull request #14461 from owncloud/fix-code-that-never-workedThomas Müller2015-02-241-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix code that never workedLukas Reschke2015-02-241-1/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #11555 from goodkiller/patch-1Joas Schilling2015-02-241-1/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update group.phpgoodkiller2014-10-141-1/+2
* | | | | | | | | Merge pull request #13340 from owncloud/use-http-onlyLukas Reschke2015-02-241-10/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use "HTTPOnly" for cookies when logging outLukas Reschke2015-01-141-10/+13
* | | | | | | | | | Merge pull request #14459 from owncloud/fix-oracleLukas Reschke2015-02-241-1/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |
| * | | | | | | | | Dont break code which relies on the cursor being open after insert/update/deleteBernhard Posselt2015-02-241-1/+0
|/ / / / / / / / /
* | | | | | | | | Merge pull request #10830 from Finkregh/patch-1Lukas Reschke2015-02-241-0/+11
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | add howto dump the ldap-backends' configurationOluf Lorenzen2014-09-031-0/+9
| * | | | | | | | add question about user-backendOluf Lorenzen2014-09-031-0/+2