summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [stable9.1] Revert invalid commits from master->stable9.1 merge (#25420)Vincent Petry2016-07-08133-274/+242
* [stable9.1] Set content type when downloading log file to force download in s...Thomas Müller2016-07-082-0/+4
* [stable9.1] Use named parameter instead of direct value for system tags searc...Thomas Müller2016-07-071-1/+1
* Bypass upgrade page when occ controller is requested (#25366)VicDeo2016-07-060-0/+0
* Cap LDAP user cache (#25326)Jörn Friedrich Dreyer2016-07-060-0/+0
* Merge pull request #25374 from owncloud/stable9.1-147c672f5866002d45ec68e99e3...Vincent Petry2016-07-062-0/+39
|\
| * Ignore invalid paths in the JS file list (#25368)Vincent Petry2016-07-062-0/+39
|/
* Files_Versions don't show when the files are erasedCarlos Damken2016-07-051-3/+3
* Merge branch 'stable9.1' of https://github.com/owncloud/coreCarlos Damken2016-07-050-0/+0
|\
| * Merge pull request #25347 from owncloud/fix-ldap-check-user-stable9.1Vincent Petry2016-07-051-0/+4
| |\
| | * check if renamed user is still valid by reapplying the ldap filter (#25338)felixboehm2016-07-041-0/+4
| |/
| * Merge pull request #25315 from owncloud/stable9.1-search-preventinfiniteloopVincent Petry2016-07-011-2/+5
| |\
| | * Prevent infinite loop in search auto-nextpageVincent Petry2016-06-301-2/+5
| |/
* | Merge pull request #25356 from owncloud/checkupgrade-bypassVincent Petry2016-07-051-3/+15
|\ \
| * | Bypass upgrade page when occ controller is requestedVictor Dubiniuk2016-07-051-3/+15
* | | Merge pull request #25344 from owncloud/fix-ldap-check-userVincent Petry2016-07-051-0/+4
|\ \ \
| * | | check if renamed user is still valid by reapplying the ldap filter (#25338)felixboehm2016-07-041-0/+4
* | | | fix swift primary object store test (#25281)Thomas Müller2016-07-054-2/+59
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-07-0518-12/+160
| |/ / |/| |
* | | Merge pull request #25240 from owncloud/remove-svgMorris Jobke2016-07-04124-185/+56
|\ \ \
| * | | adjusts tests to removal of svg fallbackHendrik Leppelsack2016-07-011-38/+1
| * | | remove svg classesHendrik Leppelsack2016-07-0115-35/+35
| * | | remove png references in coreHendrik Leppelsack2016-07-013-18/+11
| * | | remove png actions, fileicons, etcHendrik Leppelsack2016-07-01105-0/+0
| * | | remove javascript png fallback for svgHendrik Leppelsack2016-07-011-94/+9
* | | | Merge pull request #25253 from owncloud/users-fixotherquotadropdownVincent Petry2016-07-041-3/+15
|\ \ \ \
| * | | | Prevent negative or non-number values in quota inputVincent Petry2016-06-241-0/+6
| * | | | Fix "Other" value handling in quota dropdown in users pageVincent Petry2016-06-231-3/+9
* | | | | Merge pull request #25314 from owncloud/files_external-backends-configVincent Petry2016-07-041-3/+18
|\ \ \ \ \
| * | | | | show configuration options for authentication backends while listing storageRobin Appelman2016-06-301-0/+4
| * | | | | hide hidden parameters from list backend/auth parametersRobin Appelman2016-06-301-3/+14
* | | | | | 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 stringv9.1.0RC1Daniel Molkentin2016-06-291-1/+1