Commit Graph

Select branches

Hide Pull Requests

main

merge

#1

Mono Color

• 397efb3734 merged main William Mantly 2024-01-30 14:44:56 -05:00
• 7bdfb02f9a merged William Mantly 2024-01-30 14:44:07 -05:00
• 2996684267 no luck.. newtbot 2024-01-31 03:32:41 +08:00
• fea986a841 Fix file paths and add password reset functionality newtbot 2024-01-31 03:17:24 +08:00
• 12597ad774 reset password wip noot 2024-01-30 16:53:42 +08:00
• e0b64b2252 Merge branch 'main' of https://github.com/Newtbot/MP noot 2024-01-30 15:58:31 +08:00
• 4346f92471 blah noot 2024-01-30 15:58:05 +08:00
• 22230eca12
  Merge pull request #62 from Newtbot/Vivian noot 2024-01-30 15:57:40 +08:00
• 7bd92805dd c viviannTam 2024-01-30 15:54:04 +08:00
• 884209ee9c
  Merge pull request #61 from Newtbot/Vivian noot 2024-01-30 14:50:23 +08:00
• 31fe6b3c7c b viviannTam 2024-01-30 14:48:17 +08:00
• 9a5e128f3f a viviannTam 2024-01-30 13:07:41 +08:00
• 4ee164ebfd a viviannTam 2024-01-30 13:06:44 +08:00
• da46db3134 a viviannTam 2024-01-30 13:05:01 +08:00
• ac98abc23e a viviannTam 2024-01-30 13:03:58 +08:00
• f7e4775ed3 reset password viviannTam 2024-01-30 12:52:52 +08:00
• 899eaf202a Merge branch 'main' of https://github.com/Newtbot/MP newtbot 2024-01-30 02:59:17 +08:00
• 129ca202c0 Update API routes and sensor data functionality And API.ejs newtbot 2024-01-30 02:59:14 +08:00
• 46ea3ae593
  Merge pull request #59 from Newtbot/apilog-and-cleanup noot 2024-01-29 03:42:03 +08:00
• 8836a3cfd4 Add apilog route and remove unused files newtbot 2024-01-29 03:40:49 +08:00
• 9c5aaed414 Merge branch 'main' of https://github.com/Newtbot/MP newtbot 2024-01-29 00:44:22 +08:00
• c268e1d33d Add routes to get location and sensor by name Added viewdata using chart.js newtbot 2024-01-29 00:44:10 +08:00
• 052e3c8664 implement display download and filter api logs BIG2EYEZ 2024-01-28 20:19:45 +08:00
• 03d2031644
  Merge pull request #58 from Newtbot/cleanups BIG2EYEZ 2024-01-28 16:16:40 +08:00
• fadabf3451 Remove unnecessary code and update button styles newtbot 2024-01-28 03:31:39 +08:00
• 548064782e clean up BIG2EYEZ 2024-01-28 00:09:22 +08:00
• d491750916 Fix database model associations and update API route newtbot 2024-01-27 20:15:29 +08:00
• 6190cb63cd
  Merge pull request #56 from Newtbot/y noot 2024-01-27 17:19:35 +08:00
• c3ffbc00af f Leo 2024-01-27 16:59:14 +08:00
• ec1dbfee44
  Merge pull request #55 from Newtbot/update noot 2024-01-27 16:04:14 +08:00
• 54e2987762 upload Leo 2024-01-27 16:03:23 +08:00
• b3e2533ec0 Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-27 05:54:35 +08:00
• 740915f50e Merge branch 'main' of https://github.com/Newtbot/MP newtbot 2024-01-27 04:52:05 +08:00
• c234aa3616 Add nodemailer configuration and console.log statement Update formAJAX function to log data from the server Add getUserByEmail and checkEmail functions Update profile.ejs to require login Update addSensorData function to emit new sensor data Update api.css with styling changes Update token route to generate and send token email Update authChecker middleware to allow user and token routes newtbot 2024-01-27 04:52:02 +08:00
• 34962b84cf update with server info BIG2EYEZ 2024-01-26 19:13:11 +08:00
• 11c5eccafb
  Update README.md noot 2024-01-26 19:09:33 +08:00
• 818d90b440
  Merge pull request #54 from Newtbot/api noot 2024-01-26 04:08:45 +08:00
• d3b031a50d Merge branch 'main' of https://github.com/Newtbot/MP newtbot 2024-01-26 04:07:13 +08:00
• d38423fa6d Update CSS, add relationship between sensorModel and locationModel, and remove console.log statements newtbot 2024-01-26 04:07:11 +08:00
• 52e01e2699 minor changes BIG2EYEZ 2024-01-25 18:45:32 +08:00
• 8b944268a2 Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-25 17:46:28 +08:00
• d4149cebbf edited the api.ejs file BIG2EYEZ 2024-01-25 17:30:55 +08:00
• a77e4c72c9
  Merge pull request #53 from Newtbot/sensor noot 2024-01-25 16:47:42 +08:00
• 39f7ad3c73 landing page done BIG2EYEZ 2024-01-25 16:33:56 +08:00
• ba498a4d4b BLAH stupid middleware error newtbot 2024-01-25 05:11:28 +08:00
• 057fbe2afb iotsensor fixed but session valid broken newtbot 2024-01-25 03:26:56 +08:00
• 92b0f86be6 Merge branch 'main' into sensor BIG2EYEZ 2024-01-24 16:38:43 +08:00
• 2d7501bdca MINOR BIG2EYEZ 2024-01-24 16:31:18 +08:00
• 7403f66c8a more fix newtbot 2024-01-24 16:01:30 +08:00
• ba5b10a068 Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-24 15:51:56 +08:00
• dae836e49b update Leo 2024-01-24 15:51:51 +08:00
• 5c3a43ddd6 sensor and location done and some cleanupd BIG2EYEZ 2024-01-24 15:04:50 +08:00
• 17ee99d570 Merge branch 'main' of github.com:Newtbot/MP William Mantly 2024-01-24 01:38:52 -05:00
• b76becbf20 yolo William Mantly 2024-01-24 01:38:34 -05:00
• d0aeab286a a newtbot 2024-01-24 14:37:57 +08:00
• e710fa15a1 overhaul newtbot 2024-01-24 14:21:13 +08:00
• 3a0163fd42 ws #1 merge William Mantly 2024-01-23 23:15:29 -05:00
• eecb79abb8 more socket fun! William Mantly 2024-01-23 21:59:10 -05:00
• e91bb70b33 sockets work William Mantly 2024-01-23 21:17:27 -05:00
• 375ec679f2 removed old depenencies William Mantly 2024-01-23 19:33:05 -05:00
• 568d422de2 Added env setting for db host William Mantly 2024-01-23 19:32:48 -05:00
• c136b20112 round2 William Mantly 2024-01-23 19:00:57 -05:00
• 173277cc8b round1 William Mantly 2024-01-23 17:07:19 -05:00
• 4aea6a8e4c Update dependencies and fix file paths newtbot 2024-01-24 04:23:54 +08:00
• 940d40ed38 update on sensor BIG2EYEZ 2024-01-23 21:24:12 +08:00
• 7e9b6af0ba socket.io for WS newtbot 2024-01-23 16:00:22 +08:00
• 3dbfe5733b sensor and location wip BIG2EYEZ 2024-01-23 15:33:16 +08:00
• ca3527b53c
  Update README.md noot 2024-01-23 02:17:51 +08:00
• 5b262eb803 Add JavaScript files and edit profile CSS 1) finished edit profile with delete profile newtbot 2024-01-23 01:44:11 +08:00
• 2c62a2f0c0 csp removed sensor wip BIG2EYEZ 2024-01-22 18:07:44 +08:00
• d819ac71b2
  Merge pull request #52 from Newtbot/newest noot 2024-01-22 17:03:09 +08:00
• 409e647646 update Leo 2024-01-22 16:35:06 +08:00
• 7dceee0b79 Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-22 14:37:27 +08:00
• dd345e14e5 update Leo 2024-01-22 14:35:24 +08:00
• 3c8dd68473 Refactor API key validation logic Added API page documentation newtbot 2024-01-22 03:23:48 +08:00
• 3ffcfb4e77 remove sql newtbot 2024-01-21 21:24:46 +08:00
• ca53d5c1de Merge branch 'dev-' newtbot 2024-01-21 21:07:13 +08:00
• 877eaeae43 update newtbot 2024-01-21 21:06:10 +08:00
• 29488362f1
  Merge pull request #50 from Newtbot/csp-wip noot 2024-01-21 20:09:28 +08:00
• 8f37282f9a Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-21 20:02:12 +08:00
• 994aebf71d CSP WIP add sessionid as well BIG2EYEZ 2024-01-21 16:07:27 +08:00
• a749d91425 big doma bug newtbot 2024-01-21 16:04:39 +08:00
• 638993a66a Merge branch 'main' of https://github.com/Newtbot/MP Leo 2024-01-21 14:31:45 +08:00
• 58d3fcaadc update Leo 2024-01-21 14:31:08 +08:00
• 74b610a7b8
  Update README.md noot 2024-01-21 04:33:23 +08:00
• 9b7de43534 update Leo 2024-01-21 04:33:06 +08:00
• 7537880cb1
  Merge pull request #45 from Newtbot/Dev-branch noot 2024-01-21 04:29:08 +08:00
• dfb9a524b4 blah newtbot 2024-01-21 04:28:16 +08:00
• 8adf304f1a
  Merge pull request #44 from Newtbot/ttr noot 2024-01-21 04:11:44 +08:00
• 5d39c6d43f Merge branch 'main' into new Leo 2024-01-21 04:07:16 +08:00
• efcaaf87f6 Merge branch 'Dev-branch' newtbot 2024-01-21 03:59:15 +08:00
• d2ad32e6d6 added api page newtbot 2024-01-21 03:58:03 +08:00
• 9b5ac4fa3a Merge branch 'main' into new Leo 2024-01-21 02:37:44 +08:00
• 719dfe1509 re Leo 2024-01-21 02:36:49 +08:00
• 170441c829 update Leo 2024-01-21 02:35:28 +08:00
• c2651785df update Leo 2024-01-21 02:33:00 +08:00
• 615b0ef292
  Merge pull request #41 from Newtbot/design-update noot 2024-01-20 18:07:33 +08:00
• 2365ea9ede design change BIG2EYEZ 2024-01-20 18:05:42 +08:00
• 13c1959925 Merge remote-tracking branch 'origin/updet' newtbot 2024-01-20 04:15:13 +08:00
• 4a9af2ae7c
  Merge pull request #40 from Newtbot/Dev-branch noot 2024-01-20 04:13:41 +08:00