Commit Graph

Select branches

Hide Pull Requests

main

merge

#1

Mono Color

• 32be41ea46 login WIP newtbot 2024-01-20 04:13:20 +08:00
• f20b4d2088
  Merge pull request #39 from Newtbot/Dev-branch noot 2024-01-20 01:22:48 +08:00
• 2ecb69c828 a newtbot 2024-01-20 01:22:19 +08:00
• 1ed59aba97 Update apiDatabase.js newtbot 2024-01-20 01:20:44 +08:00
• 90f4f39795 update Leo 2024-01-19 20:30:03 +08:00
• f6e7e158ec Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-19 20:22:45 +08:00
• 60c132d9ea update Leo 2024-01-19 20:22:41 +08:00
• c6c7ea978a Merge branch 'update' newtbot 2024-01-19 18:17:32 +08:00
• fbbeebd10f
  Merge pull request #35 from Newtbot/minor-cleanup noot 2024-01-19 18:15:03 +08:00
• 47aaf71d10 Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-19 16:13:51 +08:00
• bd58f96d3c update Leo 2024-01-19 16:07:47 +08:00
• a4f178bb21
  Merge pull request #36 from Newtbot/Dev-branch noot 2024-01-19 16:05:52 +08:00
• e63bcf1734 register blah newtbot 2024-01-19 16:04:50 +08:00
• c1824ff0eb minor cleanup BIG2EYEZ 2024-01-19 15:42:47 +08:00
• 35040df1ed
  Merge pull request #34 from Newtbot/Dev-branch noot 2024-01-19 03:23:33 +08:00
• 8dd917e541 Merge branch 'main' into Dev-branch newtbot 2024-01-19 03:23:13 +08:00
• 908a8bd351 ejs templating newtbot 2024-01-19 03:21:15 +08:00
• a80149bc5f
  Merge pull request #33 from Newtbot/ORM BIG2EYEZ 2024-01-18 20:38:48 +08:00
• 8aeb622b17 CHANGE ALL MYSQL TO ORM BIG2EYEZ 2024-01-18 18:34:09 +08:00
• c76c819689 Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-18 09:07:37 +08:00
• 61aeca0961 fixed newtbot 2024-01-18 03:18:18 +08:00
• 8133bc7aca a newtbot 2024-01-18 03:17:36 +08:00
• 63f07add82 Merge branch 'Dev-branch' newtbot 2024-01-18 03:17:00 +08:00
• 4e4e8bfee2 a newtbot 2024-01-18 03:15:31 +08:00
• a6ae83265e
  Merge pull request #31 from Newtbot/BRUTEFORCE noot 2024-01-18 03:14:15 +08:00
• 8c4896bca3 ADDED BRUTE FORCE PREVENTION BIG2EYEZ 2024-01-17 22:51:21 +08:00
• beb9a8c7d4 Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-17 21:06:43 +08:00
• 1f63afd4a5
  Merge pull request #30 from Newtbot/newest noot 2024-01-17 19:12:07 +08:00
• 91bf4fb565 Merge branch 't' Leo 2024-01-17 19:06:13 +08:00
• cafdcf64d0 env not working Leo 2024-01-17 18:35:29 +08:00
• f03b2d10aa update Leo 2024-01-17 17:48:10 +08:00
• 36b9531b2a
  Merge pull request #29 from Newtbot/t noot 2024-01-17 17:30:08 +08:00
• a826f9c58b update Leo 2024-01-17 17:30:08 +08:00
• 15b36a7ce2
  Merge pull request #28 from Newtbot/minor noot 2024-01-17 17:29:21 +08:00
• 79ed9c471a test Leo 2024-01-17 16:46:14 +08:00
• c161222a04 Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-17 16:46:01 +08:00
• 5170772d1c minor changes not stroeeing anti csrf token in sesssion but in a variable BIG2EYEZ 2024-01-17 16:45:24 +08:00
• 269627597e a newtbot 2024-01-17 16:45:22 +08:00
• 773138dbc7 update Leo 2024-01-17 16:12:05 +08:00
• 061b1af39e update Leo 2024-01-17 16:05:10 +08:00
• daa4b79765
  Merge pull request #25 from Newtbot/CLEANUP-RBAC BIG2EYEZ 2024-01-17 15:00:11 +08:00
• 0bc096fd3c
  Merge pull request #27 from Newtbot/Dev-branch noot 2024-01-16 21:06:55 +08:00
• 1ddce4b743 blah newtbot 2024-01-16 21:06:37 +08:00
• df27700262
  Update README.md noot 2024-01-16 20:58:37 +08:00
• e9409f8560
  Merge pull request #26 from Newtbot/Dev-branch noot 2024-01-16 20:55:08 +08:00
• 915e4a7e5c apimiddleware done? newtbot 2024-01-16 20:54:18 +08:00
• 35d8c74990 RBAC ADDED AND LOG FILTERING BIG2EYEZ 2024-01-16 17:54:33 +08:00
• 1fbfa68f1a
  Merge pull request #24 from Newtbot/Dev-branch noot 2024-01-16 04:43:58 +08:00
• 7e4b2d8026 WIP token newtbot 2024-01-16 04:43:39 +08:00
• 462e67c779
  Merge pull request #23 from Newtbot/cleanup noot 2024-01-15 17:28:53 +08:00
• 7aeea7646a
  Merge pull request #22 from Newtbot/Dev-branch noot 2024-01-15 17:28:21 +08:00
• 49371e546f cleanup BIG2EYEZ 2024-01-15 16:35:09 +08:00
• 290d0653d9 models update newtbot 2024-01-15 01:56:18 +08:00
• 935709c2eb tidy up newtbot 2024-01-14 23:31:00 +08:00
• d26b0a74bf
  Merge pull request #21 from Newtbot/Dev-branch noot 2024-01-14 17:50:10 +08:00
• d9e028d300 migrated database folder to my own folders newtbot 2024-01-14 17:49:44 +08:00
• 70efee14f8
  Update README.md noot 2024-01-14 02:50:22 +08:00
• b55ca3d3a3
  Update README.md noot 2024-01-14 02:50:09 +08:00
• 21360f0573
  Update README.md noot 2024-01-14 02:49:22 +08:00
• 05a2ec0b17
  Update README.md noot 2024-01-14 02:48:52 +08:00
• f2c7cd1067
  Update README.md noot 2024-01-14 02:48:37 +08:00
• 9f2b0dbba4
  Update README.md noot 2024-01-14 02:48:08 +08:00
• b7cd104025
  Merge pull request #20 from Newtbot/Dev-branch noot 2024-01-14 02:43:54 +08:00
• c00a57d5f6 iot sensor finished newtbot 2024-01-14 02:43:27 +08:00
• 5cd52f9991
  Merge pull request #19 from Newtbot/ANTI-CSRF-FUNCTION-ALL noot 2024-01-13 17:13:47 +08:00
• bfa005b08b ANTI CSRF FUNCTION BIG2EYEZ 2024-01-13 15:34:16 +08:00
• f91e99330a
  Merge pull request #17 from Newtbot/anti-csrf noot 2024-01-13 02:53:11 +08:00
• 75062e7e30 Update package-lock.json newtbot 2024-01-13 02:52:50 +08:00
• d3208d9dce Merge branch 'Dev-branch' newtbot 2024-01-13 02:52:48 +08:00
• a7e1a0028e blah newtbot 2024-01-13 02:47:01 +08:00
• 183e73eca2 redo ant csrf token BIG2EYEZ 2024-01-13 01:17:07 +08:00
• f2a9facfaf
  Merge pull request #15 from Newtbot/anti-csrf-token BIG2EYEZ 2024-01-12 22:20:25 +08:00
• 7f81fecb86
  Merge pull request #16 from Newtbot/Dev-branch noot 2024-01-12 20:10:37 +08:00
• b3f2f4e5f6 data routes done newtbot 2024-01-12 18:03:51 +08:00
• 9dcf1429a8 anti csrf token generated upon login BIG2EYEZ 2024-01-12 16:58:47 +08:00
• acdfaffd26
  Merge pull request #14 from Newtbot/Dev-branch noot 2024-01-12 16:23:52 +08:00
• 21edf3aa07 express backend newtbot 2024-01-12 02:50:46 +08:00
• f1d13a1217 a newtbot 2024-01-12 02:47:37 +08:00
• 88918a46cc
  Merge pull request #12 from Newtbot/login noot 2024-01-12 02:45:11 +08:00
• 2d5a21affe Update package-lock.json newtbot 2024-01-12 02:44:14 +08:00
• 41336df568 Merge branch 'main' into login newtbot 2024-01-12 02:43:51 +08:00
• 9f79cff0b5
  Merge pull request #13 from Newtbot/Dev-branch noot 2024-01-12 02:33:39 +08:00
• d4510dace4 more routes newtbot 2024-01-12 02:32:50 +08:00
• 4f73ecd808 added secure session token (will add csrf protection next)d BIG2EYEZ 2024-01-11 19:19:59 +08:00
• c06ca3bc79
  Merge pull request #11 from Newtbot/Dev-branch noot 2024-01-11 04:14:36 +08:00
• b5e2820bc7 WIP newtbot 2024-01-11 04:14:20 +08:00
• 1e0c154994 Merge branch 'main' of https://github.com/Newtbot/MP viviannTam 2024-01-10 16:46:55 +08:00
• cf153c03cb login and Signup viviannTam 2024-01-10 16:46:45 +08:00
• 1fb4bae511
  Merge pull request #10 from Newtbot/Dev-branch noot 2024-01-10 03:32:03 +08:00
• aa79f2873f a newtbot 2024-01-10 03:30:53 +08:00
• ce1c44556f
  Merge pull request #9 from Newtbot/update-with-dashboard-data BIG2EYEZ 2024-01-09 18:41:40 +08:00
• 900a876e8e update with dashboard data BIG2EYEZ 2024-01-09 17:36:58 +08:00
• 8a66068b98 update with dashboard data BIG2EYEZ 2024-01-09 17:34:16 +08:00
• d1d3091eec
  Merge pull request #8 from Newtbot/Dev-branch noot 2024-01-09 02:02:15 +08:00
• ce2b776920 WIP routes data newtbot 2024-01-09 02:01:59 +08:00
• a8a424968e
  Merge pull request #7 from Newtbot/Dev-branch noot 2024-01-08 01:41:55 +08:00
• c2dc608d5b aa route newtbot 2024-01-08 01:41:35 +08:00
• 2641b7ad24
  Merge pull request #6 from Newtbot/Dev-branch noot 2024-01-07 04:22:35 +08:00
• 64e022e2ea more routes! newtbot 2024-01-07 04:15:22 +08:00
• 5ff05a7a9e
  Merge pull request #5 from Newtbot/seed-routes noot 2024-01-05 19:43:38 +08:00