Commit Graph

1008 Commits

Author SHA1 Message Date
ef9349ec90 Merge pull request 'patch-newversion' (#143) from patch-newversion into dev
Reviewed-on: #143
2025-01-25 10:43:18 +00:00
640cd620b5 docs: changelog 2025-01-25 11:14:17 +01:00
9039254ead docs: new version 2025-01-25 11:14:01 +01:00
8923b8edbe Merge pull request 'testing' (#142) from testing into main
Reviewed-on: #142
2025-01-21 17:21:03 +00:00
81489d5246 Merge pull request 'dev' (#141) from dev into testing
Reviewed-on: #141
2025-01-21 17:20:42 +00:00
833a370347 Merge pull request 'patch-commandref' (#140) from patch-commandref into dev
Reviewed-on: #140
2025-01-21 17:20:19 +00:00
fb50355d39 docs: Changelog 2025-01-21 18:19:54 +01:00
d41615c90f fix: commandref 2025-01-21 18:19:42 +01:00
be5e721c43 Merge pull request 'main' (#138) from main into dev
Reviewed-on: #138
2025-01-21 16:55:10 +00:00
2351e5b9db Merge pull request 'testing' (#136) from testing into main
Reviewed-on: #136
2025-01-21 16:31:26 +00:00
d4626a068b Merge pull request 'dev' (#135) from dev into testing
Reviewed-on: #135
2025-01-21 16:29:35 +00:00
0571adccc5 Merge pull request 'patch-marvin78' (#134) from patch-marvin78 into dev
Reviewed-on: #134
2025-01-21 16:20:07 +00:00
8ec3bcde54 docs: new changelog 2025-01-21 17:19:04 +01:00
bd97e399bf feat: change version 2025-01-21 17:18:12 +01:00
d409662969 feat: https://forum.fhem.de/index.php?topic=136510.0 2025-01-12 12:56:08 +01:00
c1c3e2cbdf Merge pull request 'main' (#133) from main into dev
Reviewed-on: #133
2025-01-12 10:48:38 +00:00
72298746ab Merge pull request 'testing' (#132) from testing into main
Reviewed-on: #132
2024-12-30 11:27:16 +00:00
787114040c Merge pull request 'dev' (#131) from dev into testing
Reviewed-on: #131
2024-12-30 11:26:50 +00:00
b517e032cf Merge pull request 'patch-riedel2' (#130) from patch-riedel2 into dev
Reviewed-on: #130
2024-12-30 11:26:14 +00:00
Marko Oldenburg
30cf6f41d7
Merge pull request #99 from riedel2/dev
Corrected some typos and missing spaces
2024-12-28 08:44:51 +01:00
riedel2
eef3dc7b21
Merge branch 'fhem:dev' into dev 2024-12-27 00:10:23 +01:00
riedel2
cfe3963f32 Merge commit '3542e51375d97a41001ff0a30778fd6b24685774' into dev 2024-12-26 23:35:19 +01:00
riedel2
b654481df1 Corrected some typos and missing spaces 2024-12-26 23:30:36 +01:00
e19c902780 Merge pull request 'testing' (#129) from testing into main
Reviewed-on: #129
2024-10-12 07:11:29 +00:00
757a19bdb5 Merge pull request 'dev' (#128) from dev into testing
Reviewed-on: #128
2024-10-12 05:59:59 +00:00
52930d9a07 Merge pull request 'patch-remove-eperimental' (#127) from patch-remove-eperimental into dev
Reviewed-on: #127
2024-10-12 05:59:27 +00:00
e1592b8b7d docs: Changelog 2024-10-12 07:40:57 +02:00
7eb1079458 fix: remove experimental features
change copyright
2024-10-12 07:40:39 +02:00
ceecbb063a Merge pull request 'testing' (#123) from testing into main
Reviewed-on: #123
2023-01-03 07:50:14 +01:00
49b0ff17fa Merge pull request 'dev' (#122) from dev into testing
Reviewed-on: #122
2023-01-03 07:48:55 +01:00
ae5057fbc5 Merge pull request 'patch-adv' (#121) from patch-adv into dev
Reviewed-on: #121
2022-12-20 14:20:57 +01:00
9cd0d364b4 change Copyright text
new year range
2022-12-20 14:17:08 +01:00
f216e1b308 Merge branch 'dev' of git.cooltux.net:FHEM/mod-AutoShuttersControl into dev 2022-12-20 13:56:59 +01:00
6f137256e0 Merge pull request 'fix selfdefense' (#120) from patch-selfdefense into dev
Reviewed-on: #120
2022-12-20 13:55:47 +01:00
cc5ef41e21 fix selfdefense
change selfdefense condition in SunRiseShuttersAfterTimerFn
2022-12-15 09:56:26 +01:00
587d4e4316 Merge branch 'dev' of https://github.com/fhem/AutoShuttersControl into dev 2022-11-17 10:13:20 +01:00
riedel2
3542e51375
Update 73_AutoShuttersControl.pm
added 'roommate' option at inline help for ASC_Down
2022-11-09 22:39:07 +01:00
Marko Oldenburg
f517b72f23
Merge pull request #97 from riedel2/patch-1
Update 73_AutoShuttersControl.pm
2022-11-05 23:18:48 +01:00
riedel2
ad5cbaac12
Update 73_AutoShuttersControl.pm
HORIZON option not yet added to german help
2022-11-05 21:52:39 +01:00
8da3b13bcc Merge pull request 'testing' (#119) from testing into main
Reviewed-on: #119
2022-08-30 18:20:26 +02:00
c09edf5496 Merge pull request 'dev' (#118) from dev into testing
Reviewed-on: #118
2022-08-30 18:20:03 +02:00
cd1c2c104a Merge pull request 'closes: #116' (#117) from patch-cant_locate_object_method into dev
Reviewed-on: #117
2022-08-30 18:13:21 +02:00
51256c1ed9 closes: #116
[Ticket: #116]
2022-08-30 18:12:01 +02:00
c0a7bfa6df Merge pull request 'patch-CommandRef' (#115) from patch-CommandRef into dev
Reviewed-on: #115
2022-08-29 13:31:17 +02:00
403936fe73 fix CommandRef ASC_Up and ASC_Down entry 2022-08-29 13:30:37 +02:00
5095c65d80 Merge pull request 'main' (#113) from main into testing
Reviewed-on: #113
2022-08-29 10:17:58 +02:00
0bd8d6273f Merge pull request 'dev' (#112) from dev into main
Reviewed-on: #112
2022-08-29 10:09:12 +02:00
c3b61def25 Merge pull request 'fix is in external trigger and shading is aktive' (#111) from patch-externalTriggerAndShading into dev
Reviewed-on: #111
2022-08-29 10:08:01 +02:00
9c096902e8 Merge branch 'dev' into patch-externalTriggerAndShading 2022-08-29 10:07:37 +02:00
6dfc92c35e Merge pull request 'fix little typo in ASC_WindParameter' (#110) from patch-Commandref into dev
Reviewed-on: #110
2022-08-29 10:00:58 +02:00