coop-cloud/mediawiki
5
0
Fork 2
Code Issues 8 Pull Requests 3 Releases Wiki Activity

Add support for SemanticMediaWiki, MobileFrontend, MsUpload, PageForms, PageSchemas, WikiMarkdown, Tweeki #31

Merged
decentral1se merged 13 commits from flancian/wiki.social.coop:main into main 2023-05-30 23:00:42 +00:00
Conversation 4 Commits 13 Files Changed 7
+140 -35
flancian commented 2023-05-14 23:15:34 +00:00
Owner
Copy Link
Copy Source

This adds optional support for several plugins and a skin used by the Social.coop wiki setup @jonny (sneakers-the-rat) put together for the community.

This is my first PR for coop cloud :) All feedback of any type welcome!

This is running on https://wiki-alpha.social.coop as of the time of writing.

This adds optional support for several plugins and a skin used by the Social.coop wiki setup @jonny (sneakers-the-rat) put together for the community. This is my first PR for coop cloud :) All feedback of any type welcome! This is running on https://wiki-alpha.social.coop as of the time of writing.
flancian added 8 commits 2023-05-14 23:15:38 +00:00
First stab at adding extensions: 917eb68ae7 
- MsUpload
- PageForms
- PageSchemas
- SemanticMediaWiki
- WikiMarkdown
Add LocalSettings changes for the extensions in the previous commit. ff2d004bcf
Bump LocalSettings and Entrypoint versions. f509f7b830
Fix example OpenID URL; keycloak doesn't expect /auth/ here it seems. 2dd1c7aeee
SemanticMediaWiki now works -- after installing with composer :) 3101cff3e8
Make MEDIAWIKI_DEBUG also control level of PHP warnings shown. a931c54b31
Add Tweeki skin as option. 7ca11b8bc9
Add Tweeki to sample.
continuous-integration/drone/pr Build is failing
Details
b1d3e2a0f9
flancian added 1 commit 2023-05-15 17:44:34 +00:00
Merge branch 'main' into main
continuous-integration/drone/pr Build is failing
Details
cc3682ef89
flancian added 1 commit 2023-05-28 13:19:32 +00:00
Disable parsoid, it's no longer needed.
continuous-integration/drone/pr Build is failing
Details
112bd3300f 
This applies changes from #32 independently; I believe the result should be a clean merge.
flancian added 1 commit 2023-05-28 13:21:35 +00:00
Disable Tweeki skin by default as it's a bit opinionated/non-standard.
continuous-integration/drone/pr Build is failing
Details
b78c20fe41
decentral1se reviewed 2023-05-28 14:18:11 +00:00
decentral1se left a comment
Owner
Copy Link
Copy Source

Thank you @flancian! This looks legit. I have some minor comments, the latter of which might warrant a fixup but do let me know. Can merge this ASAP. So so cool to see these changes coming back from the social.coop fork.

Thank you @flancian! This looks legit. I have some minor comments, the latter of which might warrant a fixup but do let me know. Can merge this ASAP. So so cool to see these changes coming back from the social.coop fork.
abra.sh
@@ -1,8 +1,8 @@
export LOCAL_SETTINGS_CONF_VERSION=v6
export LOCAL_SETTINGS_CONF_VERSION=v17
decentral1se commented 2023-05-28 14:13:51 +00:00
Owner
Copy Link
Copy Source

Usually we increment "+1" on these versions. Can imagine you did this because you have different versions on your fork? This might be confusing to folks if they see such a version increment but I think in practice nobody will notice and nobodys deploy will break. Just wanted to note this for due dilligence.

Usually we increment "+1" on these versions. Can imagine you did this because you have different versions on your fork? This might be confusing to folks if they see such a version increment but I think in practice nobody will notice and nobodys deploy will break. Just wanted to note this for due dilligence.
flancian commented 2023-05-30 21:07:33 +00:00
Author
Owner
Copy Link
Copy Source

This is me getting rid of the following kind of error message, step by step while running abra app deploy -C -- for ~tens of steps :)

continueFATA[0002] failed to update config wiki-alpha_social_coop_entrypoint2_v16: Error response from daemon: rpc error: code = InvalidArgument desc = only updates to Labels are allowed

I'm guessing there's a way to 'squash' these changes into minimal increments on integrating to the main branch, but I don't know what it is?

This is me getting rid of the following kind of error message, step by step while running abra app deploy -C -- for ~tens of steps :) continueFATA[0002] failed to update config wiki-alpha_social_coop_entrypoint2_v16: Error response from daemon: rpc error: code = InvalidArgument desc = only updates to Labels are allowed I'm guessing there's a way to 'squash' these changes into minimal increments on integrating to the main branch, but I don't know what it is?
decentral1se commented 2023-05-30 22:58:41 +00:00
Owner
Copy Link
Copy Source

You would undeploy / deploy to "squash" the changes in the sense that the daemon wouldn't complain about "only updates blah blah" because it's a "fresh slate".

You would `undeploy` / `deploy` to "squash" the changes in the sense that the daemon wouldn't complain about "only updates blah blah" because it's a "fresh slate".
entrypoint.sh.tmpl
@@ -77,3 +126,4 @@
set -eu
init_extensions
init_skins
decentral1se commented 2023-05-28 14:14:41 +00:00
Owner
Copy Link
Copy Source

Indentation looks a bit off but whatevs.

Indentation looks a bit off but whatevs.
flancian commented 2023-05-30 21:07:45 +00:00
Author
Owner
Copy Link
Copy Source

Yes, thank you, fixed :)

Yes, thank you, fixed :)
decentral1se marked this conversation as resolved
php.ini.tmpl
@@ -3,2 +3,4 @@
max_execution_time = 7200
max_file_uploads = 1000
{{ if eq (env "MEDIAWIKI_DEBUG") "0" }}
decentral1se commented 2023-05-28 14:17:05 +00:00
Owner
Copy Link
Copy Source

Did you mean "1"? I see the default is MEDIAWIKI_DEBUG=0 in the .env.sample and elsewhere in the LocalSettings.php.tmpl it is {{ if eq (env "MEDIAWIKI_DEBUG") "1" }}.

Did you mean `"1"`? I see the default is `MEDIAWIKI_DEBUG=0` in the `.env.sample` and elsewhere in the `LocalSettings.php.tmpl` it is `{{ if eq (env "MEDIAWIKI_DEBUG") "1" }}`.
flancian commented 2023-05-30 21:08:02 +00:00
Author
Owner
Copy Link
Copy Source

Indeed I did, thank you :)

Indeed I did, thank you :)
flancian commented 2023-05-30 21:38:54 +00:00
Author
Owner
Copy Link
Copy Source

Oh, actually I didn't ;) This was meant to disable deprecation warnings and such -- I added an else block to make this clearer, I think this looks better?

Oh, actually I didn't ;) This was meant to *disable* deprecation warnings and such -- I added an else block to make this clearer, I think this looks better?
👍 1
decentral1se marked this conversation as resolved
flancian commented 2023-05-30 21:05:28 +00:00
Author
Owner
Copy Link
Copy Source

Thank you @flancian! This looks legit. I have some minor comments, the latter of which might warrant a fixup but do let me know. Can merge this ASAP. So so cool to see these changes coming back from the social.coop fork.

Thank you so much for the review! Trying to address these now :)

> Thank you @flancian! This looks legit. I have some minor comments, the latter of which might warrant a fixup but do let me know. Can merge this ASAP. So so cool to see these changes coming back from the social.coop fork. Thank you so much for the review! Trying to address these now :)
🎉 1
flancian changed title from Add support for SemanticMediaWiki, MsUpload, PageForms, PageSchemas, WikiMarkdown, Tweeki to Add support for SemanticMediaWiki, MobileFrontend, MsUpload, PageForms, PageSchemas, WikiMarkdown, Tweeki 2023-05-30 21:09:36 +00:00
flancian added 1 commit 2023-05-30 21:47:29 +00:00
Add MobileFrontend support and fix issues spotted during PR review :D
continuous-integration/drone/pr Build is failing
Details
e2ca6b6df4 
#31
flancian commented 2023-05-30 21:48:02 +00:00
Author
Owner
Copy Link
Copy Source

Thank you @flancian! This looks legit. I have some minor comments, the latter of which might warrant a fixup but do let me know. Can merge this ASAP. So so cool to see these changes coming back from the social.coop fork.

Thank you so much for the review! Trying to address these now :)

I think comments have been addressed :)

Note that I added MobileFrontend support (updated PR title).

> > Thank you @flancian! This looks legit. I have some minor comments, the latter of which might warrant a fixup but do let me know. Can merge this ASAP. So so cool to see these changes coming back from the social.coop fork. > > Thank you so much for the review! Trying to address these now :) I think comments have been addressed :) Note that I added MobileFrontend support (updated PR title).
flancian added 1 commit 2023-05-30 21:50:35 +00:00
Use tabs ;)
continuous-integration/drone/pr Build is failing
Details
0c50c3398f
decentral1se approved these changes 2023-05-30 23:00:02 +00:00
decentral1se left a comment
Owner
Copy Link
Copy Source

LGTM, thanks!

LGTM, thanks!
decentral1se merged commit 57cf8db271 into main 2023-05-30 23:00:41 +00:00
Sign in to join this conversation.
Reviewers
No Reviewers
decentral1se
Labels
No items
No labels
Milestone
No items
No Milestone
Assignees
Clear assignees
3wordchant aadil (Aadil Ayub) abra-bot (Abra Bot) ammaratef45 amras (Sarma) Apfelwurm appletalk arjan basebuilder BornDeleuze Brooke carla cas (Cassowary) codegod100 coopcloud cyrnel decentral1se (d1) dede devydave fauno (fauno) flancian Frando iexos jade (Jade Ambrose) javielico (Javielico) jjsfunhouse jmakdah2 (Jackie Makdah) joe-irving (Joe Irving) kawaiipunk (KawaiiPunk) knoflook kolaente lambdabundesverband linnealovespie (April) marlon (marlon) mayel mirsal moosemower moritz nicksellen (Nick Sellen) notplants oxaliq (sorrel) p4u1 pau pharaohgraphy (Andrew 🐦‍🔥❤️‍🔥✴️) PhiNatalie renovate-bot (Comrade Renovate Bot) ripclap rix rscmbbng sef (sef) simon sixsmith (Sixsmith) stevensting tobias trav (Trav Fryer) val (val (he/him)) vaznasty virtualboys wolcen (Chris Thompson) wykwit xynosis yksflip
No Assignees
2 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: coop-cloud/mediawiki#31