FreenetIS

refs #1148: Service IP address in monitoring

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

Issue #1135: lBilling, voip, voip sip deleted [develop]

See merge request freenetis/freenetis!109

refs #1135: lBilling, voip, voip sip deleted. All relations for this controllers and models deleted.

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

Issue #940: Account balance on list of all members showing only credit account balance [develop]

See merge request freenetis/freenetis!106

Issue #940: Account balance on list of all members showing only credit account balance [develop]

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

Issue #1126: Member export using REST API [develop]

See merge request freenetis/freenetis!85

Fix invalid reformatting (LF must be used in sources, not Windows CRLF, also double indentation was removed).

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

Issue #1144: Fix support for cancelling of the future membership termination [develop]

See merge request freenetis/freenetis!107

refs #1144: Cancel termination of membership is available. Added delete icon into view show of member.

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

Issue #1008: Translation of custom members types in tables [develop]

See merge request freenetis/freenetis!104

Issue #1008: Translation of custom members types in tables [develop]

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

Issue #1141: Calendar is not displayed in work reports [develop]

See merge request freenetis/freenetis!105

refs #1141: calendar is not displayed in the work reports

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

Issue #1143: Fix approval actions when redirection of internal mail messages to email is enabled [develop]

See merge request freenetis/freenetis!102

Issue #1143: Fix approval actions when redirection of internal mail messages to email is enabled [develop]

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

Issue #1012: Evidence of manually sent emails in emails queue.

See merge request freenetis/freenetis!89

Improve breadcrumb. Fix redirection and access according to email module state and ACL (e.g. do not redirect to e-mail show after submit if it would end with access denied page). Fix new code indentation and formatting.

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

Issue #1140: Fix work report adding on PHP 7.3 [develop]

See merge request freenetis/freenetis!100

Issue #1140: Fix work report adding on PHP 7.3 [develop]

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

Issue #1139: Fix work adding on PHP 7.3 [develop]

See merge request freenetis/freenetis!101

Issue #1139: Fix work adding on PHP 7.3 [develop]

Merge branch 'issue-1137-fix2_develop' into 'develop'

Issue #1137: Allows to display own works, work reports, requests

See merge request freenetis/freenetis!97

Fixes #1137: Allows to display own works, work reports, requests by fixing missing services in sub controllers.

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

Issue #1129: Repair and speed-up of counting subtotal of transfers.

See merge request freenetis/freenetis!88

refs #1129: Repair and speed-up of counting subtotal of transfers. Changes in tranfers controller and tranfer model.

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

Issue #1132: Fix loading data without ignored columns using ORM on PHP 7.3

See merge request freenetis/freenetis!91

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

Issue #1133: Fix calculation with string in file::shortened_size_to:_bytes that caused failure of system settings.

See merge request freenetis/freenetis!90

Refs #1133: Fix calculation with string in file::shortened_size_to:_bytes that caused failure of system settings.

Refs #1132: Fix loading data without ignored columns using ORM on PHP 7.3

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

Issue #1128: Repair typo in scheduler [develop]

See merge request freenetis/freenetis!86

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

Fixes #1127: Repair of bug on showing former members [develop]

See merge request freenetis/freenetis!84

Fixes #1127: Repair of bug on showing former members [develop]

refs #1128: Repair typo in scheduler.

Merge branch 'debian-buster_develop' into 'develop'

Issue #1117: Support for Debian buster [develop]

See merge request freenetis/freenetis!82

Fixes #1124: Creating roaming link is not working on PHP 7.3

Conflicts:
application/controllers/links.php

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

Issue #1112: Modification of member owner for secondary users [develop].

See merge request freenetis/freenetis!81

Refs #1112: Modification of member owner for secondary users.

Conflicts:
application/controllers/users.php

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

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

See merge request freenetis/freenetis!78

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_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.

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-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 origin/develop into develop

Add 1.1.25 changes

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 '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).

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

Fix #1113: Fix display of address point map in popup [develop]

See merge request freenetis/freenetis!66

Fix #1113: Fix display of address point map in popup [develop]

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

Fixes #1110: Fix showing works/work reports/request from user detail on PHP 7.0 >= [develop]

See merge request freenetis/freenetis!64

Refs #1110: Fix showing works/work reports/request from user detail on PHP 7.0 >=. Fix is done by creating sub-controllers instead of static calls to them. Support of creating sub-controllers with shared resources was introduced to MY_Controller.

Conflicts:...

Merge branch 'release-1.1.24_develop' into 'develop'

Release 1.1.24 [develop]

See merge request freenetis/freenetis!62

Changelog for 1.1.24

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

Fixes #1108: Fixes scheduler failure due to deprecated function in e-mail sending on PHP 5.5 >=

See merge request freenetis/freenetis!58

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

Fixes #1109: Drop support for Lenny

See merge request freenetis/freenetis!57

Refs #1108: Fixes scheduler failure due to deprecated function in e-mail sending on PHP 5.5 >=

Refs #1109: drop support for Lenny

Merge branch 'release-1.1.23_develop' into 'develop'

Release 1.1.23 [develop]

See merge request freenetis/freenetis!56

Release 1.1.23 [develop]

Merge branch 'fix-ci_develop' into 'develop'

Fix running tests on CI in develop.

See merge request freenetis/freenetis!54

Fix running tests on CI in develop.

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

Fixes #1101: Support for Debian Stretch (PHP 7.0 + Maria DB 15.1) [develop]

See merge request freenetis/freenetis!51

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

Fixes #1106: Fix installation on Wheezy [develop]

See merge request freenetis/freenetis!50

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

Fixes #1105: map support fixes [develop]

See merge request freenetis/freenetis!52

Fixes #1105: map support fixes [develop]

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

Fixes #1096: Big debtor message + notification auto activation e-mail report [develop]

See merge request freenetis/freenetis!53

Fixes #1096: Big debtor message + notification auto activation e-mail report [develop]

Refs #1101: Support for Debian Stretch (PHP 7.0 + Maria DB 15.1). Improved setup that no longer support database creation (in Maria DB it is hard to do so from non-root user due to security restrictions), database setup error cause was added, disabling Settings DB queries in non-setup environment. In order to fix DB init some FK indexes/constrains must have been renamed in 1.1.0 SQL script (Maria DB enforces uniqueness on FK names)....

Refs #1106: Fix installation on Wheezy by using mysqli PHP extension only for PHP 7.0>=

Prepare release 1.1.22

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

Fixes #1094: Allows to delete former member older than 5 years [develop].

See merge request freenetis/freenetis!43

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

Refs #1093: Allows to set registration field during member adding [develop]

See merge request freenetis/freenetis!40

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

Refs #1076: member expiration date calculation fix [develop]

See merge request freenetis/freenetis!38

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

Issue #1075: Fix getting MAC from DHCP leases through SNMP on Mikrotik devices with with RouterOS 6.35>= [develop]

See merge request freenetis/freenetis!37

Fix DB upgrade version.

Fixes #1094: Allows to delete former member older than 5 years.

Conflicts:
application/libraries/MY_Controller.php
application/models/bank_transfer.php

Refs #1093: Allows to set registration field during member adding.

Format fixes.

Refs #1076: member expiration date calculation fix. The calc functionality was separate from Members controller to a new Expiration calc service. The new service comes with unit tests which tests the #1076. Additionally this patch comes with some fixes and improvements in already existing unit and integration tests.

Refs #1075: Getting MAC from DHCP leases through SNMP on Mikrotik devices with RouterOS 6.35>= by ignoring leading 2 MAC octets. This fixes the issue in the develop branch.

Upgrade PHPAX-RS to 0.1.1

Prepare release 1.1.21

Fixes #1069: user with watcher can be deleted

Fixes #1070: RB importer supported on PHP 5.6 >=

Ref #1068: add support connecting to encrypted SMTP servers.

Refs #1065: Fix members export to CSV when speed class filtered.

Prepare release 1.1.20

Fixes removed condition.

Conflicts:
application/models/email_queue.php

Refs #1053: Default sort in emails set to ID which is indexed (previously by access_time), some small improvements in related queries but filters are still very slow.

Conflicts:
application/models/email_queue.php

Refs #1056: GPS in address point table is filled with NULL value instead of empty string value in order to be compactible with MySQL 5.7 and higher that do not support empty string in geometry field values

Conflicts:
application/controllers/members.php
application/controllers/registration.php

Resolves #1060: implement filter for message type in Web interface unallowed_ip_addresses

Fixes #1059: invalid parsing of TXT TB listings for total amount >=1000

Fixes #1055: fix error thrown from TB importer when no payment is found

Prepare release 1.1.19

Fixes #1052: fixes issues in PHP 7.0

Allows to import Tatra banka listings with no variable symbol.