merge changes from welcome screen #25

Closed

lookshe wants to merge 0 commits from merge into master

pull from: merge

merge into: thedevstack:master

thedevstack:master

Conversation 0 Commits - Files changed -

lookshe commented 2025-05-30 09:00:01 +02:00

Owner

Copy link

No description provided.

lookshe added 50 commits 2025-05-30 09:00:02 +02:00

.github/ISSUE_TEMPLATE.md gelöscht d5c6e52dde

.github/workflows/android.yml gelöscht 1442b4bfbd

Merge pull request 'update fork' (#6) from mirror/monocles_chat_clean:master into master ... f0a755a5bc

Reviewed-on: #6

adds piratx launcher icon ed213b377f

Merge branch 'master' of ssh://git.fucktheforce.de:2222/thedevstack/PiratX 75a3247b99

restructure build process, relates #1 3883ab5df5

adds gradle-wrapper 9e45037e45

add action to build on every push 0fa955d591

fix indenting 9b4b4e5300

use image containing nodejs to use actions 823edd6da6

env in action does not affect container 5425f540ac

one more try 9cb80aabbd

one more try until i change the container image d26e32ee6a

one more try b6486da4e7

manually accept licenses d380e55900

add ability to trigger manually for debugging 3ebfc5f341

do not use dumb memory settings bcbbdc162a

annoyed, late, vi -> one i to much 5d0a8a2616

Merge pull request 'update fork' (#10) from mirror/monocles_chat_clean:master into master ... e466f74ee3

Reviewed-on: #10

Merge pull request 'update fork' (#21) from mirror/monocles_chat_clean:master into master ... 1bbdac70ad

Reviewed-on: #21

Merge branch 'mirror-master' 3cdc2fa6d6

use own build file to avoid merge conflicts 7ec06f3d2e

Merge pull request 'use own build file to avoid merge conflicts' (#23) from feature/build_file_rename into master ... 7ad21feb9d

Reviewed-on: #23

adds eol=lf as gitattributes to avoid bullshit on windows 26378afd51

changes caps (xep-0115) node identification e75cd00065

only add configured domains to knownhosts 9235a929a9

adds piratx default values 6df128daa0

remove auto bookmarking of support d024237410

move piratx configuration to default config since there is a dedicated piratx build file 1465da53b6

renaming configuration parameters to match our domain 8f0a270bee

adds multiple language strings.xml to piratx flavor to rebrand monocles to PiratX 255f9fe690

simple rebranding by replacing 'monocles chat' with 'PiratX' 59942f0e9b

monocles replaced with piratx 7f1f01c14a

first rework of welcome screens fab6797650

upload build artifacts 9d9ae8f26a

change variable according to documentation c5c69e003e

use working-directory instead of change path in every step 85d406c6d9

use upload-artifact v3, since v4 is not working 835ee07172

Revert "use working-directory instead of change path in every step" ... b280f2f912

This reverts commit 85d406c6d9.

change working-directory using other variable 5914f358e8

upload only needed artifacts standalone 35d1fb8e20

changes logo in welcome screens 8f990ce0b0

simplified welcome screens e3ecc97700

Merge remote-tracking branch 'refs/remotes/origin/master' 0d5ae412bd

changed static url to a dummy url on our domain a3abecc037

deletes .gitattributes 650f480628

Merge branch 'mirror-master' d228c0cf57

merge latest changes from build.gradle 12419f80db

merge latest changes from gradle-wrapper.properties f3c01a8b23

uncomment not existing parts in new welcome screen b4429a4832

lookshe closed this pull request 2025-05-30 09:01:31 +02:00

All checks were successful

Hide all checks

/ build (push) Successful in 5m50s

Details

Pull request closed

This pull request cannot be reopened because the branch was deleted.

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels   

update fork

No labels

update fork

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

1 participant

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: thedevstack/PiratX#25

No description provided.