Commit graph

937 commits

Author SHA1 Message Date
Bastian Schroll
7c6611a072 fix mysql plugin 2018-01-03 12:10:20 +01:00
Bastian Schroll
52e724be5d fix travis build 2017-12-23 18:24:05 +01:00
Bastian Schroll
16f576064e fix travis build 2017-12-23 14:54:07 +01:00
Bastian Schroll
20becf5337
Merge pull request #345 from Schrolli91/add_mysql_port
Add mysql port
2017-12-23 14:12:55 +01:00
Bastian Schroll
c212eac45b edit CL 2017-12-23 13:24:02 +01:00
Jan-Hendrik Plogmann
46f7719c89 fixed syntax 2017-12-23 12:37:13 +01:00
Jan-Hendrik Plogmann
b565a31637 added mysql Port to mysql connect and config 2017-12-23 12:35:02 +01:00
Bastian Schroll
5cabb9ab4d dev ready for next version 2017-12-21 09:31:06 +01:00
Bastian Schroll
ba1c35b44d dev ready for next version 2017-12-21 09:27:00 +01:00
Bastian Schroll
48e518deac Merge branch 'new_version' into develop 2017-12-21 09:24:45 +01:00
Bastian Schroll
cc81c30848
Merge branch 'master' into new_version 2017-12-21 09:22:28 +01:00
Bastian Schroll
decd4461d7 prepare new Version 2.3 2017-12-21 09:20:31 +01:00
Bastian Schroll
a9ac73a634 del submodules 2017-12-21 09:17:59 +01:00
Bastian Schroll
9a63c25640 del submodules 2017-12-21 09:17:37 +01:00
Bastian Schroll
b96e099cea rev sub's to last release version 2017-12-21 09:11:37 +01:00
Bastian Schroll
9fd07658f6 multimon and sdr-rtl as submodule
added the used tools as a git submodule to have better control over versions
2017-12-20 11:23:29 +01:00
Bastian Schroll
4f0caae300
Merge pull request #337 from Schrolli91/fix_http_req
fix http request plugin bug
2017-12-20 06:59:57 +01:00
Bastian Schroll
fe96367769
Merge pull request #339 from Schrolli91/fix_travis_fail
fix travis build fail
2017-12-19 14:10:43 +01:00
Bastian Schroll
76253ac900 fix travis build fail 2017-12-19 13:45:12 +01:00
Bastian Schroll
4811477656
Merge pull request #307 from f-kessler/dev-express-alarm
multicastAlarm added as function
2017-12-19 11:50:11 +01:00
Bastian Schroll
02d7ba2055
Merge branch 'develop' into fix_http_req 2017-12-19 11:40:01 +01:00
Bastian Schroll
2b90ebef8a edit CL 2017-12-19 11:38:47 +01:00
Bastian Schroll
335a051cb0
Merge pull request #338 from Schrolli91/fix_fm2_desc
comment for FE in source
2017-12-19 11:34:43 +01:00
Bastian Schroll
4646012723 comment for FE in source 2017-12-19 11:28:04 +01:00
Bastian Schroll
0539e33207 fix copy fail
only made a ref not a real copy
2017-12-19 09:05:27 +01:00
Bastian Schroll
1771c2ec6f edit CL 2017-12-19 08:36:58 +01:00
Bastian Schroll
84932346b5 fix http request plugin bug
data field overwrite bug
2017-12-19 08:35:10 +01:00
Bastian Schroll
568ead750e
Merge branch 'develop' into dev-express-alarm 2017-12-18 13:25:02 +01:00
Bastian Schroll
e9b7cf17ba
Merge branch 'develop' into dev-express-alarm 2017-12-18 13:22:08 +01:00
Bastian Schroll
493624ea22
Merge pull request #335 from Schrolli91/Schrolli91-patch-1
insert BW3 forum info
2017-12-15 23:27:23 +01:00
Bastian Schroll
eb10fdce43
insert BW3 forum info 2017-12-15 23:23:54 +01:00
Bastian Schroll
dbebc75d82
Merge pull request #317 from Schrolli91/dev_netHistory
Net Ident History Flag in config
2017-12-09 15:56:03 +01:00
f-kessler
59b78a4f64 multi delimiter and text RICs
Changed to support multiple delimiters and text RICs
2017-10-23 20:34:25 +02:00
Bastian Schroll
9c0c5e9358 Merge branch 'develop' into dev_netHistory 2017-10-21 23:08:54 +02:00
Bastian Schroll
3b2275094d Merge branch 'develop' into dev-express-alarm 2017-10-21 23:08:10 +02:00
Bastian Schroll
3265c51316 Merge pull request #324 from Schrolli91/remove_beta
remove beta branch
2017-10-21 23:06:16 +02:00
Bastian Schroll
9d06e38de9 edit CL 2017-10-21 22:57:52 +02:00
Bastian Schroll
fb82b1868d edit CL 2017-10-21 22:57:10 +02:00
Bastian Schroll
50a2c70408 edit CL 2017-10-21 22:55:46 +02:00
Bastian Schroll
c144205eb0 edit version 2017-10-21 22:50:55 +02:00
Bastian Schroll
44821bbfcd edit CL 2017-10-21 22:49:18 +02:00
Bastian Schroll
66d2b4a79a Merge branch 'develop' into remove_beta 2017-10-21 22:42:47 +02:00
Bastian Schroll
fea211f32a edit for release 2017-10-21 22:37:31 +02:00
Bastian Schroll
2836f2857e Merge pull request #325 from Schrolli91/develop
Version 2.2.2
2017-10-21 22:36:32 +02:00
Bastian Schroll
c15de920ac edit CL 2017-10-21 22:34:37 +02:00
Bastian Schroll
5ec51d56cf edit CL for release 2017-10-21 22:33:08 +02:00
Bastian Schroll
9cad78f71c edit CL 2017-10-21 22:23:19 +02:00
Bastian Schroll
9e0e43ee13 edit travis config 2017-10-21 22:20:53 +02:00
Bastian Schroll
c49c76dd6b edit installer 2017-10-21 22:20:46 +02:00
Bastian Schroll
2626a0418f edit CL 2017-10-21 22:20:34 +02:00