rdkartono/AAS_NewGeneration
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

feature-webapp #3

Open
stephaniegl wants to merge 15 commits from feature-webapp into master
pull from: feature-webapp
merge into: rdkartono:master
Conversation 0 Commits 15 Files Changed 19 +798 -206
stephaniegl commented 2025-10-20 01:53:42 +00:00
Collaborator
Copy Link
No description provided.
stephaniegl added 15 commits 2025-10-20 01:53:42 +00:00
Merge branch 'master' of https://gitea.rdkartono.my.id/rdkartono/AAS_NewGeneration into feature-webapp 470f61c79d 
# Conflicts:
#	src/web/WebApp.kt
commit 08/10/2025 WebApp e426522380
Merge remote-tracking branch 'origin/master' into feature-webapp b15470845e 
# Conflicts:
#	src/web/WebApp.kt
Merge remote-tracking branch 'origin/master' into feature-webapp 8c49bb827f 
# Conflicts:
#	src/web/WebApp.kt
Merge remote-tracking branch 'origin/master' into feature-webapp d2a2626fd5
commit 14/10/2025 WebApp Add send language for ScheduleBank a53270aaed
commit 14/10/2025 WebApp Add send language for ScheduleBank 1563e233d6
Merge branch 'master' of https://gitea.rdkartono.my.id/rdkartono/AAS_NewGeneration into feature-webapp 4da5a2fb05
commit 14/10/2025 WebApp Add send language for ScheduleBank 1b84ec133b
Merge branch 'master' of https://gitea.rdkartono.my.id/rdkartono/AAS_NewGeneration into feature-webapp e5d8d8059e
Merge remote-tracking branch 'origin/master' into feature-webapp 8978a0986d
commit 14/10/2025 WebApp fix ScheduleBank ADD & send message 8bd57f216a
commit 17/10/2025 Add few logs 4d02ab6d07
commit 17/10/2025 Add few logs 17b4485e69
commit 18/10/2025 sync changes from master cdcb02e976
This pull request has changes conflicting with the target branch.
  • html/webpage/assets/css/bss-overrides.css
  • html/webpage/assets/css/styles.css
  • html/webpage/assets/js/schedulebank.js
  • html/webpage/broadcastzones.html
  • html/webpage/language.html
  • html/webpage/log.html
  • html/webpage/login.html
  • html/webpage/messagebank.html
  • html/webpage/overview.html
  • html/webpage/setting.html
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature-webapp:feature-webapp
git checkout feature-webapp
Sign in to join this conversation.
Reviewers
No Reviewers
Labels
No items
No Label
Milestone
No items
No Milestone
Projects
Clear projects
No project
Assignees
Clear assignees
ADTYCH28 Januar mverlina stephaniegl rdkartono
No Assignees
1 Participants
Notifications
Due Date
No due date set.
Dependencies

No dependencies set.

Reference: rdkartono/AAS_NewGeneration#3
Delete Branch "feature-webapp"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?