summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
| | |/ | |/|
* | | Merge pull request #25886 from owncloud/stable9.1-init-filesconfigVincent Petry2016-08-221-0/+4
|\ \ \ | |/ / |/| | [stable9.1] Make sure file list files config always exists
| * | Make sure file list files config always existsVincent Petry2016-08-221-0/+4
|/ / | | | | | | Initialize files config with defaults in case none was passed
* | Display number of hidden files in files summary (#25877)Vincent Petry2016-08-194-52/+230
| | | | | | | | When dot files are hidden, the table summary and selection summary will not show how many hidden files were included.
* | Fix hidden files handling (#25865)Vincent Petry2016-08-194-31/+82
| | | | | | | | | | | | Hidden files (dot files) are now always rendered in the DOM to make sure that all file operations and selection still work as expected. Their visibility is now toggled on CSS level.
* | Hide the LDAP password in the client side (#25872)Juan Pablo Villafañez2016-08-194-7/+25
|/ | | | | | | Connection checks will be done by using the configuration id, with the stored password. LDAP password won't be sent to the client. Conflicts: apps/user_ldap/ajax/testConfiguration.php
* [stable9.1] Move over to new CalDAVTester repo (#25859) (#25863)Thomas Müller2016-08-192-12/+12
| | | | | * Move over to new caldac tester repo * no run.py anymore
* Merge pull request #25860 from ↵Vincent Petry2016-08-191-1/+4
|\ | | | | | | | | owncloud/stable9.1-aedae12db5ebfaf56bec91b736fb8a569cecf16f [stable9.1] In cases where the server dictates the link share expirat…
| * [stable9.1] In cases where the server dictates the link share expiration the ↵Thomas Müller2016-08-191-1/+4
|/ | | | date is not updated on consequitive changes and enable/disable actions
* 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
| | | | | | * Take from https://github.com/nextcloud/server/pull/608/commits/351cab6bce41b53f9efd4ba9aed4e7435f843691 - THX @schiessle * Fix unit tests
* Merge pull request #25849 from owncloud/stable9.1-fixtypoVincent Petry2016-08-181-1/+1
|\ | | | | [stable9.1] fix typo
| * fix typoJörn Friedrich Dreyer2016-08-181-1/+1
| |
* | Merge pull request #25837 from owncloud/stable9.1_nobodyifnocontentVincent Petry2016-08-181-5/+11
|\ \ | |/ |/| [stable9.1] 204 and 304 must not have a body, see https://tools.ietf.org/html/rfc7230#section-3.3
| * 204 and 304 must not have a body, see ↵Jörn Friedrich Dreyer2016-08-171-5/+11
| | | | | | | | https://tools.ietf.org/html/rfc7230#section-3.3
* | Merge pull request #25845 from owncloud/stable9.1-remove_reference_magicVincent Petry2016-08-181-4/+4
|\ \ | | | | | | [stable9.1] remove reference magic
| * | remove reference magicJörn Friedrich Dreyer2016-08-171-4/+4
| |/
* | Merge pull request #25841 from ↵Vincent Petry2016-08-172-42/+74
|\ \ | |/ |/| | | | | owncloud/stable9.1-fix-unmerged-shares-repair-betterregexp [stable9.1] Improve regexp to detect duplicate folders when repairing unmerged shares
| * 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
|\ | | | | [stable9.1] Disable NFD encoding wrapper by default
| * Disable NFD encoding wrapper by defaultVincent Petry2016-08-161-1/+1
| | | | | | | | | | Seems I forgot to set it back to false after testing. Will give a performance boost for all storages.
* | Merge pull request #25812 from ↵Vincent Petry2016-08-172-12/+151
|\ \ | | | | | | | | | | | | owncloud/stable9.1-fix-unmerged-shares-repair-targetdecision [stable9.1] Fix unmerged shares repair targetdecision
| * | Fix unmerged shares repair with mixed group and direct sharesVincent Petry2016-08-162-4/+57
| | | | | | | | | | | | | | | | | | | | | Whenever a group share is created after a direct share, the stime order needs to be properly considered in the repair routine, considering that the direct user share is appended to the $subShares array and breaking its order.
| * | Improve file_target finding logic when repairing unmerged sharesVincent Petry2016-08-162-10/+96
| | | | | | | | | | | | | | | | | | | | | Pick the most recent subshare that has no parenthesis from duplication which should match whichever name the user picked last. If all subshares have duplicate parenthesis names, use the least recent group share's target instead.
* | | Merge pull request #25811 from owncloud/stable9.1-smb-traceVincent Petry2016-08-161-67/+211
|\ \ \ | |_|/ |/| | [stable9.1] add conditional smb trace logging for debug purposes
| * | add conditional smb trace logging for debug purposesJörn Friedrich Dreyer2016-08-161-67/+211
| |/
* | Merge pull request #25776 from ↵Vincent Petry2016-08-161-5/+9
|\ \ | | | | | | | | | | | | owncloud/stable9.1-eaecf0cfa9094eb5224e568b7bdde1bd49cfad73 [stable9.1] Merge pull request #25652 from owncloud/fix-getQuota-on-null
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-04 06:03:11 +0000