203 Commits
Author SHA1 Message Date
Ugric 16768210e5 fix diagram 2026-04-09 16:56:32 +01:00
Ugric a1cab3abcf add production server diagram 2026-04-09 16:52:07 +01:00
Ugric 3b5f641e3e Merge pull request 'ensured community leader account available, ensured programs in db for easier marking for lecturer' (#72) from TommyHEC/Komodo-Hub:main into main
Reviewed-on: #72
2026-04-09 11:01:33 +01:00
TommyHEC 407e1184c8 ensured community leader account available, ensured programs in db for easier marking for lecturer 2026-04-09 10:57:35 +01:00
Ugric 4f42003cca add component diagram 2026-04-09 01:56:01 +01:00
Ugric d9bb0dfcb9 revert port number change 2026-04-08 13:37:42 +01:00
Ugric 85fe9558e9 Merge branch 'harvey-main' 2026-04-08 13:33:14 +01:00
harvey f69283fea6 users can now start activities and see which ones they have in progress 2026-04-08 13:30:08 +01:00
Ugric 99471de95d add test accounts 2026-04-08 12:10:33 +01:00
Ugric 9317ba3fb3 Merge branch 'main' of https://git.wbell.dev/Ugric/Komodo-Hub 2026-04-08 12:00:35 +01:00
Ugric f7807c4f60 add messages table 2026-04-08 12:00:33 +01:00
Ugric 0aa75441c4 Merge pull request 'fixed function get_message_between_users() causing an infinite loop' (#70) from Zack/Komodo-Hub:chatfuncfix into main
Reviewed-on: #70
2026-04-08 11:52:23 +01:00
harvey 70be20aa77 users can now start activities and the due date counts down 2026-04-08 11:42:38 +01:00
William Bell 0699d20b3f add docker 2026-04-08 11:38:11 +01:00
Zack 8b2761a3a8 fixed function get_message_between_users() causing an infinite loop 2026-04-08 09:45:10 +01:00
Ugric cd95be172b disable admin panel button in navbar 2026-04-07 16:54:15 +01:00
harvey 31db14f904 started working on activities page 2026-04-07 16:50:22 +01:00
Ugric d75d642c75 add link to game 2026-04-07 16:29:50 +01:00
Ugric b8091f5629 fix navbar drop down going off the screen and move messages button to the drop down 2026-04-07 14:55:44 +01:00
Ugric 5b1616d062 Merge pull request 'messaging system' (#68) from Zack/Komodo-Hub:chatfunc into main
Reviewed-on: #68
2026-04-07 11:03:56 +01:00
Zack 35f426e815 Merge branch 'main' into chatfunc 2026-04-07 10:17:18 +01:00
Ugric 159af0ac98 Merge pull request 'moved evidence and labs into 'evidence' folder' (#67) from TussockyJoker/Komodo-Hub:main into main
Reviewed-on: #67
2026-04-07 08:55:26 +01:00
386a51 4975fc71e3 messaging system uses userid straight from the DB isntead of tokens 2026-04-07 07:07:50 +00:00
TussockyJoker 22a3ea04a2 labs/evidence moved to folder to tidy root directory 2026-04-07 07:02:29 +01:00
TussockyJoker 721ae0c79e merge upstream 2026-04-07 06:54:48 +01:00
Ugric 6fdecaaff9 Merge pull request 'made settings page, can chnage account type and username and email' (#66) from EavanSingh/Komodo-Hub:main into main
Reviewed-on: #66
2026-04-07 00:41:56 +01:00
deole2 20dc16a217 made settings page, can chnage account type and username and email 2026-04-07 00:39:38 +01:00
Ugric c2936b15e9 Merge branch 'main' of https://git.wbell.dev/Ugric/Komodo-Hub 2026-04-07 00:24:17 +01:00
Ugric 5debf54927 change navbar slightly 2026-04-07 00:24:02 +01:00
Ugric c17a7aa160 Merge pull request 'added password reset' (#64) from EavanSingh/Komodo-Hub:main into main
Reviewed-on: #64
2026-04-07 00:02:23 +01:00
deole2 7a9b6acaa4 added password reset 2026-04-07 00:01:25 +01:00
TussockyJoker fd749339de Merge branch 'main' of https://git.wbell.dev/TussockyJoker/Komodo-Hub 2026-04-06 16:18:11 +01:00
Ugric ae22ab9317 fix error caused by not fully changing everything related to species when making the new articles pages 2026-04-06 15:53:12 +01:00
Ugric 9284f4e3b1 Merge remote-tracking branch 'refs/remotes/origin/main' 2026-04-06 15:49:40 +01:00
Ugric 2a11d13ba3 lock admin related things behind the new admin account 2026-04-06 15:48:33 +01:00
Ugric 7c35df4d6a Merge pull request 'implemented articles system' (#63) from TussockyJoker/Komodo-Hub:main into main
Reviewed-on: #63
2026-04-06 15:47:25 +01:00
TussockyJoker 4e603b77c2 updated article styling 2026-04-06 15:47:13 +01:00
TussockyJoker c6a7468f95 merge upstream 2026-04-06 15:36:49 +01:00
TussockyJoker f5e2349aca updated example db with new articles table 2026-04-06 15:16:43 +01:00
TussockyJoker 1e8f3b67f3 article searching working 2026-04-06 15:13:58 +01:00
TussockyJoker 23884c2bad article library page and individual articles working 2026-04-06 05:29:34 +01:00
TussockyJoker 8dc5dacd09 added articles table to db 2026-04-06 04:54:22 +01:00
TussockyJoker 5bd1ec7fa4 changed display_all_items macro to display_all_species and added display_all_articles macro 2026-04-05 23:33:52 +01:00
TussockyJoker 9ddc6f3771 fixed 'register now' button going to wrong url on about page 2026-04-05 20:09:35 +01:00
TussockyJoker 27bafb8caa Merge pull request 'updated secret key value, updated example db (with test accounts)' (#62) from TussockyJoker/Komodo-Hub:main into main
Reviewed-on: #62
2026-04-04 07:51:57 +01:00
TussockyJoker 230584a3de updated example db for testing, created test accounts 2026-04-04 07:50:24 +01:00
TussockyJoker 48e5beba86 changed secret key to uuid value 2026-04-04 06:02:57 +01:00
TussockyJoker 739199a0b7 merge upstream 2026-03-31 23:18:55 +01:00
TussockyJoker f4cd286c8b updated gitignore 2026-03-31 23:18:34 +01:00
Ugric 79ecc1777f Merge pull request 'added programs' (#60) from TommyHEC/Komodo-Hub:main into main
Reviewed-on: #60
2026-03-30 01:54:26 +01:00