summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* 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
|/
* Merge pull request #25906 from owncloud/stable9.1-db60e65409e7c6d4f1bde5062af...Vincent Petry2016-08-231-0/+10
|\
| * [stable9.1] Fix issues where some user settings cannot be loaded when the use...Thomas Müller2016-08-221-0/+10
* | [stable9.1] Fix empty PATH_INFO (#25904)Thomas Müller2016-08-222-5/+26
|/
* Merge pull request #25898 from owncloud/stable9.1-a9e633db0cd04cb6288ce74c197...Vincent Petry2016-08-222-2/+2
|\
| * [stable9.1] Best practice through out the web speak of a max avatar image siz...Thomas Müller2016-08-222-2/+2
* | Merge pull request #25866 from owncloud/stable9.1-3cebeb168023627a0e511cd9864...Vincent Petry2016-08-221-1/+3
|\ \
| * | [stable9.1] 25532_issue_password_update_notification_updated (#25756)Jack Davis2016-08-191-1/+3
* | | Merge pull request #25888 from owncloud/stable9.1-27a5be96f108d4ab2b91bcd7654...Vincent Petry2016-08-221-1/+26
|\ \ \
| * | | [9.1] Before a user is getting scanned the database connection is re-establ…Vincent Petry2016-08-221-1/+26
| | |/ | |/|
* | | Merge pull request #25886 from owncloud/stable9.1-init-filesconfigVincent Petry2016-08-221-0/+4
|\ \ \ | |/ / |/| |
| * | Make sure file list files config always existsVincent Petry2016-08-221-0/+4
|/ /
* | Display number of hidden files in files summary (#25877)Vincent Petry2016-08-194-52/+230
* | Fix hidden files handling (#25865)Vincent Petry2016-08-194-31/+82
* | Hide the LDAP password in the client side (#25872)Juan Pablo Villafañez2016-08-194-7/+25
|/
* [stable9.1] Move over to new CalDAVTester repo (#25859) (#25863)Thomas Müller2016-08-192-12/+12
* Merge pull request #25860 from owncloud/stable9.1-aedae12db5ebfaf56bec91b736f...Vincent Petry2016-08-191-1/+4
|\
| * [stable9.1] In cases where the server dictates the link share expiration the ...Thomas Müller2016-08-191-1/+4
|/
* correct version string to 9.1.1 RC1v9.1.1RC1Daniel Molkentin2016-08-181-1/+1
* ownCloud Server 9.1.1 RC1Daniel Molkentin2016-08-181-2/+2
* [stable9.1] Dont decrypt shared files (#25831)Vincent Petry2016-08-182-3/+11
* Merge pull request #25849 from owncloud/stable9.1-fixtypoVincent Petry2016-08-181-1/+1
|\
| * fix typoJörn Friedrich Dreyer2016-08-181-1/+1
* | Merge pull request #25837 from owncloud/stable9.1_nobodyifnocontentVincent Petry2016-08-181-5/+11
|\ \ | |/ |/|
| * 204 and 304 must not have a body, see https://tools.ietf.org/html/rfc7230#sec...Jörn Friedrich Dreyer2016-08-171-5/+11
* | Merge pull request #25845 from owncloud/stable9.1-remove_reference_magicVincent Petry2016-08-181-4/+4
|\ \
| * | remove reference magicJörn Friedrich Dreyer2016-08-171-4/+4
| |/
* | Merge pull request #25841 from owncloud/stable9.1-fix-unmerged-shares-repair-...Vincent Petry2016-08-172-42/+74
|\ \ | |/ |/|
| * Improve regexp to detect duplicate folders when repairing unmerged sharesVincent Petry2016-08-172-42/+74
|/
* Merge pull request #25819 from owncloud/stable9.1-disable-nfd-wrapperVincent Petry2016-08-171-1/+1
|\
| * Disable NFD encoding wrapper by defaultVincent Petry2016-08-161-1/+1
* | Merge pull request #25812 from owncloud/stable9.1-fix-unmerged-shares-repair-...Vincent Petry2016-08-172-12/+151
|\ \
| * | Fix unmerged shares repair with mixed group and direct sharesVincent Petry2016-08-162-4/+57
| * | Improve file_target finding logic when repairing unmerged sharesVincent Petry2016-08-162-10/+96
* | | Merge pull request #25811 from owncloud/stable9.1-smb-traceVincent Petry2016-08-161-67/+211
|\ \ \ | |_|/ |/| |
| * | add conditional smb trace logging for debug purposesJörn Friedrich Dreyer2016-08-161-67/+211
| |/
* | Merge pull request #25776 from owncloud/stable9.1-eaecf0cfa9094eb5224e568b7bd...Vincent Petry2016-08-161-5/+9
|\ \