Merge branch 'master' into FS#2867 (4b94edc8) · Commits · BRIC / dokuwiki · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

D

dokuwiki
- Activity
- Members
- Labels
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

4b94edc8

Commit 4b94edc8 authored 11 years ago by Christopher Smith

Downloads
- Plain Diff

Merge branch 'master' into FS#2867

parents 698e7df8 9f5b9cf1

No related branches found

No related tags found

Loading

Changes 13

Hide whitespace changes

Inline Side-by-side

Showing

_test/bootstrap.php 7 additions, 0 deletions

_test/bootstrap.php
_test/tests/inc/indexer_indexing.test.php 45 additions, 0 deletions

_test/tests/inc/indexer_indexing.test.php
inc/html.php 1 addition, 1 deletion

inc/html.php
inc/indexer.php 11 additions, 11 deletions

inc/indexer.php
inc/init.php 2 additions, 2 deletions

inc/init.php
inc/lang/zh/lang.php 6 additions, 0 deletions

inc/lang/zh/lang.php
inc/plugincontroller.class.php 93 additions, 23 deletions

inc/plugincontroller.class.php
inc/pluginutils.php 61 additions, 0 deletions

inc/pluginutils.php
inc/search.php 18 additions, 8 deletions

inc/search.php
lib/plugins/config/settings/config.metadata.php 1 addition, 0 deletions

lib/plugins/config/settings/config.metadata.php
lib/plugins/popularity/admin.php 0 additions, 4 deletions

lib/plugins/popularity/admin.php
lib/plugins/popularity/helper.php 19 additions, 3 deletions

lib/plugins/popularity/helper.php
lib/plugins/usermanager/lang/zh/lang.php 7 additions, 0 deletions

lib/plugins/usermanager/lang/zh/lang.php

with 271 additions and 52 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment