summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Backport #26087 to stable9.1 (#26230)RealRancor2016-09-271-1/+1
* [stable9.1] Translate file summary connector (#26221) (#26222)Thomas Müller2016-09-271-2/+4
* [stable9.1] Change the minimum log level to fatal (#26213) (#26215)Thomas Müller2016-09-271-1/+1
* [stable9.1] In case the build on master or any release branch fails an email ...Thomas Müller2016-09-211-0/+7
* Merge pull request #26148 from owncloud/stable9.1-c97f24efbaec7756667368568b0...Vincent Petry2016-09-202-0/+44
|\
| * [stable9.1] Redirect to challenge page when only one 2FA provider (#26141)Vincent Petry2016-09-192-0/+44
* | [stable9.1] Fix mimetype detection inside hidden folders (#26138) (#26151)Thomas Müller2016-09-202-2/+6
* | Allow uploading empty files (#26135)Vincent Petry2016-09-191-4/+0
* | Final 9.1.1 in version.phpv9.1.1Vincent Petry2016-09-191-2/+2
|/
* 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
* 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
|\
| * Prefilter inaccessible shares in DefaultShareProvider::getSharedWith()Vincent Petry2016-09-072-31/+195
* | Merge pull request #26041 from owncloud/stable9.1-fed-share-retryVincent Petry2016-09-072-7/+23
|\ \
| * | Fix fed share test call to return proper resultVincent Petry2016-09-072-7/+23
| |/
* | Merge pull request #26048 from owncloud/stable9.1-cath-needs-upgrade-non-cliVincent Petry2016-09-071-0/+6
|\ \ | |/ |/|
| * Pass web requests to occ controller if upgrade is neededVictor Dubiniuk2016-09-061-0/+6
* | Merge pull request #26043 from owncloud/stable9.1-d17a7ff32a38804d9e6cfbc7dde...Vincent Petry2016-09-072-29/+22
|\ \ | |/ |/|
| * [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
|\ \ | |/ |/|
| * Allow increasing permissions for share ownerVincent Petry2016-09-062-1/+109
|/
* 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 owncloud/stable9.1-integration_tests_local_ext...Vincent Petry2016-08-316-6/+91
|\
| * 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
| * Added local_storage folderSergio Bertolín2016-08-301-0/+4
| * Run as current userSergio Bertolin2016-08-301-1/+2
| * Removed extra context added needed option and remove storage after external s...Sergio Bertolin2016-08-303-26/+1
| * Added feature and context, not working yet, option to allow sharing needs to ...Sergio Bertolin2016-08-302-0/+50
| * Creating the folder when the tests runSergio Bertolín2016-08-302-0/+36
| * Add integration test for sharing with group, then user in groupVincent Petry2016-08-301-0/+15
|/
* 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
|\
| * 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
* Merge pull request #25929 from owncloud/stable9.1-integration-tests-subadminsVincent Petry2016-08-262-0/+80
|\
| * 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
|\
| * Users page lazy multiselect group dropdownsVincent Petry2016-08-247-119/+143
|/
* Merge pull request #25914 from owncloud/stable9.1-4f73fb491a2bf12dbf4d20964cf...Vincent Petry2016-08-244-0/+263
|\
| * [stable9.1] Add occ command to expire the trashbin (#25878)Thomas Müller2016-08-234-0/+263
* | [stable9.1] 2FA can now be enabled and disabled via the provisioning api (#25...Thomas Müller2016-08-233-164/+218
|/