Commit Graph

86 Commits

Author SHA1 Message Date
Jason Williams f846f77725 Merge branch 'master' into 'release'
Redesign complete. Merging from master into release.

See merge request jaywll/Jnf.me!1
2022-11-21 20:47:18 +00:00
Jason Williams deaa3d6841 Removing unused icon.png 2022-11-21 13:44:07 -07:00
Jason Williams 173ee160ca Fixing error in server configuration 2022-11-21 13:43:56 -07:00
Jason Williams 02e1763715 Adding server configuration 2022-11-21 13:25:58 -07:00
Jason Williams 6910d9aaad Adding google analytics 2022-11-21 13:18:19 -07:00
Jason Williams 2641b72473 Adding favicon and removing unused metadata fields 2022-11-21 13:11:52 -07:00
Jason Williams 021eb37af9 Adjusting Flo's title colour 2022-11-20 20:30:07 -07:00
Jason Williams ac00446e4a Improving back button styling and colour schemes. 2022-11-20 20:23:52 -07:00
Jason Williams a9ac160c85 Adding a back button when profiles are open. 2022-11-20 18:26:36 -07:00
Jason Williams 56e0ceeaae Removing commented out content from Lucy's page 2022-11-20 17:28:21 -07:00
Jason Williams 6daf1d1228 Adding links to Lucy's profle 2022-11-20 17:26:26 -07:00
Jason Williams 838ebbd06d Adding mechanism to handle URL state changes 2022-11-20 13:10:10 -07:00
Jason Williams 671e2d0d1a Adding mechanism to change URLs on page state changes 2022-11-20 12:42:51 -07:00
Jason Williams 78d49c9bc0 Added page for Lucy 2022-11-20 12:30:15 -07:00
Jason Williams 09179986a3 Rebaseline lucy.html 2022-11-20 11:00:54 -07:00
Jason Williams a229dddb9a Remove previous version of Flo's profile picture 2022-11-20 11:00:24 -07:00
Jason Williams 49fb4f3f6c Updating Flo's profile image 2022-11-20 10:58:45 -07:00
Jason Williams ad957702d1 Adding Flo's splash image 2022-11-20 10:19:59 -07:00
Jason Williams 48845160a2 Styling Flo's content and creating a copy of the page for Lucy 2022-11-19 20:14:20 -07:00
Jason Williams 15b9b0a4a1 Merge branch 'master' of https://gitlab.com/jaywll/Jnf.me.git
Conflicts:
	www/index.html
2022-11-19 14:39:49 -07:00
Jason Williams 9ebac86bbf Completed Jason's section 2022-11-19 14:37:00 -07:00
Jason Williams 9efbb3be70 All animations built 2022-11-19 14:11:59 -07:00
Jason Williams 7233356524 Added splash image for Jason 2022-11-19 12:42:14 -07:00
Jason Williams a2421fad12 Created main page structure and animation effects 2022-11-19 11:50:00 -07:00
Jason Williams 6d1d87e4f6 Resetting to HTML5 boilerplate 2022-11-19 09:43:15 -07:00
Jason Williams c0066b5a99 Staging final changes before removing bootstrap and switching to HTML5 boilerplate 2022-11-19 09:32:48 -07:00
Jason Williams 5a0427d601 Updated profile image and added back button, including show/hide functionality. 2022-11-18 16:02:01 -07:00
Jason Williams 5caa16116a Adding splash image for Jason, and updating index.html 2022-11-18 15:03:35 -07:00
Jason Williams 768bed6769 Update index.html to add show/hide mechanism 2022-11-18 13:47:15 -07:00
Jason Williams 098edcceb5 Resetting to basic template 2022-11-18 12:40:40 -07:00
Jason Williams 85972ca9b9 Reconfiguring index.html for local development 2022-11-18 11:45:27 -07:00
Jason Williams ec549579b4 Merge branch 'master' into release 2019-07-23 20:04:32 -06:00
Jason Williams 57ebd44f9c Removing where and signature files to move them to a different domain. 2019-07-23 20:03:41 -06:00
Jason Williams 6e3d192406 Merge branch 'master' into release 2019-02-07 19:45:15 -07:00
Jason Williams 22eb473208 Correcting previous commit. Maybe this will teach me to test before I promote to production? 2019-02-07 19:44:10 -07:00
Jason Williams ed93a61ac6 Merge branch 'master' into release 2019-02-07 19:33:54 -07:00
Jason Williams 942371c988 Updating URL for fetching calendar data after intranet upgrade. 2019-02-07 19:32:27 -07:00
Jason Williams fb7663ff2c Merge branch 'master' into release 2018-10-24 16:43:21 -06:00
Jason Williams 541c25c184 Adding API key for map 2018-10-24 16:42:51 -06:00
Jason Williams 1954fc0e3c Merge branch 'master' into release 2018-10-22 19:14:49 -06:00
Jason Williams f4a9f45637 Updating home assistant authorization to use a long-lived token instead of a password 2018-10-22 19:13:23 -06:00
Jason Williams 359d03faca Merge branch 'master' into release 2018-08-26 21:13:03 -06:00
Jason Williams 09779dd560 Bugfix update: Changed device tracker to use google maps instead of owntracks over mqtt
- Remove device_tracker.jasonsphone_jason
- Add device_tracker.google_maps_106661122982066747046
2018-08-26 21:12:15 -06:00
Jason Williams a1e0b3956f Merge branch 'master' into release 2018-08-20 20:51:29 -06:00
Jason Williams 092500415e Changed three day plan display to remove animation, use full screen width 2018-08-20 20:50:44 -06:00
Jason Williams b31d69dea7 Merge branch 'master' into release 2018-08-19 18:49:20 -06:00
Jason Williams a8765be426 Bugfix for incorrect date: was previously chainging date with UTC timezone instead of local. 2018-08-19 18:48:11 -06:00
Jason Williams b2c126f3db Merge branch 'master' into release 2018-08-19 17:14:36 -06:00
Jason Williams c24a260de2 Merge branch 'where-location' 2018-08-19 17:13:43 -06:00
Jason Williams 39da7791fc Added plan to display, animated slide in from left every time the page is displayed 2018-08-19 17:12:42 -06:00