Commit Graph

192 Commits

Author SHA1 Message Date
cygouw e8b69506b7 chore(localization): merge upstream updates and preserve C4A keys 2026-06-05 11:59:12 +07:00
cygouw a9e7ff451a Merge remote-tracking branch 'upstream/main' 2026-06-05 11:44:10 +07:00
izu 3c28313d43 Merge pull request 'Pull Request project halaman Prestasi dan Karya Mahasiswa Informatika - ACAAB' (#6) from andrie/student-web-if-development-kit:main into main
Reviewed-on: izu/student-web-if-development-kit#6
Approved
2026-06-05 04:40:49 +00:00
andrie f6999381e4 merge upstream 2026-06-05 04:34:13 +00:00
izu 8efef62933 Merge pull request 'merge team LimaEm: Kehidupan Mahasiswa dan Himpunan (HMIF)' (#14) from MuhammadFarras/student-web-if-development-kit:main into main
Reviewed-on: izu/student-web-if-development-kit#14
Approved
2026-06-05 04:33:13 +00:00
Andrie d98ddc201a Merge branch 'main' of https://git.ifuntanhub.dev/izu/student-web-if-development-kit 2026-06-05 11:30:46 +07:00
Farras 1690dcae3e Fix merge conflict dari upstream 2026-06-05 11:24:36 +07:00
andrie 994fec5456 Merge pull request 'fix(ACAAB): memperbaiki conflict localization' (#4) from fixing-layout into main
Reviewed-on: andrie/student-web-if-development-kit#4
2026-06-05 04:17:53 +00:00
AufaHafizah 992bbd7684 Merge pull request 'chore(localization): merge upstream updates and preserve C4A keys' (#5) from feature/bilingual-support into main
Reviewed-on: AnderiSaputra/student-web-if-development-kit#5
2026-06-05 04:11:15 +00:00
cygouw 0c9ece813a chore(localization): merge upstream updates and preserve C4A keys 2026-06-05 11:10:05 +07:00
Farras da38e3eb11 Fix merge konflik 2026-06-05 11:06:58 +07:00
ilham652 9b9241e923 Merge pull request 'resolve merge conflict and bug' (#7) from fix/divisi-kepengurusan-hover into main
Reviewed-on: MuhammadFarras/student-web-if-development-kit#7
2026-06-05 04:00:46 +00:00
ilham_gmail df7041340a resolve merge conflict and bug 2026-06-05 11:00:07 +07:00
izu b19c014ca6 Merge pull request 'Fix/Percepat Data Fetch dari Proxy Pertama' (#13) from Rayhan/roda-student-web-if-development-kit:feat/RODA into main
Reviewed-on: izu/student-web-if-development-kit#13
Approved
2026-06-05 03:57:02 +00:00
ilham652 0f65b47757 Merge pull request 'fix/divisi-kepengurusan-hover' (#6) from fix/divisi-kepengurusan-hover into main
Reviewed-on: MuhammadFarras/student-web-if-development-kit#6
2026-06-05 03:56:36 +00:00
ilham_gmail 48e5d9a4a9 Merge remote-tracking branch 'origin/main' into fix/divisi-kepengurusan-hover 2026-06-05 10:56:03 +07:00
Raditya_Indra_Putranto 350f2be836 merge upstream 2026-06-05 03:52:53 +00:00
Farras 78eebd2099 Merge branch 'main' of https://git.ifuntanhub.dev/MuhammadFarras/student-web-if-development-kit 2026-06-05 10:48:27 +07:00
ilham_gmail d346b7e415 move media and hover style to external style.css 2026-06-05 10:44:43 +07:00
izu 080683c34e Merge pull request 'main' (#9) from Mhanif26/student-web-if-development-kit:main into main
Reviewed-on: izu/student-web-if-development-kit#9
Approved
2026-06-05 03:43:15 +00:00
AufaHafizah b31ba4ed34 Merge pull request 'docs/c4a-readme' (#4) from docs/c4a-readme into main
Reviewed-on: AnderiSaputra/student-web-if-development-kit#4
2026-06-05 03:42:40 +00:00
AufaHafizah 83208bb622 Merge pull request 'feature/bilingual-support' (#3) from feature/bilingual-support into main
Reviewed-on: AnderiSaputra/student-web-if-development-kit#3
2026-06-05 03:42:18 +00:00
cygouw d765783877 fix(C4A): resolve index.html conflict 2026-06-05 10:41:27 +07:00
Mhanif26 28cbd24338 Merge upstream/main into main, preserving our merged localization.js 2026-06-05 10:40:27 +07:00
powji 1acefb4516 Merge pull request 'feature/fix-ukuran-foto-about' (#5) from feature/fix-ukuran-foto-about into main
Reviewed-on: MuhammadFarras/student-web-if-development-kit#5
2026-06-05 03:39:13 +00:00
powji 1e1f2a33e5 Merge pull request 'feature/fix-ukuran-foto-about' (#5) from feature/fix-ukuran-foto-about into main
Reviewed-on: MuhammadFarras/student-web-if-development-kit#5
2026-06-05 03:39:13 +00:00
Farras 9af3a1a731 Fix merge conflicts in localization.js and LimaEm index.html 2026-06-05 10:36:03 +07:00
Farras 7028fc4f30 Fix merge conflicts in localization.js and LimaEm index.html 2026-06-05 10:36:03 +07:00
cygouw f1cd7a8f5f merge branch 'main' into feature/bilingual-support 2026-06-05 10:33:20 +07:00
Mhanif26 067e19a952 chore(localization): merge upstream updates and preserve m4n1fest keys 2026-06-05 10:33:16 +07:00
cygouw ce3c2e6ae8 fix(C4A): resolve merge conflict 2026-06-05 05:24:40 +02:00
GuavaPopper 2166057a8b Percepat fetch data publikasi 2026-06-05 10:20:38 +07:00
cygouw 6430aee79e fix(C4A): resolve merge conflict on index.html - fix h1 title and remove BOM 2026-06-05 05:17:00 +02:00
powji17 4fb6fe8e84 Memperbaiki ukuran tinggi gambar pada section about agar lebih proporsional 2026-06-05 10:13:22 +07:00
powji17 f343a1c7c6 Memperbaiki ukuran tinggi gambar pada section about agar lebih proporsional 2026-06-05 10:13:22 +07:00
cygouw 2fc6b7b6bc fix(C4A): resolve conflict - fix h1 title in index.html 2026-06-05 05:11:07 +02:00
izu 051a9a5669 Merge pull request 'Fix Fetch Publikasi Riset KBK pada Deploy Produksi RODA' (#10) from Rayhan/roda-student-web-if-development-kit:feat/RODA into main
Reviewed-on: izu/student-web-if-development-kit#10
Approved
2026-06-05 03:06:58 +00:00
Farras 68e7c3df2a Merge branch 'feature/konten-Lima-em' 2026-06-05 10:06:45 +07:00
Farras d3d1fce164 Merge branch 'feature/konten-Lima-em' 2026-06-05 10:06:45 +07:00
izu 91b1ad28e4 Merge pull request 'main' (#7) from Araya/student-web-if-development-kit:main into main
Reviewed-on: izu/student-web-if-development-kit#7
Approved
2026-06-05 03:06:42 +00:00
Farras 103fdabc48 feat(LimaEm): memperbaikir deskripsi Study Excursion 2026-06-05 10:05:39 +07:00
Farras 9d408b1a06 feat(LimaEm): memperbaikir deskripsi Study Excursion 2026-06-05 10:05:39 +07:00
Mhanif26 3b85dff0b9 fix(hero): perbaikan tulisan prodi informatika pada bahasa indonesia 2026-06-05 10:03:52 +07:00
Araya's Project 35fe2d814a Merge branch 'main' of https://git.ifuntanhub.dev/Araya/student-web-if-development-kit
Fix conflict
2026-06-05 10:02:02 +07:00
Bayu e7a01dd4a1 chore(LimaEm): hapus fix.js sesuai permintaan setelah sinkronisasi 2026-06-05 10:00:42 +07:00
Bayu cd792dd5f4 chore(LimaEm): hapus fix.js sesuai permintaan setelah sinkronisasi 2026-06-05 10:00:42 +07:00
Arif1031 9f22d4f11b fix(ACAAB): memperbaiki conflict localization 2026-06-05 10:00:41 +07:00
Araya's Project a8e5a93929 resolve conflict: merge apeNameTeamE and grp_habisiniseminar translations 2026-06-05 09:56:56 +07:00
Raditya_Indra_Putranto 761095f7d3 merge upstream 2026-06-05 02:49:47 +00:00
GuavaPopper d3ed1e54af Aktifkan fetch publikasi di produksi 2026-06-05 09:45:02 +07:00