summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | Update - Only add one section for disabled appsJoas Schilling2015-10-211-6/+9
| | |/ / / | |/| | |
* | | | | Merge pull request #19883 from owncloud/provide-iappcontainerThomas Müller2015-10-211-0/+4
|\ \ \ \ \
| * | | | | Provide IAppContainer as dependency injectionMorris Jobke2015-10-201-0/+4
* | | | | | Merge pull request #18184 from owncloud/ocs-merge-headersThomas Müller2015-10-213-37/+47
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | fix PHPDocThomas Müller2015-09-211-0/+1
| * | | | | Merge headers of ocs resultsThomas Müller2015-09-213-37/+46
* | | | | | Merge pull request #19909 from owncloud/fix-memcached-warningThomas Müller2015-10-211-2/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix memcached/memcache module checkRobin McCorkell2015-10-201-2/+2
* | | | | | Merge pull request #19892 from owncloud/bump_password_compat_1.0.4Thomas Müller2015-10-211-0/+0
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Bump 3rdparty for password_compatRoeland Jago Douma2015-10-201-0/+0
| | |_|_|/ | |/| | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-10-21140-232/+172
* | | | | Merge pull request #19907 from owncloud/scrutinizer_provisioning_apiMorris Jobke2015-10-212-3/+3
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Fix scrutinizer issuesRoeland Jago Douma2015-10-202-3/+3
|/ / / /
* | | | Merge pull request #19895 from owncloud/fix-public-paginationMorris Jobke2015-10-201-1/+1
|\ \ \ \
| * | | | fix pagination on public file listHendrik Leppelsack2015-10-201-1/+1
|/ / / /
* | | | Merge pull request #19863 from owncloud/external-storage-wordingThomas Müller2015-10-201-1/+1
|\ \ \ \
| * | | | fix wording on external storage checkbox, ref #19858Jan-Christoph Borchardt2015-10-191-1/+1
* | | | | Merge pull request #19877 from owncloud/dropbox-fixmetadatacachepathsThomas Müller2015-10-201-5/+9
|\ \ \ \ \
| * | | | | Fix Dropbox metadata cache with trimmed pathsVincent Petry2015-10-191-5/+9
* | | | | | Merge pull request #19748 from owncloud/update-preventcloseThomas Müller2015-10-201-0/+9
|\ \ \ \ \ \
| * | | | | | Allow leaving update page when errors occurredVincent Petry2015-10-201-0/+2
| * | | | | | Prevent leaving the DB update page while in progressVincent Petry2015-10-201-0/+7
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #18399 from owncloud/api-getusers-for-subadminsThomas Müller2015-10-203-3/+104
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into api-getusers-for-subadminsmichag862015-10-132199-18747/+40711
| |\ \ \ \ \ \
| * | | | | | | [provisioning api] Updated testsRoeland Jago Douma2015-08-261-1/+77
| * | | | | | | enable api getUsers for subadminsmichag862015-08-262-2/+27
* | | | | | | | Merge pull request #19636 from owncloud/share_expire_backgrounThomas Müller2015-10-205-1/+283
|\ \ \ \ \ \ \ \
| * | | | | | | | use correct class nameMorris Jobke2015-10-202-2/+2
| * | | | | | | | Add backgroundjob to expire link sharesRoeland Jago Douma2015-10-205-1/+283
* | | | | | | | | Merge pull request #19742 from owncloud/shareinfo_performanceThomas Müller2015-10-203-14/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Do not calculate non essential infoRoeland Jago Douma2015-10-133-14/+0
* | | | | | | | | | Merge pull request #19884 from owncloud/locking_exceptionThomas Müller2015-10-201-1/+1
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | catch all exception if table doesn't existsBjörn Schießle2015-10-201-1/+1
* | | | | | | | | | Merge pull request #19874 from owncloud/delete-cookie-instead-of-setting-valu...Thomas Müller2015-10-202-2/+7
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Delete cookie instead of emptying valueLukas Reschke2015-10-192-2/+7
* | | | | | | | | | Merge pull request #19838 from owncloud/remove-files-remote.phpThomas Müller2015-10-201-55/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove apps/files/appinfo/remote.php - this is no longer usedThomas Müller2015-10-161-55/+0
* | | | | | | | | | | Merge pull request #19666 from owncloud/fix_13002Thomas Müller2015-10-203-80/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Combine OCS API getUser method code into provisioning_api appRoeland Jago Douma2015-10-133-80/+10
* | | | | | | | | | | | Merge pull request #19859 from owncloud/fix-long-groupnamesThomas Müller2015-10-201-1/+12
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ellipsize long group names in select2 dropdown, fix #16977Jan-Christoph Borchardt2015-10-191-1/+12
| | |_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #19878 from owncloud/fix-filepicker-loading-spinnerThomas Müller2015-10-202-4/+4
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
| * | | | | | | | | | | fix filepicker loading spinnerChristoph Wurst2015-10-192-4/+4
| | |_|_|_|_|/ / / / / | |/| | | | | | | | |
* | | | | | | | | | | Merge pull request #19879 from owncloud/oci-setup-static-to-objectThomas Müller2015-10-201-15/+17
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | [OCI setup] remove static logger/config callsMorris Jobke2015-10-201-15/+17
|/ / / / / / / / / / /
* / / / / / / / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-10-2010-6/+66
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #17641 from owncloud/fix_objectstore_renameJörn Friedrich Dreyer2015-10-1916-66/+150
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix error in stop scriptThomas Müller2015-10-161-11/+13
| * | | | | | | | | | Fix termination of the ceph dockerThomas Müller2015-10-161-1/+2
| * | | | | | | | | | Fix termination of the ceph dockerThomas Müller2015-10-161-1/+1