Skip to content

Develop -> Master #121

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

Merged
harismacic1 merged 33 commits into from
Feb 4, 2026
Merged

Develop -> Master #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
de058af
[#5238] Initial structure of docker files
harismacic1 Dec 30, 2025
84b031a
#5238 Remove comments
harismacic1 Jan 5, 2026
c7f9cbd
#5238 Copy frontend assets from local vendor files rather than build …
harismacic1 Jan 5, 2026
055e0b6
#5238 Change owner and permissions on nginx folders
harismacic1 Jan 6, 2026
cda736d
[#5238] Remove version from docker compose because its obsolete
harismacic1 Jan 21, 2026
4ad4865
#5238 Change all secrets and extract path to secrets, write initial c…
harismacic1 Jan 21, 2026
2996aff
#5238 Prepare staging database
harismacic1 Jan 21, 2026
1296033
#5238 Add appropriate platform and build frontend assets in dockerfile
harismacic1 Jan 21, 2026
fa74d58
[#5238] Remove arm platform flag
harismacic1 Jan 22, 2026
719a681
[#5238] Change dockerfile
harismacic1 Jan 22, 2026
7a9e4af
[#5238] Remove build from docker compose
harismacic1 Jan 22, 2026
f05d11a
[#5238] Change container names in cicd script to match the ones docke…
harismacic1 Jan 23, 2026
468af3d
[#5238] Add nothing, just trigger fresh build
harismacic1 Jan 23, 2026
6cb02e0
[#5238] Change platform to arm
harismacic1 Jan 26, 2026
4c5e1b6
[#5238] Add cache to script
harismacic1 Jan 27, 2026
f29902f
[#5238] Remove unnecessary files from dockerfile and include tailwind
harismacic1 Jan 27, 2026
d47f9e9
[#5731] Setup docker compose for production and deployment script
harismacic1 Jan 28, 2026
e5928da
[#5731] Remove build stage from docker compose and rename image
harismacic1 Jan 28, 2026
10b7c5d
#5731 Change rollback section
harismacic1 Jan 28, 2026
10d96fd
[#5731] Make changes in staging CI/CD scripts to match naming
harismacic1 Jan 28, 2026
56580fd
[#5731] Add public dist to gitignore
harismacic1 Jan 29, 2026
4f420fe
[#5731] Delete unnecessary files from codebase, modify deployment scr…
harismacic1 Jan 29, 2026
99201b0
#5731 Change health check echo message
harismacic1 Jan 29, 2026
48e42d5
#5731 Remove old deployment script
harismacic1 Jan 29, 2026
f74492a
#5731 Change echo message
harismacic1 Jan 30, 2026
a49cdb3
#5766 Add sort to monthly export
harismacic1 Jan 30, 2026
906b44a
#5700 Remove overflowing label on kanban board
harismacic1 Jan 27, 2026
209357f
#5700 Address PR comment, change max width to 80%
harismacic1 Jan 28, 2026
cfe7336
#5700 Increase ticket sizes on kanban board
harismacic1 Jan 28, 2026
82d358c
#5778 Fix my Work timesheet window size
farukvukovic Feb 2, 2026
c3095fe
#5624 Fix recent timesheets display on monthly view
farukvukovic Jan 28, 2026
0392d92
#5503 Enhance PearLog notifications
farukvukovic Jan 13, 2026
0340ad6
[#5795] Change docker compose syntax
harismacic1 Feb 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
128 changes: 0 additions & 128 deletions .docker/Dockerfile
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions .docker/config/custom.ini
View file
Open in desktop

This file was deleted.

86 changes: 0 additions & 86 deletions .docker/config/nginx.conf
View file
Open in desktop

This file was deleted.

28 changes: 0 additions & 28 deletions .docker/config/php-fpm.conf
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions .docker/config/supervisord.conf
View file
Open in desktop

This file was deleted.

64 changes: 0 additions & 64 deletions .docker/docker-compose.yml
View file
Open in desktop

This file was deleted.

Loading
Loading