summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | always use an LDAP URL when connecting to LDAPArthur Schiwon2016-01-114-18/+178
|/ /
* | Merge pull request #21614 from owncloud/fix_21598_8.2Morris Jobke2016-01-112-16/+69
|\ \
| * | only use master key ID if a user is logged in. Otherwise keep the public link...Björn Schießle2016-01-112-16/+69
|/ /
* | Merge pull request #21611 from owncloud/stable8.2-users-dropdownscrollMorris Jobke2016-01-111-0/+5
|\ \
| * | Fix users list dropdown position after scrollVincent Petry2016-01-111-0/+5
|/ /
* | Merge pull request #21565 from owncloud/ext-smb-dep-stable8.2Morris Jobke2016-01-111-2/+4
|\ \
| * | Check libsmbclient-php as well as smbclient binaryRobin McCorkell2016-01-091-2/+4
* | | Merge pull request #21585 from owncloud/bakport-21575Vincent Petry2016-01-111-3/+1
|\ \ \
| * | | Use ISession::clearLukas Reschke2016-01-101-3/+1
| |/ /
* | | Merge pull request #21603 from owncloud/backport-21548-correctly-display-noti...Vincent Petry2016-01-112-2/+9
|\ \ \ | |/ / |/| |
| * | Check the correct config for displaying the "notify by email" optionJoas Schilling2016-01-112-2/+9
|/ /
* | Merge pull request #21539 from endocode/kayrus/cookies_auth_fixThomas Müller2016-01-081-1/+4
|\ \
| * | Fixed double file upload on failed auth using WebDAVkayrus2016-01-081-1/+4
| |/
* | Merge pull request #21118 from owncloud/makeurltypeconfigurableThomas Müller2016-01-082-2/+9
|\ \
| * | add isset for optional paramsJörn Friedrich Dreyer2016-01-071-2/+3
| * | make url type configurableJörn Friedrich Dreyer2015-12-102-1/+7
* | | Merge pull request #21265 from owncloud/backport20996-remove-password-resetMorris Jobke2016-01-055-6/+33
|\ \ \
| * | | Fix missing import of IUserJoas Schilling2016-01-051-1/+1
| * | | Check if user isset in $_REQUEST firstRobin Appelman2015-12-171-3/+5
| * | | Allow specifying a custom reset-password-urlJoas Schilling2015-12-174-7/+22
| * | | Remove password reset when the user can not change the passwordJoas Schilling2015-12-172-2/+12
* | | | Merge pull request #21441 from owncloud/fix-dutch-typoThomas Müller2016-01-042-3/+3
|\ \ \ \
| * | | | Fix the markup for the dutch translationJoas Schilling2016-01-042-3/+3
* | | | | Merge pull request #21439 from owncloud/backport-21289-retain-background-jobsMorris Jobke2016-01-042-3/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix the test to expect the new behaviourJoas Schilling2016-01-041-2/+9
| * | | | Do not delete background jobs, in case an exception occuredJoas Schilling2016-01-041-1/+0
|/ / / /
* | | | Merge pull request #21391 from owncloud/stable8.2-backport-undefined-user-agentThomas Müller2015-12-292-8/+28
|\ \ \ \
| * | | | Fix undefined HTTP_USER_AGENTThomas Müller2015-12-292-8/+28
|/ / / /
* | | | Merge pull request #21262 from owncloud/backport-21260-stable8.2Vincent Petry2015-12-241-3/+1
|\ \ \ \
| * | | | initialize l10n instance earlier, fixes an undefined var warning followed by ...Arthur Schiwon2015-12-171-3/+1
| |/ / /
* | | | Merge pull request #21313 from owncloud/scanner-skip-not-available-82Vincent Petry2015-12-245-10/+29
|\ \ \ \
| * | | | also log exceptionRobin Appelman2015-12-211-0/+1
| * | | | Skip unavailable storages in scannerRobin Appelman2015-12-215-10/+28
| | |_|/ | |/| |
* | | | Merge pull request #21295 from owncloud/backport-21255-stable8.2Roeland Douma2015-12-231-1/+1
|\ \ \ \
| * | | | Update users.jsmichag862015-12-181-1/+1
| | |/ / | |/| |
* | | | Merge pull request #21341 from owncloud/fix-unit-tests-stable8.1Thomas Müller2015-12-231-3/+3
|\ \ \ \
| * | | | Fix unit testsLukas Reschke2015-12-221-3/+3
|/ / / /
* | | | Merge pull request #21261 from owncloud/stable8.2-backport-21244Morris Jobke2015-12-221-16/+0
|\ \ \ \
| * | | | enforce_home_folder_naming_rule cannot be configured in config.phpblizzz2015-12-171-16/+0
| |/ / /
* | | | Merge pull request #21274 from owncloud/stable82_20884Morris Jobke2015-12-221-1/+3
|\ \ \ \
| * | | | [Sharing] Respect disabled incoming federated sharesRoeland Jago Douma2015-12-181-1/+3
| |/ / /
* | | | Merge pull request #21234 from owncloud/stable8.2-backport-21232Morris Jobke2015-12-222-1/+42
|\ \ \ \ | |_|/ / |/| | |
| * | | add unit test for #21230Morris Jobke2015-12-161-0/+41
| * | | Use name of ICollection for exception messageMorris Jobke2015-12-161-1/+1
| |/ /
* | | 8.2.2v8.2.2C Montero-Luque2015-12-211-2/+2
* | | 8.2.2 RC2C Montero-Luque2015-12-181-2/+2
|/ /
* | 8.2.2 RC1v8.2.2RC1C Montero-Luque2015-12-152-3/+3
* | Merge pull request #21197 from owncloud/backport-21133-stable8.2Vincent Petry2015-12-154-9/+203
|\ \
| * | throw NoUserException in getHome when the requested user does not exist anymoreArthur Schiwon2015-12-144-9/+203
* | | Merge pull request #21211 from owncloud/stable8.2-handle-enforce-home-folder-...Vincent Petry2015-12-152-2/+7
|\ \ \