aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | 3rdparty bump of pear-core-minimalRoeland Jago Douma2015-10-211-0/+0
* | | | | | | | | Merge pull request #19954 from owncloud/remote-unrequired-dependenciesThomas Müller2015-10-2116-128/+35
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use IRequest's `getScriptName` functionality instead of $_SERVER['SCRIPT_NAME']Lukas Reschke2015-10-211-1/+13
| * | | | | | | | | Remove dependency on ICrypto + use XORLukas Reschke2015-10-2115-127/+22
| | |/ / / / / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #19953 from owncloud/DeepDiver1975-patch-1Thomas Müller2015-10-211-92/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Delete indie.jsonThomas Müller2015-10-211-92/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #19918 from owncloud/send-begin-messageThomas Müller2015-10-213-0/+30
|\ \ \ \ \ \ \ \
| * | | | | | | | Update: state which step we are going to start and warn if it might be slowJoas Schilling2015-10-213-0/+30
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #19934 from owncloud/doclinks-9.0Thomas Müller2015-10-211-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Update doc links in README for 9.0Vincent Petry2015-10-211-2/+2
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #19927 from owncloud/install-shipped-apps-on-upgradeThomas Müller2015-10-213-1/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | increase core version and add dav version numberMorris Jobke2015-10-212-1/+2
| * | | | | | | | Install new shipped apps on upgrade -fixes #19925Thomas Müller2015-10-211-0/+3
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #19827 from owncloud/subadmin_non_staticThomas Müller2015-10-216-111/+705
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix unit testRoeland Jago Douma2015-10-212-16/+94
| * | | | | | | | Legacy OC_SubAdmin is now just a wrapperRoeland Jago Douma2015-10-211-79/+57
| * | | | | | | | New \OC\SubAdmin classRoeland Jago Douma2015-10-214-95/+633
| |/ / / / / / /
* | | | | | | | Merge pull request #19936 from owncloud/DeepDiver1975-patch-1Thomas Müller2015-10-211-1/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the core version from shipped.jsonThomas Müller2015-10-211-1/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #19923 from owncloud/apps-donotdisplaybrokenappiconininter...Thomas Müller2015-10-212-2/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Disable app icon preview in apps page for IEVincent Petry2015-10-212-2/+11
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #19924 from owncloud/issue-19891-update-lists-disabled-app...Thomas Müller2015-10-211-6/+9
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | 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