summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-04-2916-0/+110
|
* Merge pull request #24332 from owncloud/http_psr4Thomas Müller2016-04-293-0/+0
|\ | | | | Move \OC\Http to PSR-4
| * Move \OC\Http to PSR-4Roeland Jago Douma2016-04-283-0/+0
| |
* | Merge pull request #24326 from owncloud/fix_for_php_7_0_6Roeland Douma2016-04-281-0/+3
|\ \ | | | | | | Make ownCloud work again in php 7.0.6
| * | Make ownCloud work again in php 7.0.6Roeland Jago Douma2016-04-281-0/+3
| |/ | | | | | | See https://bugs.php.net/bug.php?id=72117
* | Merge pull request #24274 from owncloud/async-repair-stepsThomas Müller2016-04-285-1/+258
|\ \ | | | | | | Introduce background repair steps
| * | Introduce background repair stepsThomas Müller2016-04-265-1/+258
| | |
* | | Merge pull request #24287 from owncloud/smb-110Vincent Petry2016-04-288-41/+122
|\ \ \ | |_|/ |/| | update icewind/streams to 1.1.0
| * | update icewind/streams to 1.1.0Robin Appelman2016-04-268-41/+122
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2824-36/+228
| | |
* | | Merge pull request #24290 from owncloud/mimetypealiases-2Thomas Müller2016-04-281-1/+1
|\ \ \ | | | | | | | | correct typo in mimetypealiases.dist.json
| * | | correct typo in mimetypealiases.dist.jsonCarla Schroder2016-04-261-1/+1
| | | |
* | | | Merge pull request #24315 from owncloud/l10n_psr4Thomas Müller2016-04-283-0/+0
|\ \ \ \ | | | | | | | | | | L10N to PSR-4
| * | | | Move \OC\L10N to PSR-4Roeland Jago Douma2016-04-272-0/+0
| | | | |
| * | | | Move OC_L10N_String to legacy folderRoeland Jago Douma2016-04-271-0/+0
|/ / / /
* | | | Merge pull request #24310 from owncloud/enoch85-patch-1Thomas Müller2016-04-271-2/+2
|\ \ \ \ | | | | | | | | | | 2015 --> 2016
| * | | | 2015 --> 2016Daniel Hansson2016-04-271-2/+2
|/ / / /
* | | | Merge pull request #23942 from owncloud/fix-behatThomas Müller2016-04-271-6/+6
|\ \ \ \ | | | | | | | | | | Use baseUrl as provided
| * | | | Use baseUrl as providedThomas Müller2016-04-121-6/+6
| | | | |
* | | | | Merge pull request #22777 from owncloud/encrypt_all_master_keyThomas Müller2016-04-274-29/+116
|\ \ \ \ \ | | | | | | | | | | | | improved encrypt-all script
| * | | | | if we don't have a encrypted file key we can return a empty string right awayBjoern Schiessle2016-04-262-5/+38
| | | | | |
| * | | | | don't create a private-/public-key pair for each user if the master key is ↵Bjoern Schiessle2016-04-263-24/+78
| | |_|/ / | |/| | | | | | | | | | | | | enabled
* | | | | Merge pull request #21417 from J0WI/css-fixesThomas Müller2016-04-277-27/+38
|\ \ \ \ \ | | | | | | | | | | | | css fallbacks and code style fixes
| * | | | | fixed fallbacks and code stylejowi2016-01-027-27/+38
| | | | | |
* | | | | | Merge pull request #24286 from owncloud/hooks_psr4Thomas Müller2016-04-276-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Move \OC\Hooks to PSR-4
| * | | | | | Move \OC\Hooks to PSR-4Roeland Jago Douma2016-04-266-0/+0
| | |_|_|/ / | |/| | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-2748-40/+206
| | | | | |
* | | | | | Merge pull request #24246 from owncloud/local-invalidLukas Reschke2016-04-262-0/+17
|\ \ \ \ \ \ | |/ / / / / |/| | | | | error out if a local storage isn't setup correctly
| * | | | | add testsRobin Appelman2016-04-261-0/+14
| | | | | |
| * | | | | error out if a local storage isn't setup correctlyRobin Appelman2016-04-251-0/+3
| | | | | |
* | | | | | Merge pull request #24027 from owncloud/translate_ocs_shareThomas Müller2016-04-264-63/+94
|\ \ \ \ \ \ | | | | | | | | | | | | | | Translate OCS Share API error messages
| * | | | | | Translate OCS Share API error messagesRoeland Jago Douma2016-04-254-63/+94
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For https://github.com/owncloud/core/issues/22209
* | | | | | | Merge pull request #24277 from owncloud/more-sanityThomas Müller2016-04-261-1/+9
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Don't write empty RewriteBase
| * | | | | | | Don't write empty RewriteBaseLukas Reschke2016-04-261-1/+9
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ownCloud may be configured to live at the root folder without a trailing slash being specified. In this case manually set the rewrite base to `/`
* | | | | | | Merge pull request #24269 from owncloud/backgroundjob_psr4Thomas Müller2016-04-266-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Move \OC\BackgroundJob to PSR-4
| * | | | | | Move \OC\BackgroundJob to PSR-4Roeland Jago Douma2016-04-266-0/+0
| | | | | | |
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-04-26204-1114/+1230
| | | | | | |
* | | | | | | Merge pull request #24256 from owncloud/scanner-propagateMorris Jobke2016-04-262-0/+40
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | triger the propagator from the command line scanner
| * | | | | | | 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 it
| * | | | | | | 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 thi…
| * | | | | | | Introduce OCP\Migration\IRepairStep and adopt all repair steps to this new ↵Thomas Müller2016-04-2535-199/+369
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | interface - refs #24198
* | | | | | | | Merge pull request #24268 from owncloud/search_psr4Thomas Müller2016-04-265-0/+0
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Move \OC\Search to PSR-4
| * | | | | | | | 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 mimetypealiases
| * | | | | | | | 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 co…
| * | | | | | | | 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 #17320