Skip to content

Commit

Permalink
Merge 'master' into REL1_36 (#3845)
Browse files Browse the repository at this point in the history
* Add extendedconfirmedprotected restriction level to famepediawiki (#3837)

* Add extendedconfirmedprotected restriction level to famepediawiki

Per request (https://meta.miraheze.org/w/index.php?diff=171784&oldid=171783&rcid=614715)

* Fix typo

* Convert SimpleTooltip to use ExtensionRegistry (#3839)

* Convert SimpleTooltip to use ExtensionRegistry

* Update extension-list

* Revert "Convert SimpleTooltip to use ExtensionRegistry (#3839)" (#3840)

This reverts commit d2951ce.

* Add editextendedconfirmedprotected restrict. level to documentcontrolwiki (#3838)

* Add editextendedconfirmedprotected restriction level to documentcontrolwiki

Per request (https://meta.miraheze.org/w/index.php?diff=171790&oldid=171789&rcid=614721)

* Remove +

Maybe this is the `+` @joritochip meant? I do see the other wikis don't have the `+` sign for this variable, but I'm not quite sure why

* Add 'editextendedconfirmedprotected', to line 3598

* Fix tab

* Add PageAssessments extension #T7180 (#3847)

* Add PageAssessments to LocalExtensions.php

* Add PageAssessments to LocalSettings.php

* Add PageAssessments to extension-list

* Add PageAssessments to ManageWikiExtensions.php

* Add missed comma

* Fix, I think

* Update paths to SQL database tables

Per https://github.com/wikimedia/mediawiki-extensions-PageAssessments/tree/master/db and @Reception123. I assume we don't need to change `'sql' =>` to `'db' =>`, of course, though?

* Revert "Revert "Convert SimpleTooltip to use ExtensionRegistry (#3839)" (#3840)" (#3848)

This reverts commit 7c0ceae.

* test MF setting for T7165 (#3851)

* switch SimpleBlogPage to use wfLoad

* switch FancyBoxThumbs to use wfLoad

* rv FancyBoxThumbs change

* Update SimpleBlogPage config (#3849)

* Update SimpleBlogPage config

* Update LocalExtensions.php

* Update extension-list

* extension.json for FancyBoxThumbs

* use wfLoad for FancyBoxThumbs

* Remove Validator (#3850)

* Remove Validator

* Update extension-list

* Update LocalSettings.php

* Update ManageWikiExtensions.php

* ScratchBlocks -> ScratchBlocks4 (#3855)

* ScratchBlocks -> ScratchBlocks4

* single quote

* Convert AutoCreatePage to ExtensionRegistry (#3852)

* Convert AutoCreatePage to ExtensionRegistry

* Update extension-list

* Update LocalExtensions.php

* set wgCentralAuthGlobalPasswordPolicies for sensitive global groups (… (#3856)

* set wgCentralAuthGlobalPasswordPolicies for sensitive global groups (steward+sysadmin)

* fix

* fix

* syntax

* rm 'default' group from wgCentralAuthGlobalPasswordPolicies

* set usenewrc to 0 for bioencyclopediawiki per T7198 (#3857)

* Fix category collation for CategorySortHeaders (#3844)

* disable APIquery for wikiconfig

* Re-enable ManageWiki API (#3860)

Reverts 71ea281

* Add Sitenotice about Security Incident (#3859)

* Update Sitenotice.php

* Update Sitenotice.php

* Update Sitenotice.php

* Fix typo and correct grammar (#3861)

* Change html attributes to prevent Google crawling sitenotice (#3862)

This ensures Google does not use the sitenotice as a snippet for
their search result for Miraheze wikis who has not set one via
extensions.[1] Please ensure all future sitenotices and central-
notices has this value.

[1]: https://phabricator.miraheze.org/F1430638
Cf. https://revi.kr/6bFF

Signed-off-by: Yongmin Hong <revi@pobox.com>

* Remove wgMFSiteStylesRenderBlocking (#3866)

This was for now-completed testing and should be removed.

* Use Special:MyLanguage links where possible (#3863)

* Use Special:MyLanguage links where possible

* Remove unneeded Special:MyLanguage links from Tech: namespace pages

Co-authored-by: Doug Mehus <39928941+dmehus@users.noreply.github.com>

* Fix case (#3864)

One more fix to this sitenotice. The other thing I was wondering if for `Special:ManageWiki/settings`, I'm wondering if we could make that into a link with `<a href="https:" + $wgServer + "/wiki/Special:ManageWiki/settings">Special:ManageWiki/settings</a>? I just never know if we need a `+` before and/or after the `$wgServer` variable?

* Remove managewiki backups temporarily.

* re-enable managewiki backups (#3867)

* Disable Wikibase entity search UI by default (#3853)

* Disable Wikibase entity search UI by default

* Disable Wikibase entity search UI by default

* add more file formats to wgFileExtensions (#3846)

* wgCosmosEnabledRailModules setting for malwiki T7219 (#3868)

* email notifications on privileged actions configuration T7197 (#3869)

* email notifications on privileged actions configuration T7197

* fix wgconf end

* array for watched-person group

* default=>meta

* change email notifs for group instead of right (#3870)

* change email notifs for group instead of right

* fix and configure for T&S

* Fix indentation for wgMirahezeMagicLogEmailConditions

* Remove John’s access to staffwiki (#3871)

* Fix configuration for Logstash formatter

* Update and elaborate help message for wgWordmark (#3875)

* add T&S to higher password requirements (#3876)

* remove webhook sitenotice (#3874)

* Configured "HighlightLinksInCategory" Extension for my wiki (#3879)

* Add edittemplateprotected restriction level to documentcontrolwiki/famepediawiki (#3880)

Per request (https://meta.miraheze.org/w/index.php?title=Community_noticeboard/Archive_18&oldid=174937#Permission_Help)

* Add protection levels to naasgamelandwiki (#3881)

`editarchiveprotected` and `editofficialprotected` per request (https://meta.miraheze.org/w/index.php?title=Community_noticeboard&oldid=174936#Protection)

* Add protection levels to memeswiki (#3882)

[#7258](https://phabricator.miraheze.org/T7258)

* remove watched-person right; unused (#3883)

* Add Wikidata as an import source for snapwikiwiki (#3877)

* blacklist some rights in managewiki for * T7257 (#3886)

* blacklist some rights in managewiki for * T7257

* move oathauth-enable to any as it shouldn't be disallowed anyway

* Update LocalSettings.php

* add db server recorder for logging (T7248) (#3885)

* add db server recorder for logging (T7248)

Could be wrong

* syntax

* more syntax

* more syntax

* replace to c1 per paladox

* add permissions to * required for confirming email

* fix

* add myself back to staffwiki (#3888)

* Remove wgManageWikiCDBDirectory (#3889)

Was removed in miraheze/ManageWiki@f914eb5

Co-authored-by: Doug Mehus <39928941+dmehus@users.noreply.github.com>
Co-authored-by: Universal Omega <54654040+Universal-Omega@users.noreply.github.com>
Co-authored-by: Reception123 <utilizator.receptie123@gmail.com>
Co-authored-by: Yongmin Hong <revi@pobox.com>
Co-authored-by: paladox <paladox@users.noreply.github.com>
Co-authored-by: R4356th <61620631+R4356th@users.noreply.github.com>
Co-authored-by: MacFan4000 <paulfkeffer@gmail.com>
Co-authored-by: Ferran Tufan <southparkfan223@hotmail.com>
Co-authored-by: NJ Holder <70276371+Njsmooth@users.noreply.github.com>
Co-authored-by: The-Voidwalker <voidwalker.wikipedia@gmail.com>
  • Loading branch information
11 people committed May 12, 2021
1 parent 431f8f0 commit fbacf39
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions LocalSettings.php
Expand Up @@ -2588,9 +2588,6 @@
'urlshortener',
],
],
'wgManageWikiCDBDirectory' => [
'default' => '/srv/mediawiki/w/cache/managewiki',
],
'wgManageWikiPermissionsAdditionalAddGroups' => [
'default' => [],
'rf1botwiki' => [
Expand Down

0 comments on commit fbacf39

Please sign in to comment.