Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow adding core and additional Mediawiki skins. #997

Merged
merged 5 commits into from
Aug 1, 2018
Merged

Allow adding core and additional Mediawiki skins. #997

merged 5 commits into from
Aug 1, 2018

Conversation

djflux
Copy link
Contributor

@djflux djflux commented Jul 30, 2018 •
edited
Loading

This pull request is an update of PR #930. It splits out meza core skins into a MezaCoreSkins.yml file. It also provides the ability for an administrator to add additional MediaWiki skins via a MezaLocalSkins.yml file. All of this work was original written by @freephile. Thanks for the great work.

Changes

  • MediaWiki core skins are specified in /opt/meza/config/core/MezaCoreSkins.yml
  • Locally added skins are specified in /opt/conf-meza/public/MezaLocalSkins.yml

Issues

Post-merge actions

Post-merge, the following actions need to be addressed:

@djflux
Attempt to fix #819 in https://github.com/enterprisemediawiki/meza
8c6fb55 
  This commit is an update to Pull Request #930 in the original meza
  repo. It pulls out some of the short URL things that don't have to
  do with skins.
@djflux
Attempt to fix #819 in https://github.com/enterprisemediawiki/meza
c1b13ef 
  This commit is an update to Pull Request #930 in the original meza
  repo. It pulls out some of the short URL things that don't have to
  do with skins.
@djflux
Comment out non-Vector skins. Move to MezaLocalSkins.yml.j2
2c2a8c5
@djflux
Create MezaLocalSkins j2 template.
7537bb2
@djflux
Copy link
Contributor Author

djflux commented Jul 31, 2018

Committed a couple of more mods - commented out non-Vector skins and created a MezaLocalSkins.yml.j2 template to fix Travis CI build.

freephile
freephile approved these changes Jul 31, 2018
View reviewed changes
Copy link
Contributor

@freephile freephile left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"conf-public" found on line 11 (comment) of config/core/MezaCoreSkins.yml should be changed to "conf-meza". Otherwise, this looks good from here. Haven't tested, but I like it +1:

@jamesmontalvo3
Copy link
Contributor

@djflux thanks for the PR. @freephile thanks for starting this work and for taking a look at the code. I'll test later today hopefully.

@jamesmontalvo3
Copy link
Contributor

Test failed, probably an intermittent failure. Restarting the failed job.

@jamesmontalvo3 jamesmontalvo3 merged commit 59cfd30 into enterprisemediawiki:31.x Aug 1, 2018
@jamesmontalvo3
Copy link
Contributor

Thanks for the PR!

freephile pushed a commit to freephile/qb that referenced this pull request Aug 16, 2018
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
6e2ef95 
…i#997)
@jamesmontalvo3 jamesmontalvo3 mentioned this pull request Sep 15, 2018
Closed
freephile pushed a commit to freephile/qb that referenced this pull request Oct 4, 2018
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
aeb6809 
…i#997)
freephile pushed a commit to freephile/qb that referenced this pull request Nov 27, 2018
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
c498abb 
…i#997)
freephile pushed a commit to freephile/qb that referenced this pull request Nov 27, 2018
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
43a2d5b 
…i#997)
@jamesmontalvo3 jamesmontalvo3 mentioned this pull request Dec 10, 2018
Closed
freephile pushed a commit to freephile/qb that referenced this pull request Jun 11, 2019
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
15bd229 
…i#997)
freephile pushed a commit to freephile/qb that referenced this pull request Jun 11, 2019
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
f6b003a 
…i#997)
freephile pushed a commit to freephile/qb that referenced this pull request Jun 11, 2019
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
c17afb2 
…i#997)
freephile pushed a commit to freephile/qb that referenced this pull request Jul 10, 2019
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
4a1bbee 
…i#997)
freephile pushed a commit to freephile/qb that referenced this pull request Jul 10, 2019
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
df9fcbf 
…i#997)
freephile pushed a commit to freephile/qb that referenced this pull request Jul 10, 2019
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
ef853d8 
…i#997)
freephile pushed a commit to freephile/qb that referenced this pull request Feb 17, 2020
@djflux
Allow adding core and additional Mediawiki skins. (enterprisemediawik…
caf73d3 
…i#997)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@freephile freephile freephile approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@djflux @jamesmontalvo3 @freephile