summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #24256 from owncloud/scanner-propagateMorris Jobke2016-04-262-0/+40
|\
| * triger the propagator from the command line scannerRobin Appelman2016-04-252-0/+40
* | Merge pull request #24262 from owncloud/fix-24228Morris Jobke2016-04-261-1/+2
|\ \
| * | check whether index is set before using itArthur Schiwon2016-04-251-1/+2
* | | Merge pull request #24199 from owncloud/ocp-repairMorris Jobke2016-04-2635-199/+369
|\ \ \
| * | | Introduce OCP\Migration\IRepairStep and adopt all repair steps to this new in...Thomas Müller2016-04-2535-199/+369
* | | | Merge pull request #24268 from owncloud/search_psr4Thomas Müller2016-04-265-0/+0
|\ \ \ \
| * | | | Move \OC\Search to PSR-4Roeland Jago Douma2016-04-265-0/+0
* | | | | Merge pull request #24266 from owncloud/mimetypealiasesRoeland Douma2016-04-261-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | correct occ command for mimetypealiasesCarla Schroder2016-04-251-1/+1
|/ / / /
* | | | Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicatorThomas Müller2016-04-251-0/+11
|\ \ \ \
| * | | | LDAP Wizard: reset connection status indicator when switching LDAP configArthur Schiwon2016-04-251-0/+11
| | |_|/ | |/| |
* | | | Merge pull request #22783 from patelfenil/bugfix-issue-17320Thomas Müller2016-04-251-2/+9
|\ \ \ \
| * | | | Remove image now not coming when user changes fullname. Fixes #17320patelfenil2016-03-071-2/+9
* | | | | Merge pull request #22648 from owncloud/propagate-singleThomas Müller2016-04-258-29/+56
|\ \ \ \ \
| * | | | | do propagation in a single queryRobin Appelman2016-04-258-29/+56
| | |/ / / | |/| | |
* | | | | Merge pull request #24264 from owncloud/route_psr4Lukas Reschke2016-04-253-0/+0
|\ \ \ \ \
| * | | | | Move \OC\Route to PSR-4Roeland Jago Douma2016-04-253-0/+0
| | |_|_|/ | |/| | |
* | | | | Merge pull request #24251 from owncloud/fix-mailerRoeland Douma2016-04-252-3/+8
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix the syntax and methods in the sampleJoas Schilling2016-04-251-3/+4
| * | | | Allow automatic dependency injection for OCP\Mail\MailerJoas Schilling2016-04-251-0/+4
| | |_|/ | |/| |
* | | | Merge pull request #24244 from owncloud/mount-uniqueVincent Petry2016-04-252-2/+22
|\ \ \ \ | |_|/ / |/| | |
| * | | add testRobin Appelman2016-04-251-0/+11
| * | | don't get the config for the same mount multiple timesRobin Appelman2016-04-251-2/+11
* | | | Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditionsThomas Müller2016-04-256-48/+32
|\ \ \ \
| * | | | Fix LDAP race conditionsMorris Jobke2016-04-206-48/+32
* | | | | Merge pull request #24248 from owncloud/d--j-masterThomas Müller2016-04-255-10/+34
|\ \ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/d--j/core into d--j-masterThomas Müller2016-04-255-10/+34
| |\ \ \ \ \
| | * | | | | Call private cache methods only for `OC\Files\Cache\Cache`Daniel Jagszent2016-04-155-10/+34
* | | | | | | Merge pull request #24247 from owncloud/weits-patch-1Thomas Müller2016-04-251-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Merge branch 'patch-1' of https://github.com/weits/core into weits-patch-1Thomas Müller2016-04-251-1/+1
|/| | | | | |
| * | | | | | solves problem with moving files via WebDAVPetr Svoboda2016-04-191-1/+1
* | | | | | | Merge pull request #24205 from owncloud/scanner-lockingThomas Müller2016-04-251-0/+2
|\ \ \ \ \ \ \
| * | | | | | | add locks in the scanner to prevent multiple scanners running on the same filesRobin Appelman2016-04-251-0/+2
* | | | | | | | Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statementThomas Müller2016-04-251-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing use statementJoas Schilling2016-04-251-0/+1
| | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | Merge pull request #24231 from owncloud/updater_psr4Thomas Müller2016-04-251-0/+0
|\ \ \ \ \ \ \ \
| * | | | | | | | Move \OC\Updater to PSR-4Roeland Jago Douma2016-04-251-0/+0
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #24230 from owncloud/you-form-of-activitiesLukas Reschke2016-04-251-0/+35
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Translate the current user with "You ..."Joas Schilling2016-04-251-0/+35
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-loginVincent Petry2016-04-252-11/+3
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | on clone Connection, do not take over the existing LDAP resourceArthur Schiwon2016-04-222-11/+3
* | | | | | | Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_appBjörn Schießle2016-04-2531-53/+263
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | move federated sharing settings to the federatedfilesharing appBjörn Schießle2016-04-2231-53/+263
* | | | | | | Merge pull request #24226 from owncloud/files_psr4Thomas Müller2016-04-2565-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Move \OC\Files to PSR-4Roeland Jago Douma2016-04-2465-0/+0
* | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2510-4/+10
|/ / / / / / /
* | | | | | | Merge pull request #24213 from owncloud/systemtag_psr4Lukas Reschke2016-04-244-0/+0
|\ \ \ \ \ \ \
| * | | | | | | Move \OC\SystemTag to PSR-4Roeland Jago Douma2016-04-224-0/+0
| | |/ / / / / | |/| | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2454-90/+268