Searched refs:merged (Results 1 – 25 of 107) sorted by relevance
12345
| /plugin/jplayer/vendor/robloach/component-installer/src/ComponentInstaller/Process/ |
| D | RequireJsProcess.php | 225 $merged = $array1;
229 $merged[] = $value;
231 if (is_array($value) && isset($merged[$key]) && is_array($merged[$key])) {
232 $merged[$key] = $this->arrayMergeRecursiveDistinct($merged[$key], $value);
235 $merged[$key] = $value;
240 return $merged;
|
| /plugin/conflictmerger/lang/en/ |
| D | conflict-solved.txt | 1 ====== A newer version was merged ======
7 could be merged automatically.
10 the merged version. Examine them, then decide if you want to save the merged
|
| D | conflict-unsolved.txt | 7 merged automatically.
|
| /plugin/findologicxmlexport/vendor/jms/serializer/ |
| D | CONTRIBUTING.md | 28 New features without tests can't be merged.
66 ## Getting merged
81 Pull requests without tests most probably will not be merged.
|
| /plugin/jplayer/vendor/mustache/mustache/ |
| D | CONTRIBUTING.md | 26 …Those will be updated — per [semver](http://semver.org) — once your change is merged into `master`.
28 …* ... Don't update the wiki until your change is merged and released, but make a note in your pull…
|
| /plugin/findologicxmlexport/vendor/jms/metadata/ |
| D | CONTRIBUTING.md | 24 New features without tests can't be merged.
39 ## Getting merged
|
| /plugin/combo/vendor/antlr/antlr4-php-runtime/src/Atn/ |
| H A D | ATNConfigSet.php | 175 …$merged = PredictionContext::merge($existing->context, $config->context, $rootIsWildcard, $mergeCa…
191 $existing->context = $merged;
|
| /plugin/findologicxmlexport/vendor/doctrine/instantiator/ |
| D | CONTRIBUTING.md | 34 won't be merged.
|
| /plugin/xlsx2dw/ |
| D | README.md | 4 The plugin keeps the styles, merged cells and colors of your original table.
|
| /plugin/findologicxmlexport/vendor/doctrine/instantiator/docs/en/ |
| D | index.rst | 55 satisfying this requirement won’t be merged.
|
| /plugin/dokucrypt2/ |
| D | OLDER_VERSIONS.md | 9 NOTE: This fix was merged into Dokuwiki core as of Oct, 10 2019. So new versions of Dokuwiki releas…
|
| /plugin/findologicxmlexport/vendor/phpunit/php-code-coverage/ |
| D | ChangeLog-2.2.md | 15 …nbergmann/php-code-coverage/pull/368): Blacklists and whitelists are not merged when merging data …
|
| /plugin/dokucrypt3/ |
| H A D | README.md | 31 …o the way encryption is handled. The resulting pull request would not be merged into the base repo…
|
| /plugin/elasticsearch/vendor/elasticsearch/elasticsearch/docs/build/Elasticsearch/Namespaces/ |
| D | TextStructureNamespace.asciidoc | 32 …aximum number of characters permitted in a single message when lines are merged to create messages…
|
| /plugin/addnewpagedeluxe/ |
| D | README.md | 40 During this time, he merged several improvements and fixes contributed by these fine people:
|
| /plugin/conflictmerger/ |
| D | action.php | 108 * case, as the contents weren't merged, the revision to check conflicts
|
| /plugin/addnewpage/ |
| H A D | README.md | 39 During this time, he merged several improvements and fixes contributed by these fine people:
|
| /plugin/pot/ |
| D | README.md | 66 …* the general config settings will be merged ( overwritten ) by the page code (if set), and finall…
|
| /plugin/findologicxmlexport/vendor/twig/twig/doc/ |
| D | deprecated.rst | 148 * ``\Twig\Loader\ExistsLoaderInterface`` (merged with ``\Twig\Loader\LoaderInterface``)
149 * ``\Twig\Loader\SourceContextLoaderInterface`` (merged with ``\Twig\Loader\LoaderInterface``)
|
| /plugin/aichat/vendor/vanderlee/php-sentence/ |
| D | README.md | 74 of sentences tend to be merged with the preceding sentences. In most ordinary
|
| /plugin/issuelinks/ |
| D | style.less | 145 &.merged {
|
| /plugin/siteexport/ |
| D | README.md | 164 mergehint | add hints about the merged content. It can be configured using the meta plugin and the …
177 …d submitted, that page will be generated with the options provided - and merged back up the list (…
|
| /plugin/indexmenu/scripts/fancytree/skin-material/ |
| D | ui.fancytree.min.css | 6 …status-merged{text-align:center;font-style:italic;color:silver}table.fancytree-ext-table tr.fancyt…
|
| /plugin/indexmenu/scripts/fancytree/skin-awesome/ |
| D | ui.fancytree.min.css | 6 …status-merged{text-align:center;font-style:italic;color:silver}table.fancytree-ext-table tr.fancyt…
|
| /plugin/sequencediagram/bower_components/lodash/vendor/backbone/test/ |
| D | collection.js | 1865 assert.equal(options.changes.merged.length, 2);
1910 assert.deepEqual(changed.merged, []);
1923 assert.deepEqual(changed.merged, []);
1963 assert.equal(changed.merged.length, 0);
1990 var mergedModels = options.changes.merged;
2004 var mergedModels = options.changes.merged;
|
12345