Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #21849 from owncloud/add-custom-marker-into-htaccess | Thomas Müller | 2016-01-22 | 4 | -4/+22 |
|\ | | | | | Add custom marker into htaccess and execute integrity check after installation | ||||
| * | Exclude .htaccess modifications from code checker | Lukas Reschke | 2016-01-22 | 4 | -4/+22 |
| | | | | | | | | After the initial installation ownCloud will write some content into the .htaccess file such as the 404 or 403 directives. This adds a magic marker into the .htaccess file and only the content above this marker will be compared in the integrity checker. | ||||
* | | Merge pull request #21816 from ↵ | Thomas Müller | 2016-01-22 | 1 | -4/+7 |
|\ \ | |/ |/| | | | | | owncloud/require-a-specific-path-instead-of-autoguessing Use path instead of app id for occ app signing | ||||
| * | Use path instead of app id | Lukas Reschke | 2016-01-20 | 1 | -4/+7 |
| | | | | | | | | | | | | This change requires the usage of a path instead of the App ID when signing code. This has the advantage that developers can also sign code under a different location to make it easier. (e.g. remove `.git`, …) Also it adds an example command usage as well as a link to the documentation | ||||
* | | Merge pull request #20768 from owncloud/mount-cache | Thomas Müller | 2016-01-22 | 9 | -20/+616 |
|\ \ | | | | | | | cache mountpoints in the db | ||||
| * | | use insertifnotexists | Robin Appelman | 2016-01-20 | 1 | -23/+5 |
| | | | |||||
| * | | clear mount cache when removing applicables | Robin Appelman | 2016-01-20 | 2 | -0/+36 |
| | | | |||||
| * | | handle changed mount points | Robin Appelman | 2016-01-20 | 1 | -1/+23 |
| | | | |||||
| * | | clear mount cache when deleting user | Robin Appelman | 2016-01-20 | 4 | -18/+101 |
| | | | |||||
| * | | multiple minor fies | Robin Appelman | 2016-01-20 | 6 | -11/+36 |
| | | | |||||
| * | | use getmountmanager | Robin Appelman | 2016-01-20 | 1 | -1/+1 |
| | | | |||||
| * | | log duplicates | Robin Appelman | 2016-01-20 | 2 | -3/+18 |
| | | | |||||
| * | | Filter uncached mounts | Robin Appelman | 2016-01-20 | 1 | -10/+15 |
| | | | |||||
| * | | cache mountpoints in the db | Robin Appelman | 2016-01-20 | 8 | -4/+432 |
| |/ | |||||
* | | Merge pull request #21824 from owncloud/list-of-notifiers | Thomas Müller | 2016-01-22 | 2 | -7/+50 |
|\ \ | | | | | | | Make it possible to get a list of notifiers for a potential settings … | ||||
| * | | Make it possible to get a list of notifiers for a potential settings page | Joas Schilling | 2016-01-22 | 2 | -7/+50 |
| | | | |||||
* | | | Fix PHPDoc - @changed is no official tag -> use @since | Morris Jobke | 2016-01-22 | 5 | -14/+7 |
| | | | |||||
* | | | [Share 2.0] Fix displaying old shares proplery | Roeland Jago Douma | 2016-01-21 | 1 | -1/+12 |
| | | | |||||
* | | | Comments from Vincent | Roeland Jago Douma | 2016-01-21 | 2 | -8/+8 |
| | | | |||||
* | | | Add Unit tests for the default share provider | Roeland Jago Douma | 2016-01-21 | 1 | -13/+17 |
| | | | |||||
* | | | [Share 2.0] Add subfiles=x | Roeland Jago Douma | 2016-01-21 | 2 | -13/+1 |
| | | | |||||
* | | | [Share 2.0] Resolve group shares | Roeland Jago Douma | 2016-01-21 | 1 | -5/+72 |
| | | | |||||
* | | | [Sharing 2.0] Start with getShares | Roeland Jago Douma | 2016-01-21 | 3 | -13/+128 |
| | | | |||||
* | | | Merge pull request #21761 from owncloud/share2_link | Thomas Müller | 2016-01-21 | 3 | -12/+71 |
|\ \ \ | | | | | | | | | Share2 link | ||||
| * | | | [Share 2.0] Add fetching link shares to share manager | Roeland Jago Douma | 2016-01-20 | 3 | -12/+71 |
| | |/ | |/| | |||||
* | | | Merge pull request #21797 from owncloud/proper-controller-in-core | Thomas Müller | 2016-01-21 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Move controller in core/ to a common subfolder | ||||
| * | | | move setup controller to core/controller | Morris Jobke | 2016-01-20 | 1 | -1/+1 |
| | | | | |||||
* | | | | Merge pull request #21792 from owncloud/systemtags-managerfactory | Thomas Müller | 2016-01-21 | 5 | -6/+176 |
|\ \ \ \ | |_|_|/ |/| | | | Allow custom implementation of system tag managers | ||||
| * | | | Allow custom implementation of system tag managers | Vincent Petry | 2016-01-20 | 5 | -6/+176 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added config.php option to replace the default implementation of system tag manager and system tag object mapper. Also adjusted the comments manager factory to inject the server container | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-21 | 4 | -2/+88 |
| | | | | |||||
* | | | | Merge pull request #21782 from ↵ | Thomas Müller | 2016-01-21 | 4 | -1/+39 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | owncloud/update-system-addressbook-on-user-change-2 Introduce IUser::setEMailAddress and add hook mechanism | ||||
| * | | | Emit OC\User::changeUser on change of display name | Thomas Müller | 2016-01-20 | 1 | -1/+6 |
| | | | | |||||
| * | | | Introduce IUser::setEMailAddress and add hook mechanism | Thomas Müller | 2016-01-20 | 4 | -0/+33 |
| |/ / | |||||
* | | | Merge pull request #21775 from owncloud/apcu-iterator-constructor | Thomas Müller | 2016-01-20 | 1 | -1/+1 |
|\ \ \ | |/ / |/| | | Fix constructor arguments for APCUIterator | ||||
| * | | Fix constructor arguments for APCUIterator | Robin Appelman | 2016-01-18 | 1 | -1/+1 |
| | | | |||||
* | | | Properly DI the servercontainer | Roeland Jago Douma | 2016-01-20 | 3 | -5/+23 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-20 | 2 | -2/+32 |
| |/ |/| | |||||
* | | Merge pull request #21744 from owncloud/scrutinizer-patch-1 | Thomas Müller | 2016-01-19 | 4 | -2/+8 |
|\ \ | | | | | | | Scrutinizer Auto-Fixes | ||||
| * | | Scrutinizer Auto-Fixes | Scrutinizer Auto-Fixer | 2016-01-15 | 4 | -2/+8 |
| | | | | | | | | | | | | This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com | ||||
* | | | properly use standard | Morris Jobke | 2016-01-19 | 1 | -1/+1 |
| | | | | | | | | | | | | * JEDEC standard - https://en.wikipedia.org/wiki/JEDEC_memory_standards#Unit_prefixes_for_semiconductor_storage_capacity | ||||
* | | | [Share 2.0] Share Object creation is a fragile thing | Roeland Jago Douma | 2016-01-18 | 2 | -13/+84 |
| | | | | | | | | | | | | | | | | | | | | | * We can't assume that the file still exists * We can't assume that the user/group still exists Basically we do not always nicely cleanup shares. | ||||
* | | | Merge pull request #21519 from owncloud/propagate-folder-size | Thomas Müller | 2016-01-18 | 3 | -5/+18 |
|\ \ \ | |_|/ |/| | | propagate folder size in the same query for write updates | ||||
| * | | propagate folder size in the same query for write updates | Robin Appelman | 2016-01-15 | 3 | -5/+18 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-18 | 2 | -0/+22 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-01-17 | 6 | -0/+12 |
| | | | |||||
* | | | Merge pull request #21705 from owncloud/improve-background-job-message | Thomas Müller | 2016-01-15 | 3 | -2/+15 |
|\ \ \ | |/ / |/| | | Improve background job error message | ||||
| * | | Add message key to context of logException | Thomas Müller | 2016-01-15 | 3 | -3/+15 |
| | | | |||||
| * | | use logException() to properly log the exception | Morris Jobke | 2016-01-14 | 1 | -1/+2 |
| | | | |||||
| * | | Improved error message for failing background job | Morris Jobke | 2016-01-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #21730 from owncloud/fix-install-of-shipped-apps | Thomas Müller | 2016-01-15 | 1 | -9/+22 |
|\ \ \ | | | | | | | | | Fix installation of shipped apps |