Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | 3rdparty bump of pear-core-minimal | Roeland Jago Douma | 2015-10-21 | 1 | -0/+0 | |
* | | | | | | | | | Merge pull request #19954 from owncloud/remote-unrequired-dependencies | Thomas Müller | 2015-10-21 | 16 | -128/+35 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Use IRequest's `getScriptName` functionality instead of $_SERVER['SCRIPT_NAME'] | Lukas Reschke | 2015-10-21 | 1 | -1/+13 | |
| * | | | | | | | | | Remove dependency on ICrypto + use XOR | Lukas Reschke | 2015-10-21 | 15 | -127/+22 | |
| | |/ / / / / / / | |/| | | | | | | | ||||||
* | | | | | | | | | Merge pull request #19953 from owncloud/DeepDiver1975-patch-1 | Thomas Müller | 2015-10-21 | 1 | -92/+0 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Delete indie.json | Thomas Müller | 2015-10-21 | 1 | -92/+0 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #19918 from owncloud/send-begin-message | Thomas Müller | 2015-10-21 | 3 | -0/+30 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update: state which step we are going to start and warn if it might be slow | Joas Schilling | 2015-10-21 | 3 | -0/+30 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #19934 from owncloud/doclinks-9.0 | Thomas Müller | 2015-10-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Update doc links in README for 9.0 | Vincent Petry | 2015-10-21 | 1 | -2/+2 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #19927 from owncloud/install-shipped-apps-on-upgrade | Thomas Müller | 2015-10-21 | 3 | -1/+5 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | increase core version and add dav version number | Morris Jobke | 2015-10-21 | 2 | -1/+2 | |
| * | | | | | | | | Install new shipped apps on upgrade -fixes #19925 | Thomas Müller | 2015-10-21 | 1 | -0/+3 | |
| | |_|_|_|_|/ / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #19827 from owncloud/subadmin_non_static | Thomas Müller | 2015-10-21 | 6 | -111/+705 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Fix unit test | Roeland Jago Douma | 2015-10-21 | 2 | -16/+94 | |
| * | | | | | | | | Legacy OC_SubAdmin is now just a wrapper | Roeland Jago Douma | 2015-10-21 | 1 | -79/+57 | |
| * | | | | | | | | New \OC\SubAdmin class | Roeland Jago Douma | 2015-10-21 | 4 | -95/+633 | |
| |/ / / / / / / | ||||||
* | | | | | | | | Merge pull request #19936 from owncloud/DeepDiver1975-patch-1 | Thomas Müller | 2015-10-21 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | Remove the core version from shipped.json | Thomas Müller | 2015-10-21 | 1 | -1/+0 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #19923 from owncloud/apps-donotdisplaybrokenappiconininter... | Thomas Müller | 2015-10-21 | 2 | -2/+11 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Disable app icon preview in apps page for IE | Vincent Petry | 2015-10-21 | 2 | -2/+11 | |
| | |_|_|/ / / | |/| | | | | | ||||||
* | | | | | | | Merge pull request #19924 from owncloud/issue-19891-update-lists-disabled-app... | Thomas Müller | 2015-10-21 | 1 | -6/+9 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||||
| * | | | | | | Update - Only add one section for disabled apps | Joas Schilling | 2015-10-21 | 1 | -6/+9 | |
| | |/ / / / | |/| | | | | ||||||
* | | | | | | Merge pull request #19883 from owncloud/provide-iappcontainer | Thomas Müller | 2015-10-21 | 1 | -0/+4 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Provide IAppContainer as dependency injection | Morris Jobke | 2015-10-20 | 1 | -0/+4 | |
* | | | | | | | Merge pull request #18184 from owncloud/ocs-merge-headers | Thomas Müller | 2015-10-21 | 3 | -37/+47 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | fix PHPDoc | Thomas Müller | 2015-09-21 | 1 | -0/+1 | |
| * | | | | | | Merge headers of ocs results | Thomas Müller | 2015-09-21 | 3 | -37/+46 | |
* | | | | | | | Merge pull request #19909 from owncloud/fix-memcached-warning | Thomas Müller | 2015-10-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Fix memcached/memcache module check | Robin McCorkell | 2015-10-20 | 1 | -2/+2 | |
* | | | | | | | Merge pull request #19892 from owncloud/bump_password_compat_1.0.4 | Thomas Müller | 2015-10-21 | 1 | -0/+0 | |
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | ||||||
| * | | | | | | Bump 3rdparty for password_compat | Roeland Jago Douma | 2015-10-20 | 1 | -0/+0 | |
| | |_|_|/ / | |/| | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-21 | 140 | -232/+172 | |
| |_|_|_|/ |/| | | | | ||||||
* | | | | | Merge pull request #19907 from owncloud/scrutinizer_provisioning_api | Morris Jobke | 2015-10-21 | 2 | -3/+3 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Fix scrutinizer issues | Roeland Jago Douma | 2015-10-20 | 2 | -3/+3 | |
|/ / / / | ||||||
* | | | | Merge pull request #19895 from owncloud/fix-public-pagination | Morris Jobke | 2015-10-20 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | fix pagination on public file list | Hendrik Leppelsack | 2015-10-20 | 1 | -1/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #19863 from owncloud/external-storage-wording | Thomas Müller | 2015-10-20 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | fix wording on external storage checkbox, ref #19858 | Jan-Christoph Borchardt | 2015-10-19 | 1 | -1/+1 | |
* | | | | | Merge pull request #19877 from owncloud/dropbox-fixmetadatacachepaths | Thomas Müller | 2015-10-20 | 1 | -5/+9 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix Dropbox metadata cache with trimmed paths | Vincent Petry | 2015-10-19 | 1 | -5/+9 | |
* | | | | | | Merge pull request #19748 from owncloud/update-preventclose | Thomas Müller | 2015-10-20 | 1 | -0/+9 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Allow leaving update page when errors occurred | Vincent Petry | 2015-10-20 | 1 | -0/+2 | |
| * | | | | | | Prevent leaving the DB update page while in progress | Vincent Petry | 2015-10-20 | 1 | -0/+7 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #18399 from owncloud/api-getusers-for-subadmins | Thomas Müller | 2015-10-20 | 3 | -3/+104 | |
|\ \ \ \ \ \ | ||||||
| * \ \ \ \ \ | Merge branch 'master' into api-getusers-for-subadmins | michag86 | 2015-10-13 | 2199 | -18747/+40711 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | [provisioning api] Updated tests | Roeland Jago Douma | 2015-08-26 | 1 | -1/+77 | |
| * | | | | | | | enable api getUsers for subadmins | michag86 | 2015-08-26 | 2 | -2/+27 | |
* | | | | | | | | Merge pull request #19636 from owncloud/share_expire_backgroun | Thomas Müller | 2015-10-20 | 5 | -1/+283 | |
|\ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | use correct class name | Morris Jobke | 2015-10-20 | 2 | -2/+2 |