summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Increased version for 9.1.1 RC3v9.1.1RC3Vincent Petry2016-09-131-2/+2
|
* Improve chunk upload AssemblyStream performance (#26062) (#26072)Vincent Petry2016-09-092-11/+94
|
* Only use realpath for real directories (#26060)Vincent Petry2016-09-081-1/+6
| | | | | | | In some cross-local-storage use cases, the Local storage is instantiated with "/" as data directory. In such cases, calling realpath() would cause PHP warnings when open_basedir is set. This fix bypasses the realpath() call when dealing with a root storage.
* Increase version for 9.1.1RC2v9.1.1RC2Vincent Petry2016-09-071-2/+2
|
* Merge pull request #26050 from owncloud/stable9.1-prefilter-inaccessible-sharesVincent Petry2016-09-072-31/+195
|\ | | | | [stable9.1] Prefilter inaccessible shares in DefaultShareProvider::getSharedWith()
| * Prefilter inaccessible shares in DefaultShareProvider::getSharedWith()Vincent Petry2016-09-072-31/+195
| | | | | | | | | | | | | | | | | | The DefaultShareProvider now does a DB-level check to find out whether file_source is accessible at all (deleted file) or whether it's in the trashbin of a home storage. One small corner case where the home storage id is in md5 form cannot be covered properly with this approach.
* | Merge pull request #26041 from owncloud/stable9.1-fed-share-retryVincent Petry2016-09-072-7/+23
|\ \ | | | | | | [stable9.1] Fix fed share test call to return proper result
| * | Fix fed share test call to return proper resultVincent Petry2016-09-072-7/+23
| |/ | | | | | | | | | | Fixes an issue where retrying a previously failed federated share would not properly reset the availability flag because the return value was undefined instead of "true".
* | Merge pull request #26048 from owncloud/stable9.1-cath-needs-upgrade-non-cliVincent Petry2016-09-071-0/+6
|\ \ | |/ |/| [Stable9.1] catch needs upgrade non cli
| * Pass web requests to occ controller if upgrade is neededVictor Dubiniuk2016-09-061-0/+6
| |
* | Merge pull request #26043 from ↵Vincent Petry2016-09-072-29/+22
|\ \ | |/ |/| | | | | owncloud/stable9.1-d17a7ff32a38804d9e6cfbc7dde36fe2f4b73c39 [stable9.1] Fix failing preview unit tests (#26039)
| * [stable9.1] Fix failing preview unit tests (#26039)Thomas Müller2016-09-062-29/+22
| |
* | Merge pull request #26045 from owncloud/stable9.1-fix-shareperms-increase-ownerVincent Petry2016-09-062-1/+109
|\ \ | |/ |/| [stable9.1] Allow increasing permissions for share owner
| * Allow increasing permissions for share ownerVincent Petry2016-09-062-1/+109
|/ | | | | | In some cases, the owner of the share is also recipient through a group share. The owner must still be able to increase permissions in that situation.
* forward port smbfixes (#25951)Jörn Friedrich Dreyer2016-09-062-61/+170
|
* [stable9.1] Comments field is not properly escaped (#26008) (#26009)Thomas Müller2016-09-021-1/+1
|
* Merge pull request #25987 from ↵Vincent Petry2016-08-316-6/+91
|\ | | | | | | | | owncloud/stable9.1-integration_tests_local_external_storage Stable9.1 integration tests local external storage
| * Changed enabled/disabled app in provisioning api testsSergio Bertolín2016-08-301-6/+7
| |
| * External storage was not enabled and content was not deleted before scenariosSergio Bertolín2016-08-301-0/+3
| | | | | | | | | | | | Conflicts: build/integration/features/bootstrap/BasicStructure.php build/integration/run.sh
| * Added local_storage folderSergio Bertolín2016-08-301-0/+4
| |
| * Run as current userSergio Bertolin2016-08-301-1/+2
| | | | | | | | | | Conflicts: build/integration/run.sh
| * Removed extra context added needed option and remove storage after external ↵Sergio Bertolin2016-08-303-26/+1
| | | | | | | | | | | | | | | | storage scenarios Conflicts: build/integration/features/bootstrap/BasicStructure.php build/integration/run.sh
| * Added feature and context, not working yet, option to allow sharing needs to ↵Sergio Bertolin2016-08-302-0/+50
| | | | | | | | be added
| * Creating the folder when the tests runSergio Bertolín2016-08-302-0/+36
| | | | | | | | | | | | Conflicts: build/integration/features/bootstrap/BasicStructure.php build/integration/run.sh
| * Add integration test for sharing with group, then user in groupVincent Petry2016-08-301-0/+15
|/ | | | | Add integration test for the use case where a group share exists and then the same owner creates a direct share to a user in that group.
* Allow space for federated share id search (#25981)Vincent Petry2016-08-302-1/+53
|
* Added closeCursor in SharedMount numeric id (#25979)Vincent Petry2016-08-301-0/+1
|
* Merge pull request #25948 from owncloud/stable9.1-usermountcache-orphanedshareVincent Petry2016-08-293-3/+12
|\ | | | | [stable9.1] Prevent error with orphaned shares when updating user mount cache
| * Prevent error with orphaned shares when updating user mount cacheVincent Petry2016-08-293-3/+12
|/
* Fix redirection taking care of protocol and port (#25956)VicDeo2016-08-291-1/+1
|
* [stable9.1] Don't log credentials of LoginController::tryLogin (#25902) (#25935)Thomas Müller2016-08-292-6/+45
| | | | | * Don't log credentials of LoginController::tryLogin - fixes #25895 * Don't log password in loginWithPassword
* Merge pull request #25929 from owncloud/stable9.1-integration-tests-subadminsVincent Petry2016-08-262-0/+80
|\ | | | | Stable9.1 integration tests subadmins
| * Typo in scenarioSergio Bertolín2016-08-251-1/+1
| |
| * Change of user missingSergio Bertolin2016-08-251-0/+1
| |
| * Only check the pertenence to groupsSergio Bertolin2016-08-252-4/+24
| |
| * Added testcases about adding and removing users to groups using subadminsSergio Bertolin2016-08-251-0/+59
|/
* Merge pull request #25931 from owncloud/stable9.1-users-lazydropdownwithpencilVincent Petry2016-08-247-119/+143
|\ | | | | [stable9.1] Users page lazy multiselect group dropdowns
| * Users page lazy multiselect group dropdownsVincent Petry2016-08-247-119/+143
|/ | | | | | | | | | Instead of pre-rendering all multiselects with lots of group entries, the current groups are now displayed as simple labels. Behind the labels there is a pencil icon like for other fields. When clicking the pencil icon, the dropdown will be spawned and will open itself. Upon closing of the dropdown, the label comes back with the updated selection and the dropdown is destroyed.
* Merge pull request #25914 from ↵Vincent Petry2016-08-244-0/+263
|\ | | | | | | | | owncloud/stable9.1-4f73fb491a2bf12dbf4d20964cfd0f7129f998b1 [stable9.1] Add occ command to expire the trashbin (#25878)
| * [stable9.1] Add occ command to expire the trashbin (#25878)Thomas Müller2016-08-234-0/+263
| | | | | | | | | | | | * Add occ command to expire the trashbin * Fix versions folder in setup check
* | [stable9.1] 2FA can now be enabled and disabled via the provisioning api ↵Thomas Müller2016-08-233-164/+218
|/ | | | | | | | (#25911) * [stable9.1] 2FA can now be enabled and disabled via the provisioning api * [9.1] Return proper 'true' and 'false' values for two_factor_auth_enabled in provisioning api
* Merge pull request #25906 from ↵Vincent Petry2016-08-231-0/+10
|\ | | | | | | | | owncloud/stable9.1-db60e65409e7c6d4f1bde5062af53fbad6e8b412 [stable9.1] Fix issues where some user settings cannot be loaded when…
| * [stable9.1] Fix issues where some user settings cannot be loaded when the ↵Thomas Müller2016-08-221-0/+10
| | | | | | | | user id differs in case sensitivity - fixes #25684 (#25686)
* | [stable9.1] Fix empty PATH_INFO (#25904)Thomas Müller2016-08-222-5/+26
|/
* Merge pull request #25898 from ↵Vincent Petry2016-08-222-2/+2
|\ | | | | | | | | owncloud/stable9.1-a9e633db0cd04cb6288ce74c197153920a0b4665 [stable9.1] Best practice through out the web speak of a max avatar i…
| * [stable9.1] Best practice through out the web speak of a max avatar image ↵Thomas Müller2016-08-222-2/+2
| | | | | | | | | | | | | | | | | | | | size of… (#25857) * Best practice through out the web speak of a max avatar image size of 96 pixels * Respect size argument THX @felixboehm
* | Merge pull request #25866 from ↵Vincent Petry2016-08-221-1/+3
|\ \ | | | | | | | | | | | | owncloud/stable9.1-3cebeb168023627a0e511cd9864df9372098b55e [stable9.1] 25532_issue_password_update_notification_updated (#25756)
| * | [stable9.1] 25532_issue_password_update_notification_updated (#25756)Jack Davis2016-08-191-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Password Update Notification Added an IF ELSE statement to ensure that feedback is provided to the user on successfully updating a user password in settings. * Password Update Success Message Updated the password update success message
* | | Merge pull request #25888 from ↵Vincent Petry2016-08-221-1/+26
|\ \ \ | | | | | | | | | | | | | | | | owncloud/stable9.1-27a5be96f108d4ab2b91bcd765433e1646ba9bf2 [9.1] Before a user is getting scanned the database connection is re-…
| * | | [9.1] Before a user is getting scanned the database connection is re-establ…Vincent Petry2016-08-221-1/+26
| | |/ | |/|