FreenetIS

Merge branch 'issue-1121' into 'master'

Issue #1121: Fix slow loading of mapy.cz if offline

See merge request freenetis/freenetis!79

Fixes #1121: Fix slow loading of mapy.cz if Loader not fetched (e.g. slow connection or offline). The mapy.cz API is loaded asynchronously now. The map loading is waiting in a loop until it is loaded.

Fixes #1121: Fix slow loading of mapy.cz if Loader not fetched (e.g. slow connection or offline). The mapy.cz API is loaded asynchronously now. The map loading is waiting in a loop until it is loaded.

Merge branch 'issue-1119' into 'master'

Issue #1119: Payment notification redirection reactivation fix

See merge request freenetis/freenetis!76

Merge branch 'issue-1119_develop' into 'develop'

Issue #1119: Payment notification redirection reactivation fix [develop]

See merge request freenetis/freenetis!77

Fixes #1119: Do no activate payment notification redirection on messages reactivation if member configuration deny notification by redirection.

Fixes #1119: Do no activate payment notification redirection on messages reactivation if member configuration deny notification by redirection.

Merge branch 'issue-1107_develop' into 'develop'

Issue #1107: Raiffeisen Bank parser for new file format (XML) [develop]

See merge request freenetis/freenetis!72

Removal of old Ebanka parser. Refactoring new RB XML parser according to MR comments.

Conflicts:
application/controllers/import.php

Merge branch 'issue-1107' into 'master'

Issue #1107: Raiffeisen Bank parser for new file format (XML).

See merge request freenetis/freenetis!73

Issue #1107: Raiffeisen Bank parser for new file format (XML).

Merge branch 'issue-1120_develop' into 'develop'

Issue #1120: Support for SNMP control of Huawei switches S6720 which are based on Linux [develop]

See merge request freenetis/freenetis!74

Issue #1120: Support for SNMP control of Huawei switches S6720 which are based on Linux [develop]

Merge branch 'issue-1120' into 'master'

Issue #1120: Support for SNMP control of Huawei switches S6720 which are based on Linux

See merge request freenetis/freenetis!75

Issue #1120: Support for SNMP control of Huawei switches S6720 which are based on Linux

Merge origin/develop into develop

Add 1.1.25 changes

Merge branch 'release_1.1.25' into 'master'

Release 1.1.25

See merge request freenetis/freenetis!71

Release 1.1.25

Merge branch 'subnet31_develop' into 'develop'

Subnet /31 support [develop]

See merge request freenetis/freenetis!70

Adds support for subnet /31 (255.255.255.254). IP addresses can be added with network address and broadcast address. Subnet display fixes (fixes #1103).

Merge branch 'subnet31' into 'master'

Subnet /31 support

See merge request freenetis/freenetis!69

Adds support for subnet /31 (255.255.255.254). IP addresses can be added with network address and broadcast address. Subnet display fixes (fixes #1103).

Merge branch 'issue-1111_develop' into 'develop'

Fixes #1111: Fixes notification activation whitelisted members presense

See merge request freenetis/freenetis!68

Refs #1111: Fixes notification activation whitelisted members presence by splitting members table to two tables. First table includes non-whitelisted members, second whitelisted members (if present).