harvey/Komodo-Hub
1
0 Fork 0
forked from Ugric/Komodo-Hub
Code Pull Requests Activity
184 Commits 1 Branch 0 Tags
main
Commit Graph
184 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
harvey f69283fea6 users can now start activities and see which ones they have in progress 2026-04-08 13:30:08 +01:00
harvey 70be20aa77 users can now start activities and the due date counts down 2026-04-08 11:42:38 +01:00
harvey 31db14f904 started working on activities page 2026-04-07 16:50:22 +01:00
Ugric 159af0ac98 Merge pull request 'moved evidence and labs into 'evidence' folder' (#67) from TussockyJoker/Komodo-Hub:main into main 
Reviewed-on: Ugric/Komodo-Hub#67
 2026-04-07 08:55:26 +01: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: Ugric/Komodo-Hub#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: Ugric/Komodo-Hub#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: Ugric/Komodo-Hub#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: Ugric/Komodo-Hub#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: Ugric/Komodo-Hub#60
 2026-03-30 01:54:26 +01:00
TommyHEC 1a86be8fd8 added programs 2026-03-24 17:49:49 +00:00
Ugric d630295f61 Merge pull request 'improved about page, added working class creation/join, assignment creation/completion' (#59) from TommyHEC/Komodo-Hub:main into main 
Reviewed-on: Ugric/Komodo-Hub#59
 2026-03-19 17:40:45 +00:00
TommyHEC 86be776bcc improved about page, added working class creation/join, assignment creation/completion 2026-03-19 15:19:04 +00:00
Ugric ed5147fafe Merge pull request 'Updated navbar buttons, added about page, added rough hangman game' (#58) from TussockyJoker/Komodo-Hub:main into main 
Reviewed-on: Ugric/Komodo-Hub#58
 2026-03-19 03:04:46 +00:00
TussockyJoker b1731c4aab added rough hangman game 2026-03-17 15:53:09 +00:00
TussockyJoker 42c47b3f18 Delete hangman.html 2026-03-14 16:32:42 +00:00
TussockyJoker 230558698d Merge branch 'main' of https://git.wbell.dev/TussockyJoker/Komodo-Hub 2026-03-14 16:32:08 +00:00
TussockyJoker f51b1c89a8 removed uneccessary import, updated least concern icon 2026-03-14 16:32:00 +00:00
TussockyJoker e4fb2c4f48 merge upstream 2026-03-14 16:30:03 +00:00
Ugric 59e6dfbe49 add query to search bar 2026-03-12 19:23:39 +00:00
Ugric ca221771ba fix images not displaying when the database is cleared 2026-03-12 18:22:20 +00:00
Ugric fdfd653873 switch to using a token based authentication system fixing #57 2026-03-10 22:59:01 +00:00
TussockyJoker 207b4f1414 Added rough about page 2026-03-10 20:49:15 +00:00
TussockyJoker bb2bdd53ec Merge branch 'main' of https://git.wbell.dev/TussockyJoker/Komodo-Hub 2026-03-10 17:25:32 +00:00
TussockyJoker 0a5976b61c Updated navbar to have separate login/register buttons, still need to make them go away when logged in 2026-03-10 17:25:30 +00:00
Ugric 746cbf602d switch password hashing to bcrypt and move the accounts database to be in the same database as everything else. 2026-03-10 17:20:10 +00:00
Ugric 45e4d63f2f Merge pull request 'added user accounts and dashboard' (#56) from TommyHEC/Komodo-Hub:main into main 
Reviewed-on: Ugric/Komodo-Hub#56
 2026-03-10 16:34:43 +00:00
TommyHEC e7815b4589 added user accounts and dashboard 2026-03-10 15:34:55 +00:00
Ugric 8c1ad1dd2f Merge pull request 'Added species editing page, added delete button to species info page' (#54) from TussockyJoker/Komodo-Hub:main into main 
Reviewed-on: Ugric/Komodo-Hub#54
 2026-03-09 05:58:56 +00:00