Commit graph

2832 commits

Author SHA1 Message Date
charminULTRA 0b99053918
Merge branch 'master' into mqtt-update 2023-07-09 20:47:59 -04:00
Garth Vander Houwen 60dd3a9051
Merge pull request #720 from meshtastic/trademark_markdown_formatting
Update trademark-grants.mdx
2023-07-09 16:59:01 -07:00
Garth Vander Houwen a990e0d7cc
Update trademark-grants.mdx
Sorry seem to have completely forgotten how to update the docs properly
2023-07-09 16:58:19 -07:00
Garth Vander Houwen 0100c1c91f
Merge pull request #719 from meshtastic/trademark_markdown_formatting
Update trademark-grants.mdx to have a space and be formatted properly
2023-07-09 16:56:37 -07:00
Garth Vander Houwen a99632556d
Update trademark-grants.mdx 2023-07-09 16:55:56 -07:00
Garth Vander Houwen a9d170a751
Merge pull request #718 from meshtastic/3dsafe_trademark_grant
Update trademark-grants with 3DSafe
2023-07-09 16:48:26 -07:00
Garth Vander Houwen a393296e2d
Update trademark-grants.mdx
Add grant section for 3DSafe on Etsy
2023-07-09 16:44:03 -07:00
Garth Vander Houwen d6f6123ddd
Merge branch 'master' into ota-update 2023-07-08 14:42:23 -07:00
Garth Vander Houwen d504d1bd21
Merge pull request #717 from markbirss/master
Update trademark-grants.mdx
2023-07-08 09:31:25 -07:00
Mark Trevor Birss 8a16e6e372
Update trademark-grants.mdx 2023-07-08 18:24:49 +02:00
pdxlocations e1b0bca8da power off clarification 2023-07-07 23:05:41 -07:00
pdxlocations 0f84ed9790 web UI available 2023-07-07 22:57:12 -07:00
pdxlocations 4f201df2f5 remove default root topic 2023-07-07 22:31:26 -07:00
pdxlocations ef16b8d8aa typos, tweaks, add Apple availability 2023-07-07 22:29:05 -07:00
pdxlocations 0b45129718 add tls and root 2023-07-07 22:19:08 -07:00
pdxlocations d814d80f51 proto-what? 2023-07-07 22:02:56 -07:00
Ben Lipsey 8bf45c644b
Merge branch 'master' into ota-update 2023-07-07 08:19:35 -07:00
pdxlocations 3e29ff61fb a bit of clarification 2023-07-07 08:18:15 -07:00
charminULTRA 9a4c66b52f
Merge pull request #714 from pdxlocations/canned-messages-update
Canned Messages documentation update
2023-07-07 10:55:49 -04:00
charminULTRA 8ec63c4bde
Merge branch 'master' into canned-messages-update 2023-07-07 10:51:11 -04:00
charminULTRA f6e6aa0330
Merge pull request #715 from pdxlocations/external-notifications
External Notifications Update
2023-07-07 10:50:42 -04:00
pdxlocations f40700805d remove extra space 2023-07-06 22:51:56 -07:00
pdxlocations 8e2ee9ef08 add options to summary and move active 2023-07-06 22:51:08 -07:00
pdxlocations 8cfb3618f0 correct options and commands 2023-07-06 15:53:30 -07:00
charminULTRA 1e0b9d7928
Merge pull request #712 from pdxlocations/audio-config
Audio config cli corrections
2023-07-06 16:44:53 -04:00
charminULTRA 716799761c
Merge branch 'master' into audio-config 2023-07-06 16:13:55 -04:00
Ben Meadors 8891c545a6
Merge branch 'master' into ota-update 2023-07-06 15:13:11 -05:00
Ben Meadors 947eb6e92d
Merge pull request #713 from pdxlocations/trademark-grants
Grant Ben Lipsey permission to use logos for promotional materials
2023-07-06 15:12:43 -05:00
Ben Meadors bde79b17f8
Merge branch 'master' into trademark-grants 2023-07-06 15:12:26 -05:00
pdxlocations 3633302b97 add Ben Lipsey 2023-07-06 12:57:16 -07:00
charminULTRA bfcb89b4ee
Merge branch 'master' into audio-config 2023-07-06 15:25:52 -04:00
charminULTRA 5767f9cd3c
Merge pull request #708 from pdxlocations/user-config
Update apple user config options
2023-07-06 15:25:40 -04:00
charminULTRA ab537fb59f
Merge branch 'master' into user-config 2023-07-06 15:18:49 -04:00
charminULTRA b93105d6f5
Merge pull request #707 from pdxlocations/power-config
Add missing option from power documentation summary
2023-07-06 15:18:30 -04:00
pdxlocations 51df9c8175 fix cli examples 2023-07-06 11:57:01 -07:00
pdxlocations 65a77b1ea0 fix audio enabled command 2023-07-06 11:54:07 -07:00
charminULTRA 10a237b577
Merge branch 'master' into power-config 2023-07-06 14:01:35 -04:00
charminULTRA 5dd5bd1d0f
Merge branch 'master' into ota-update 2023-07-06 10:08:14 -04:00
charminULTRA 7803812a5a
Merge pull request #709 from pdxlocations/power-config-02
fix cli ls_secs default value
2023-07-06 10:02:56 -04:00
pdxlocations bd629bd593 default tab to apple 2023-07-05 23:56:14 -07:00
pdxlocations 4fdfa015e5 nrf52 OTA documentation framework 2023-07-05 23:29:29 -07:00
pdxlocations a549cc0b79 fix cli ls_secs default value 2023-07-05 22:10:45 -07:00
pdxlocations 2013a4f908 update apple config options 2023-07-05 21:30:06 -07:00
charminULTRA 9361a6db07
Merge branch 'master' into power-config 2023-07-05 20:37:50 -04:00
charminULTRA 2c69053c60
Merge pull request #706 from pdxlocations/position-config
Position Config updates and corrections
2023-07-05 20:37:34 -04:00
pdxlocations bef945f185 add ina address to summary 2023-07-05 16:19:37 -07:00
pdxlocations d92e916e51 position updates and corrections 2023-07-05 14:01:30 -07:00
charminULTRA de9200fa4f
Merge branch 'master' into patch-1 2023-07-05 14:04:33 -04:00
charminULTRA 0eef3bfc46
Merge pull request #704 from pdxlocations/network-config
Network config documentation updates
2023-07-05 14:04:19 -04:00
charminULTRA f9287188ea
Merge branch 'master' into network-config 2023-07-05 13:58:42 -04:00