Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #24256 from owncloud/scanner-propagate | Morris Jobke | 2016-04-26 | 2 | -0/+40 |
|\ | |||||
| * | triger the propagator from the command line scanner | Robin Appelman | 2016-04-25 | 2 | -0/+40 |
* | | Merge pull request #24262 from owncloud/fix-24228 | Morris Jobke | 2016-04-26 | 1 | -1/+2 |
|\ \ | |||||
| * | | check whether index is set before using it | Arthur Schiwon | 2016-04-25 | 1 | -1/+2 |
* | | | Merge pull request #24199 from owncloud/ocp-repair | Morris Jobke | 2016-04-26 | 35 | -199/+369 |
|\ \ \ | |||||
| * | | | Introduce OCP\Migration\IRepairStep and adopt all repair steps to this new in... | Thomas Müller | 2016-04-25 | 35 | -199/+369 |
* | | | | Merge pull request #24268 from owncloud/search_psr4 | Thomas Müller | 2016-04-26 | 5 | -0/+0 |
|\ \ \ \ | |||||
| * | | | | Move \OC\Search to PSR-4 | Roeland Jago Douma | 2016-04-26 | 5 | -0/+0 |
* | | | | | Merge pull request #24266 from owncloud/mimetypealiases | Roeland Douma | 2016-04-26 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | correct occ command for mimetypealiases | Carla Schroder | 2016-04-25 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | Merge pull request #23726 from owncloud/ldap-wizard-improve-status-indicator | Thomas Müller | 2016-04-25 | 1 | -0/+11 |
|\ \ \ \ | |||||
| * | | | | LDAP Wizard: reset connection status indicator when switching LDAP config | Arthur Schiwon | 2016-04-25 | 1 | -0/+11 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #22783 from patelfenil/bugfix-issue-17320 | Thomas Müller | 2016-04-25 | 1 | -2/+9 |
|\ \ \ \ | |||||
| * | | | | Remove image now not coming when user changes fullname. Fixes #17320 | patelfenil | 2016-03-07 | 1 | -2/+9 |
* | | | | | Merge pull request #22648 from owncloud/propagate-single | Thomas Müller | 2016-04-25 | 8 | -29/+56 |
|\ \ \ \ \ | |||||
| * | | | | | do propagation in a single query | Robin Appelman | 2016-04-25 | 8 | -29/+56 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #24264 from owncloud/route_psr4 | Lukas Reschke | 2016-04-25 | 3 | -0/+0 |
|\ \ \ \ \ | |||||
| * | | | | | Move \OC\Route to PSR-4 | Roeland Jago Douma | 2016-04-25 | 3 | -0/+0 |
| | |_|_|/ | |/| | | | |||||
* | | | | | Merge pull request #24251 from owncloud/fix-mailer | Roeland Douma | 2016-04-25 | 2 | -3/+8 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Fix the syntax and methods in the sample | Joas Schilling | 2016-04-25 | 1 | -3/+4 |
| * | | | | Allow automatic dependency injection for OCP\Mail\Mailer | Joas Schilling | 2016-04-25 | 1 | -0/+4 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #24244 from owncloud/mount-unique | Vincent Petry | 2016-04-25 | 2 | -2/+22 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | add test | Robin Appelman | 2016-04-25 | 1 | -0/+11 |
| * | | | don't get the config for the same mount multiple times | Robin Appelman | 2016-04-25 | 1 | -2/+11 |
* | | | | Merge pull request #24052 from owncloud/fix-ldap-cache-race-conditions | Thomas Müller | 2016-04-25 | 6 | -48/+32 |
|\ \ \ \ | |||||
| * | | | | Fix LDAP race conditions | Morris Jobke | 2016-04-20 | 6 | -48/+32 |
* | | | | | Merge pull request #24248 from owncloud/d--j-master | Thomas Müller | 2016-04-25 | 5 | -10/+34 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | Merge branch 'master' of https://github.com/d--j/core into d--j-master | Thomas Müller | 2016-04-25 | 5 | -10/+34 |
| |\ \ \ \ \ | |||||
| | * | | | | | Call private cache methods only for `OC\Files\Cache\Cache` | Daniel Jagszent | 2016-04-15 | 5 | -10/+34 |
* | | | | | | | Merge pull request #24247 from owncloud/weits-patch-1 | Thomas Müller | 2016-04-25 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Merge branch 'patch-1' of https://github.com/weits/core into weits-patch-1 | Thomas Müller | 2016-04-25 | 1 | -1/+1 |
|/| | | | | | | |||||
| * | | | | | | solves problem with moving files via WebDAV | Petr Svoboda | 2016-04-19 | 1 | -1/+1 |
* | | | | | | | Merge pull request #24205 from owncloud/scanner-locking | Thomas Müller | 2016-04-25 | 1 | -0/+2 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | add locks in the scanner to prevent multiple scanners running on the same files | Robin Appelman | 2016-04-25 | 1 | -0/+2 |
* | | | | | | | | Merge pull request #24240 from owncloud/issue-24233-add-missing-use-statement | Thomas Müller | 2016-04-25 | 1 | -0/+1 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Add missing use statement | Joas Schilling | 2016-04-25 | 1 | -0/+1 |
| | |_|_|_|_|/ / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #24231 from owncloud/updater_psr4 | Thomas Müller | 2016-04-25 | 1 | -0/+0 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Move \OC\Updater to PSR-4 | Roeland Jago Douma | 2016-04-25 | 1 | -0/+0 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #24230 from owncloud/you-form-of-activities | Lukas Reschke | 2016-04-25 | 1 | -0/+35 |
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | | | |||||
| * | | | | | | | Translate the current user with "You ..." | Joas Schilling | 2016-04-25 | 1 | -0/+35 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #24214 from owncloud/fix-ldap-connection-unbind-on-login | Vincent Petry | 2016-04-25 | 2 | -11/+3 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | on clone Connection, do not take over the existing LDAP resource | Arthur Schiwon | 2016-04-22 | 2 | -11/+3 |
* | | | | | | | Merge pull request #24073 from owncloud/move_federated_sharing_settings_to_app | Björn Schießle | 2016-04-25 | 31 | -53/+263 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | |||||
| * | | | | | | move federated sharing settings to the federatedfilesharing app | Björn Schießle | 2016-04-22 | 31 | -53/+263 |
* | | | | | | | Merge pull request #24226 from owncloud/files_psr4 | Thomas Müller | 2016-04-25 | 65 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move \OC\Files to PSR-4 | Roeland Jago Douma | 2016-04-24 | 65 | -0/+0 |
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-25 | 10 | -4/+10 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #24213 from owncloud/systemtag_psr4 | Lukas Reschke | 2016-04-24 | 4 | -0/+0 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Move \OC\SystemTag to PSR-4 | Roeland Jago Douma | 2016-04-22 | 4 | -0/+0 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-04-24 | 54 | -90/+268 |