Commit Graph

8 Commits (2.4)

Author SHA1 Message Date
Iglocska ffd087ba38 fix: Added a warning if utf8 encoding isn't set up in the database config
- also, changed the default database config to enforce utf8
2017-01-19 16:40:23 +01:00
Andreas Ziegler 9bf0e16ac6 new: add basic experimental support for PostgreSQL 2016-08-31 04:11:49 +02:00
Andreas Ziegler 1d06f25b38 chg: add newline character before EOF to non-minified (text-)files 2016-06-06 10:09:55 +02:00
Andreas Ziegler 8a2352f7b8 remove single spaces in front of tabs 2016-06-04 01:14:25 +02:00
iglocska 98f65aae09 Merging several pull requests and a few other changes
- Pull request by RichieB2B: CentOS 6 & 7 installation instructions
- Pull request by RichieB2B: STIX exports now include comments for indicators
- Pull request by RichieB2B: Issue fixed with md5 type attributes not generating observables correctly during a STIX export
- Password policy change-able by a site admin via a regex and a min char requirement. Old functionality assumed if not set.
- bug fixed with incorrect jobs being created appearing during a scheduled pull (designates a push)
- slight changes to the installation instructions
- database.default.php now uses localhost instead of 127.0.0.1 and the default MySQL port
2015-02-02 13:12:15 +01:00
Christophe Vandeplas 69251490ef Merge branch 'feature/gui' of https://github.com/MISP/MISP into
feature/gui

Conflicts:
	app/View/Logs/admin_index.ctp
	app/View/Logs/admin_search.ctp
	app/View/Users/memberslist.ctp
2013-05-31 17:50:00 +02:00
iglocska 54c02dc218 Update to the default config files
- Some minor changes to the default config files
2013-03-18 13:38:52 +01:00
Andrzej Dereszowski c90ec416f0 Configuration files renamed to better handle git merges on production systems.
Please add new features with their default values. Their should contain only example values.

	renamed:    app/Config/bootstrap.php -> app/Config/bootstrap.default.php
	renamed:    app/Config/core.php -> app/Config/core.default.php
	renamed:    app/Config/database.php -> app/Config/database.default.php
2012-10-09 14:44:25 +02:00