summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Change nickvergessen mailmap entry (#25349)Joas Schilling2016-07-041-1/+2
* Cap LDAP user cache (#25323)Jörn Friedrich Dreyer2016-07-041-13/+15
* [tx-robot] updated from transifexJenkins for ownCloud2016-07-0438-22/+278
* [tx-robot] updated from transifexJenkins for ownCloud2016-07-0320-14/+86
* [tx-robot] updated from transifexJenkins for ownCloud2016-07-0224-2/+150
* Merge pull request #25262 from owncloud/fed-sharing-errorVincent Petry2016-07-013-28/+93
|\
| * Log reason why we removed the fed shareRobin Appelman2016-06-271-0/+1
| * Handle exceptions thrown while trying to notify remote server of a fed shareRobin Appelman2016-06-272-27/+91
| * better detect errors in fed sharing responseRobin Appelman2016-06-241-1/+1
* | Merge pull request #25276 from owncloud/delete-own-session-tokenVincent Petry2016-07-013-12/+70
|\ \
| * | prevent users from deleting their own session tokenChristoph Wurst2016-06-283-12/+70
* | | Add all properties while creating a subscription (#25318)Thomas Citharel2016-07-012-11/+22
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-018-0/+126
* | | Merge pull request #25304 from owncloud/local-karmaVincent Petry2016-06-301-13/+1
|\ \ \
| * | | always use local karmaHendrik Leppelsack2016-06-291-13/+1
* | | | Merge pull request #25310 from owncloud/search-preventinfiniteloopVincent Petry2016-06-301-2/+5
|\ \ \ \
| * | | | Prevent infinite loop in search auto-nextpageVincent Petry2016-06-301-2/+5
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-308-2/+32
* | | | fix version stringDaniel Molkentin2016-06-291-1/+1
* | | | 9.1.0 RC 1Daniel Molkentin2016-06-291-2/+2
* | | | Various database migration fixes (#25209)Thomas Müller2016-06-2912-4/+1692
* | | | Merge pull request #25288 from owncloud/fix-versionrevertpermsVincent Petry2016-06-294-2/+78
|\ \ \ \
| * | | | Hide revert button when no permission to revertVincent Petry2016-06-284-2/+78
| | |/ / | |/| |
* | | | get only vcards which match both the address book id and the vcard uri (#25294)Björn Schießle2016-06-292-1/+5
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-2944-10/+486
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-28148-138/+686
* | | Fix getting the certificate bundle for dav external storage (#25274)Robin Appelman2016-06-272-2/+7
* | | Login hooks (#25260)Christoph Wurst2016-06-272-41/+65
* | | handle unavailable fed shares while testing for availability (#25277)Robin Appelman2016-06-272-5/+20
* | | fix a ImageExportPlugin Test (#25215)Georg Ehrke2016-06-272-8/+15
* | | Merge pull request #25273 from owncloud/ext-fixsessioncredentialsnolazyloadVincent Petry2016-06-271-0/+4
|\ \ \
| * | | Quickfix: do not lazy load auth mechanisms for ext storagesVincent Petry2016-06-271-0/+4
* | | | Merge pull request #25237 from owncloud/search-filelistnextpageresultsVincent Petry2016-06-272-4/+29
|\ \ \ \
| * | | | Prerender file list pages to include search resultsVincent Petry2016-06-242-4/+29
| | |_|/ | |/| |
* | | | Merge pull request #25261 from owncloud/app-password-login-nameVincent Petry2016-06-274-2/+28
|\ \ \ \
| * | | | fix layoutChristoph Wurst2016-06-243-6/+24
| * | | | show which login name to use for the new app passwordChristoph Wurst2016-06-243-0/+8
| |/ / /
* | | | Merge pull request #25263 from owncloud/decryptall-keepencryptionenabledforsi...Christoph Wurst2016-06-271-0/+3
|\ \ \ \
| * | | | Keep encryption enabled if decrypting for single userVincent Petry2016-06-241-0/+3
| |/ / /
* | | | Merge pull request #25250 from owncloud/linkshare-includedeletewithuploadpermsVincent Petry2016-06-2710-45/+214
|\ \ \ \
| * | | | Repair step to adjust link share delete permissionsVincent Petry2016-06-243-1/+111
| * | | | Add explicit delete permission to link sharesVincent Petry2016-06-247-44/+103
* | | | | Merge pull request #25258 from owncloud/integritycheck-whennotinstalledVincent Petry2016-06-271-3/+12
|\ \ \ \ \
| * | | | | Make code integrity check work when OC is not installed yetVincent Petry2016-06-241-3/+12
* | | | | | Merge pull request #25252 from owncloud/authtoken-removetooltipondisconnectMorris Jobke2016-06-271-0/+2
|\ \ \ \ \ \
| * | | | | | Remove tooltip when disconnecting tokenVincent Petry2016-06-231-0/+2
* | | | | | | Merge pull request #25129 from owncloud/remove-ieVincent Petry2016-06-2710-203/+11
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | remove ie8+9 supportHendrik Leppelsack2016-06-2310-203/+11
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #25247 from owncloud/fed-unshare-failVincent Petry2016-06-271-2/+2
|\ \ \ \ \ \
| * | | | | | Remove a fed share from the local table before trying to notify the remote se...Robin Appelman2016-06-231-2/+2
| |/ / / / /