Commit Graph

Select branches

Hide Pull Requests

harvey-main

main

#22

#26

#27

#29

#31

#32

#33

#34

#35

#37

#40

#41

#42

#43

#44

#46

#49

#50

#51

#52

#53

#54

#56

#58

#59

#60

#62

#63

#64

#66

#67

#68

#70

#71

#72

Mono Color

• 16768210e5 fix diagram main Ugric 2026-04-09 16:56:32 +01:00
• a1cab3abcf add production server diagram Ugric 2026-04-09 16:52:07 +01:00
• 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 Ugric 2026-04-09 11:01:33 +01:00
• 407e1184c8 ensured community leader account available, ensured programs in db for easier marking for lecturer TommyHEC 2026-04-09 10:57:35 +01:00
• 4f42003cca add component diagram Ugric 2026-04-09 01:56:01 +01:00
• d9bb0dfcb9 revert port number change Ugric 2026-04-08 13:37:42 +01:00
• 85fe9558e9 Merge branch 'harvey-main' Ugric 2026-04-08 13:33:14 +01:00
• f69283fea6 users can now start activities and see which ones they have in progress harvey-main harvey 2026-04-08 13:30:08 +01:00
• 99471de95d add test accounts Ugric 2026-04-08 12:10:33 +01:00
• 9317ba3fb3 Merge branch 'main' of https://git.wbell.dev/Ugric/Komodo-Hub Ugric 2026-04-08 12:00:35 +01:00
• f7807c4f60 add messages table Ugric 2026-04-08 12:00:33 +01:00
• 0aa75441c4 Merge pull request 'fixed function get_message_between_users() causing an infinite loop' (#70) from Zack/Komodo-Hub:chatfuncfix into main Ugric 2026-04-08 11:52:23 +01:00
• 70be20aa77 users can now start activities and the due date counts down harvey 2026-04-08 11:42:38 +01:00
• 0699d20b3f add docker William Bell 2026-04-08 11:38:11 +01:00
• 8b2761a3a8 fixed function get_message_between_users() causing an infinite loop Zack 2026-04-08 09:45:10 +01:00
• cd95be172b disable admin panel button in navbar Ugric 2026-04-07 16:54:15 +01:00
• 31db14f904 started working on activities page harvey 2026-04-07 16:50:22 +01:00
• d75d642c75 add link to game Ugric 2026-04-07 16:29:50 +01:00
• b8091f5629 fix navbar drop down going off the screen and move messages button to the drop down Ugric 2026-04-07 14:55:44 +01:00
• 5b1616d062 Merge pull request 'messaging system' (#68) from Zack/Komodo-Hub:chatfunc into main Ugric 2026-04-07 11:03:56 +01:00
• 35f426e815 Merge branch 'main' into chatfunc Zack 2026-04-07 10:17:18 +01:00
• 159af0ac98 Merge pull request 'moved evidence and labs into 'evidence' folder' (#67) from TussockyJoker/Komodo-Hub:main into main Ugric 2026-04-07 08:55:26 +01:00
• 4975fc71e3 messaging system uses userid straight from the DB isntead of tokens 386a51 2026-04-07 07:07:50 +00:00
• 22a3ea04a2 labs/evidence moved to folder to tidy root directory TussockyJoker 2026-04-07 07:02:29 +01:00
• 721ae0c79e merge upstream TussockyJoker 2026-04-07 06:54:48 +01:00
• 6fdecaaff9 Merge pull request 'made settings page, can chnage account type and username and email' (#66) from EavanSingh/Komodo-Hub:main into main Ugric 2026-04-07 00:41:56 +01:00
• 20dc16a217 made settings page, can chnage account type and username and email deole2 2026-04-07 00:39:38 +01:00
• c2936b15e9 Merge branch 'main' of https://git.wbell.dev/Ugric/Komodo-Hub Ugric 2026-04-07 00:24:17 +01:00
• 5debf54927 change navbar slightly Ugric 2026-04-07 00:24:02 +01:00
• c17a7aa160 Merge pull request 'added password reset' (#64) from EavanSingh/Komodo-Hub:main into main Ugric 2026-04-07 00:02:23 +01:00
• 7a9b6acaa4 added password reset deole2 2026-04-07 00:01:25 +01:00
• fd749339de Merge branch 'main' of https://git.wbell.dev/TussockyJoker/Komodo-Hub TussockyJoker 2026-04-06 16:18:11 +01:00
• ae22ab9317 fix error caused by not fully changing everything related to species when making the new articles pages Ugric 2026-04-06 15:53:12 +01:00
• 9284f4e3b1 Merge remote-tracking branch 'refs/remotes/origin/main' Ugric 2026-04-06 15:49:40 +01:00
• 2a11d13ba3 lock admin related things behind the new admin account Ugric 2026-04-06 15:48:33 +01:00
• 7c35df4d6a Merge pull request 'implemented articles system' (#63) from TussockyJoker/Komodo-Hub:main into main Ugric 2026-04-06 15:47:25 +01:00
• 4e603b77c2 updated article styling TussockyJoker 2026-04-06 15:47:13 +01:00
• c6a7468f95 merge upstream TussockyJoker 2026-04-06 15:36:49 +01:00
• f5e2349aca updated example db with new articles table TussockyJoker 2026-04-06 15:16:43 +01:00
• 1e8f3b67f3 article searching working TussockyJoker 2026-04-06 15:13:58 +01:00
• 23884c2bad article library page and individual articles working TussockyJoker 2026-04-06 05:29:34 +01:00
• 8dc5dacd09 added articles table to db TussockyJoker 2026-04-06 04:54:22 +01:00
• 5bd1ec7fa4 changed display_all_items macro to display_all_species and added display_all_articles macro TussockyJoker 2026-04-05 23:33:52 +01:00
• 9ddc6f3771 fixed 'register now' button going to wrong url on about page TussockyJoker 2026-04-05 20:09:35 +01:00
• 27bafb8caa Merge pull request 'updated secret key value, updated example db (with test accounts)' (#62) from TussockyJoker/Komodo-Hub:main into main TussockyJoker 2026-04-04 07:51:57 +01:00
• 230584a3de updated example db for testing, created test accounts TussockyJoker 2026-04-04 07:50:24 +01:00
• 48e5beba86 changed secret key to uuid value TussockyJoker 2026-04-04 06:02:57 +01:00
• 739199a0b7 merge upstream TussockyJoker 2026-03-31 23:18:55 +01:00
• f4cd286c8b updated gitignore TussockyJoker 2026-03-31 23:18:34 +01:00
• 79ecc1777f Merge pull request 'added programs' (#60) from TommyHEC/Komodo-Hub:main into main Ugric 2026-03-30 01:54:26 +01:00
• 1a86be8fd8 added programs TommyHEC 2026-03-24 17:49:49 +00:00
• d630295f61 Merge pull request 'improved about page, added working class creation/join, assignment creation/completion' (#59) from TommyHEC/Komodo-Hub:main into main Ugric 2026-03-19 17:40:45 +00:00
• 86be776bcc improved about page, added working class creation/join, assignment creation/completion TommyHEC 2026-03-19 14:47:08 +00:00
• ed5147fafe Merge pull request 'Updated navbar buttons, added about page, added rough hangman game' (#58) from TussockyJoker/Komodo-Hub:main into main Ugric 2026-03-19 03:04:46 +00:00
• b1731c4aab added rough hangman game TussockyJoker 2026-03-17 15:53:09 +00:00
• 42c47b3f18 Delete hangman.html TussockyJoker 2026-03-14 16:32:42 +00:00
• 230558698d Merge branch 'main' of https://git.wbell.dev/TussockyJoker/Komodo-Hub TussockyJoker 2026-03-14 16:32:08 +00:00
• f51b1c89a8 removed uneccessary import, updated least concern icon TussockyJoker 2026-03-14 16:32:00 +00:00
• e4fb2c4f48 merge upstream TussockyJoker 2026-03-14 16:30:03 +00:00
• 59e6dfbe49 add query to search bar Ugric 2026-03-12 19:23:39 +00:00
• ca221771ba fix images not displaying when the database is cleared Ugric 2026-03-12 18:22:20 +00:00
• fdfd653873 switch to using a token based authentication system fixing #57 Ugric 2026-03-10 22:59:01 +00:00
• 207b4f1414 Added rough about page TussockyJoker 2026-03-10 20:49:15 +00:00
• bb2bdd53ec Merge branch 'main' of https://git.wbell.dev/TussockyJoker/Komodo-Hub TussockyJoker 2026-03-10 17:25:32 +00:00
• 0a5976b61c Updated navbar to have separate login/register buttons, still need to make them go away when logged in TussockyJoker 2026-03-10 17:25:30 +00:00
• 746cbf602d switch password hashing to bcrypt and move the accounts database to be in the same database as everything else. Ugric 2026-03-10 17:20:10 +00:00
• 45e4d63f2f Merge pull request 'added user accounts and dashboard' (#56) from TommyHEC/Komodo-Hub:main into main Ugric 2026-03-10 16:34:43 +00:00
• e7815b4589 added user accounts and dashboard TommyHEC 2026-03-10 15:34:55 +00:00
• 8c1ad1dd2f Merge pull request 'Added species editing page, added delete button to species info page' (#54) from TussockyJoker/Komodo-Hub:main into main Ugric 2026-03-09 05:58:56 +00:00
• 1938d7ba0e Added flash message to explain why user was redirected when attempting to add a species already in db TussockyJoker 2026-03-07 21:24:31 +00:00
• e6b5cc5fe2 switched order of items in species_editor to better match species_info TussockyJoker 2026-03-07 20:58:42 +00:00
• e6094e4765 Merge branch 'main' of https://git.wbell.dev/TussockyJoker/Komodo-Hub TussockyJoker 2026-03-07 20:42:48 +00:00
• 4a1f8120a7 merge upstream TussockyJoker 2026-03-07 20:42:42 +00:00
• f119c6f7e9 updated species_info styling TussockyJoker 2026-03-07 20:39:42 +00:00
• 53c13aae50 Fixed delete button and adjusted styling on species editing page TussockyJoker 2026-03-07 20:28:51 +00:00
• 1c2575091e added delete button to species_editor, updated styling TussockyJoker 2026-03-07 19:52:22 +00:00
• 781e38ab49 Can now preview current photo in species editor, styling changes to species editor TussockyJoker 2026-03-07 19:24:08 +00:00
• c518a03df5 Can now edit species from species_info page, can now update photo from species_editor, extinction category now pre-fills in species_editor TussockyJoker 2026-03-07 17:48:54 +00:00
• 2952373e8e Species editor no longer gives an error when successfully updates DB, added editing button on species_info TussockyJoker 2026-03-06 21:17:43 +00:00
• 638f1bb39e created species editor, need to add ability to access from species info page and fix issues TussockyJoker 2026-03-06 00:11:17 +00:00
• 085b205b06 Merge pull request 'can no longer have duplicate species in db, added non-functional registration page, updated styling' (#53) from TussockyJoker/Komodo-Hub:main into main TussockyJoker 2026-03-05 22:03:20 +00:00
• 1c7bf3c37e can no longer have duplicate species in species database TussockyJoker 2026-03-05 22:00:42 +00:00
• 9fd560f6a8 added non-functional registration page TussockyJoker 2026-03-05 21:04:59 +00:00
• 4b82983832 updated vulnerable.png TussockyJoker 2026-03-05 12:24:02 +00:00
• 62f557f9c2 Merge branch 'main' of https://git.wbell.dev/Ugric/Komodo-Hub William Bell 2026-03-05 12:22:09 +00:00
• 11e9981cf1 close a tag William Bell 2026-03-05 12:16:25 +00:00
• 0853108f60 Merge pull request 'updated species_search, removed unwanted lines, fixed navbar styling , added login page button to devtools' (#52) from TussockyJoker/Komodo-Hub:main into main TussockyJoker 2026-03-03 23:28:18 +00:00
• f51db70548 Merge branch 'main' into main TussockyJoker 2026-03-03 23:28:13 +00:00
• 6447b637e4 fixed navbar styling + added button for login page to devtools TussockyJoker 2026-03-03 23:27:02 +00:00
• 53db34cdb9 removed unwanted title from species_search.jinja TussockyJoker 2026-03-03 23:15:30 +00:00
• 2cf5799f20 updated species_search with new macros TussockyJoker 2026-03-03 23:14:07 +00:00
• 0859a1bec7 Merge pull request 'changed 'species.db' to 'database.db', created non-functional login page, removed unnecessary code' (#51) from TussockyJoker/Komodo-Hub:main into main TussockyJoker 2026-03-03 23:08:49 +00:00
• 71b144ddf1 created non-functional login page TussockyJoker 2026-03-03 23:05:37 +00:00
• fd9ed332e0 Merge branch 'main' of https://git.wbell.dev/TussockyJoker/Komodo-Hub TussockyJoker 2026-03-03 22:47:40 +00:00
• 73d73e9b69 updated config.ini, removed unnecessary lines from species.jinja TussockyJoker 2026-03-03 22:47:37 +00:00
• e281dc1689 merge upstream TussockyJoker 2026-03-03 22:38:26 +00:00
• cabafde65f fix for case sensitive file systems Ugric 2026-03-03 22:32:47 +00:00
• e28a269abf changed 'species.db' to 'database.db', removed defunct python file, updated .gitignore TussockyJoker 2026-03-03 22:25:21 +00:00
• 45b158264c Merge pull request 'finished new photo storage method' (#50) from TussockyJoker/Komodo-Hub:main into main TussockyJoker 2026-03-03 22:17:52 +00:00
• 409725920f merge upstream TussockyJoker 2026-03-03 22:12:07 +00:00