Refs #1112: Modification of member owner for secondary users.
Conflicts: application/controllers/users.php
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
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
Merge branch 'fix-ci_develop' into 'develop'
Fix running tests on CI in develop.
See merge request freenetis/freenetis!54
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
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
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.
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.
Resolves #1051: mark imported Tatra banka listings messages as read
Fixes #1049: system setting cannot be saved.
Prepare release 1.1.18
refs #1047: Fix access rule for showing account of member from member table
refs #1035: refactoring of deprecated code
refs #1035: removal of db_type variable from the configuration, always mysqli now
refs #1043: Export error display
refs #1043: Fix SQL members export query by adding whitelist part
refs #1044: Fix single member notification form when some notification type is disabled
Release 1.1.7 - change log.
refs #1039: Work report gradual approval fix
Conflicts: application/controllers/work_reports.php
Never change work vote when already paied.
Conflicts: application/controllers/works.php
refs #1034: Work report cannot be revoted after it is paied off
refs #1038: change of gateway for Klikniavolej.cz SMS driver
refs #1037: HTTPS configuration does not work in some WWW-browsers
Update CI tags and adds some excepts rules.
Allows _ as tag version separator for CI config.
Adds .gitlab-ci.yml that validates DEB package and deploys it to repo for 1.2.0 dev tags.
closes #959: Improves column label and adds a help hint
refs #967: Removal of account type select box from add from account transfer form because this functionality is now handled by destination account filter
FreenetIS 1.1.16 release preparations.
refs #1030: Member can get list of all system users from form for inner mail sending
refs #1029: Filter for "added by" field in members table
Conflicts: application/i18n/cs_CZ/texts.php application/models/member.php
refs #1028: E-mail message for forgotten password - text improvements
Preparation for 1.1.15
refs #1025: Fix issue in redirection reactivation due to old whitelist records
Adds configuration option that allows to disable appending message names to e-mail notification messages subjects.
Fix bug that not allows empty "email_subject_prefix" in e-mail notification.
Prepare for 1.1.14 release
refs #1021: DEB package for Jessie contains invalid postinst script
refs #1023: DEB package contains .git files
Merge TB chages to Bank_Statement_File_Import.
Unit test fix.
Ignore test config.
Fix merge issue that removed all staff from developer branch :-).
Fix develop version.
Adds README content.
Adds 1.1.3 notes to changelog.
Merge origin/tatrabanka-importer-email into develop
DEB upload directory fix.
Fix php-imap dependency.
Removes log files.
Merge origin/master into tatrabanka-importer-email
Gitignore from master.