summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Set version to 9.1.2 RC1v9.1.2RC1Vincent Petry2016-10-191-2/+2
* Merge pull request #26408 from owncloud/stable9.1-e65648515b31688474b2d5e6a07...Vincent Petry2016-10-191-2/+2
|\
| * [stable9.1] Set version to 0.2.7 to trigger setup of background jobThomas Müller2016-10-191-1/+1
| * [stable9.1] Use correct name for background jobsThomas Müller2016-10-191-1/+1
|/
* Merge pull request #26402 from owncloud/upgrade_group_skip_missingVincent Petry2016-10-191-14/+24
|\
| * Fix minor typoJuan Pablo Villafáñez2016-10-191-1/+1
| * Skip over missing groupsJuan Pablo Villafáñez2016-10-191-14/+24
* | Merge pull request #26399 from owncloud/stable9.1-userssetup-check-orderVincent Petry2016-10-191-8/+18
|\ \ | |/ |/|
| * Fix initMountPoints to set usersSetup earlierVincent Petry2016-10-191-8/+18
* | Merge pull request #26390 from owncloud/stable9.1-group-etagpropagation-testVincent Petry2016-10-182-2/+24
|\ \ | |/ |/|
| * Fix post_unshareFromSelf hook parameter formatVincent Petry2016-10-172-2/+24
* | Merge pull request #26271 from owncloud/stable9.1-initmountpoints-userid-casingVincent Petry2016-10-189-10/+165
|\ \ | |/ |/|
| * Add using casing check/fix for initMountPointsVincent Petry2016-10-189-10/+165
* | Merge pull request #26322 from owncloud/stable9.1-9eef6e5bf9509666f26553c363b...Vincent Petry2016-10-173-13/+37
|\ \
| * | PHP 5.4 compliantThomas Müller2016-10-131-1/+1
| * | [stable9.1] Merge pull request #26295 from owncloud/analyse-dependencies-on-a...Vincent Petry2016-10-133-14/+38
* | | [stable9.1] Allow php 5.3 syntax in index.php so that the proper error can be...Thomas Müller2016-10-131-4/+4
|/ /
* | Merge pull request #26329 from owncloud/stable9.1-3081d0f4fcb33e102e8ed013dec...Vincent Petry2016-10-139-118/+183
|\ \
| * | Fix testThomas Müller2016-10-121-0/+1
| * | Fix the tests for 9.1Thomas Müller2016-10-122-2/+3
| * | [stable9.1] Add missing unit tests (#25936)Thomas Müller2016-10-127-116/+179
|/ /
* | Backport #26316 to stable9.1 (#26348)RealRancor2016-10-121-0/+7
* | Merge pull request #26327 from owncloud/stable9.1-fa711834a18eaae6706a49885d0...Vincent Petry2016-10-111-0/+2
|\ \
| * | [stable9.1] fix issue #23600 - mail invites through v1 webdav (#26188)Claudemir Todo Bom2016-10-101-0/+2
* | | Merge pull request #26328 from owncloud/stable9.1-fc98aa93ac3a79bbc2e60fc4a69...Vincent Petry2016-10-117-64/+31
|\ \ \
| * | | [stable9.1] Don't parse info.xml but reuse already cached app infos - fixes #...Thomas Müller2016-10-107-64/+31
| |/ /
* | | Merge pull request #26331 from owncloud/stable9.1-b569564fcc1aba85dce6446dc67...Vincent Petry2016-10-114-4/+4
|\ \ \
| * | | [stable9.1] forum.owncloud.org -> central.owncloud.org (#25644)RealRancor2016-10-104-4/+4
| |/ /
* | | Merge pull request #26334 from owncloud/stable9.1-2c4c56c69b1c8e1bf3b3f1abbb4...Vincent Petry2016-10-113-11/+68
|\ \ \
| * | | [stable9.1] Return ETag and OC-ETag in case of a move (#25683)Thomas Müller2016-10-103-11/+68
| |/ /
* | | Merge pull request #26340 from owncloud/stable9.1-36d6f3ba8b7b7db8f4d8b2a7050...Vincent Petry2016-10-116-8/+10
|\ \ \
| * | | [stable9.1] Escape special characters (#25429)Aaron Wood2016-10-116-8/+10
| | |/ | |/|
* | | Merge pull request #26341 from owncloud/ldap_command_updategroup_stable91Vincent Petry2016-10-112-0/+221
|\ \ \ | |/ / |/| |
| * | New command to update group mappingsJuan Pablo Villafáñez2016-10-112-0/+221
* | | Tear down FS after user update in CardDAV sync job (#26320)Vincent Petry2016-10-101-0/+2
| |/ |/|
* | [stable9.1] Fix logClientIn for non-existing users (#26292) (#26307)Thomas Müller2016-10-102-0/+29
* | Merge pull request #26309 from owncloud/stable9.1-0f6a5aac7c4a770d45f9a2a36f9...Vincent Petry2016-10-101-1/+1
|\ \
| * | [stable9.1] Improve user list rendering perf by not resorting after every add...Vincent Petry2016-10-071-1/+1
|/ /
* | Merge pull request #26277 from owncloud/stable9.1-backport26031Vincent Petry2016-10-054-19/+28
|\ \
| * | Use classname with namespace to inject dependencies automatically (#26105)VicDeo2016-10-042-13/+1
| * | Allow one more origin. Log the reason of occ controller failure (#26031)VicDeo2016-10-042-6/+27
| |/
* | Merge pull request #26272 from owncloud/stable9.1-11c30fce0ab0a49919f968a1efc...Vincent Petry2016-10-054-4/+37
|\ \
| * | [stable9.1] Changed request to not add a prefix to the url (#26256)Sergio Bertolín2016-10-044-4/+37
| |/
* | Merge pull request #26274 from owncloud/stable9.1-integration-tests-issue-26182Vincent Petry2016-10-041-0/+13
|\ \ | |/ |/|
| * Removed cases not belonging to this PRSergio Bertolin2016-10-041-18/+0
| * Added sharing again an own file while belonging to a group scenario to stable9.1Sergio Bertolin2016-10-041-0/+31
|/
* Tear down FS between cron jobs (#26223)Vincent Petry2016-09-301-0/+2
* [stable9.1] Merge pull request #25636 from owncloud/fix-birthday-calendar-com...Thomas Müller2016-09-304-2/+77
* [stable9.1] Unset user PHOTO before setting new one in OCA\DAV\CardDAV\Conver...Thomas Müller2016-09-301-0/+1
* Backport #26236 to stable9.1 (#26240)RealRancor2016-09-281-1/+1