818 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Bastian Schroll	98b50110a0	change from ZVEI2 to ZVEI1	2017-03-05 20:21:16 +01:00
Bastian Schroll	81e83e4c2e	Revert "add ZVEI1 support in BOSWatch" ... This reverts commit a1a48e4ec7.	2017-03-05 20:19:29 +01:00
Bastian Schroll	a1a48e4ec7	add ZVEI1 support in BOSWatch	2017-03-01 09:08:15 +01:00
Bastian Schroll	f946a9102b	Update README.md	2017-02-23 13:39:07 +01:00
Bastian Schroll	db82f91552	Merge branch 'develop' into beta for release ... Conflicts: install.sh	2017-02-23 13:32:37 +01:00
Bastian Schroll	deb23cf374	edit release vars	2017-02-23 13:30:50 +01:00
Bastian Schroll	6fb8bbfcb1	testmode - remove waittime ... remove waittime for faster travis build	2017-02-23 11:40:24 +01:00
Bastian Schroll	f699f65005	Merge pull request #232 from sesu85/master ... Vereinfachung beim Einrichten des Daemons	2017-02-23 11:32:27 +01:00
Bastian Schroll	37103c58e7	Merge branch 'develop' into master	2017-02-23 11:27:44 +01:00
Bastian Schroll	dbf0899d4e	edit Konzept	2017-02-23 10:57:34 +01:00
Sebastian	3427673199	Changed DIR-variable... ... ...to default path used by install.sh	2017-02-23 10:56:14 +01:00
Sebastian	9adb5b42b7	Added 'sudo systemctl daemon-reload' ... Before doing that, the system always complains a 'file not found' for the boswatch.sh, although it's present.	2017-02-23 10:54:35 +01:00
Bastian Schroll	e88218f3b9	edit Konzept	2017-02-23 10:44:21 +01:00
Bastian Schroll	4156edf9a8	edit Konzept	2017-02-23 07:45:46 +01:00
Bastian Schroll	ae8a398c7b	edit Konzept	2017-02-23 07:34:51 +01:00
Bastian Schroll	7089c0a6b2	add konzept.txt for BW3.0	2017-02-23 07:19:39 +01:00
Bastian Schroll	c576b86fc9	Merge pull request #230 from thejockel/origin/develop ... renamed module bash to base	2017-02-22 16:03:44 +01:00
Jockel	9083651fd0	renamed module bash to base	2017-02-22 15:25:02 +01:00
Bastian Schroll	5c8bae65a4	installer - info to logfile in case of error	2017-02-21 23:23:11 +01:00
Bastian Schroll	1b5993119e	travis - use installer from tested branch	2017-02-21 23:06:31 +01:00
Bastian Schroll	42644d7c3c	fix error in install	2017-02-21 21:41:33 +01:00
Bastian Schroll	5cc9705ee8	fix in installer	2017-02-21 21:38:30 +01:00
Bastian Schroll	08344a09a6	installer - add custom path func.	2017-02-21 21:36:07 +01:00
Bastian Schroll	a5b4d96be7	installer - error handling into logfile	2017-02-21 16:45:53 +01:00
Bastian Schroll	1248ff7e99	installer - error handling into logfile	2017-02-21 16:45:45 +01:00
Bastian Schroll	d69fd2e23a	edit boswatch path in citest/test.sh	2017-02-21 16:44:36 +01:00
Bastian Schroll	68312367d3	remove y/yes from installer at reboot	2017-02-21 16:28:01 +01:00
Bastian Schroll	647b801a98	remove reboot flag ... no longer needed... "no reboot" is std	2017-02-21 13:26:16 +01:00
Bastian Schroll	113034aab9	Merge pull request #227 from thejockel/update-install-scipt ... update install script	2017-02-21 13:20:14 +01:00
Jockel	e06e30050e	removed n|no) reboot=false ;;	2017-02-21 13:18:23 +01:00
Jockel	bb0871b9ad	update install, -r is not required any more. Default is no.	2017-02-21 13:08:52 +01:00
Bastian Schroll	bb680de539	move testdata.txt to citest folder	2017-02-21 09:00:12 +01:00
Bastian Schroll	ccfda4ffe1	include beta branch handling	2017-02-21 08:19:11 +01:00
Bastian Schroll	114056995c	include beta branch handling	2017-02-21 08:04:13 +01:00
Bastian Schroll	10fe777583	Merge pull request #226 from Schrolli91/flothi-patch-1 ... Update README.md	2017-02-21 07:53:58 +01:00
Bastian Schroll	0609a95ede	Merge pull request #226 from Schrolli91/flothi-patch-1 ... Update README.md	2017-02-21 07:51:07 +01:00
Florian	3ef489c759	Update README.md ... Call for help due to encrypted messages	2017-02-21 00:09:37 +01:00
Florian	20f9d4215c	MySQL.py ... Adapting to global net-identifiers	2017-02-20 22:03:55 +01:00
Bastian Schroll	ce3f7beaba	update install in master ... error in travis install	2017-02-20 21:44:19 +01:00
Bastian Schroll	751711b702	cherrypick travis-ci files to master	2017-02-20 21:17:55 +01:00
Bastian Schroll	17686e7b52	edit readme	2017-02-20 19:15:48 +01:00
Bastian Schroll	c72680cb62	edit readme	2017-02-20 18:49:20 +01:00
Bastian Schroll	30c8ae40a9	Merge pull request #222 from thejockel/develop ... Base commit for Travis-CI	2017-02-20 18:35:53 +01:00
Jockel	75f1c31ece	fixed issues	2017-02-20 14:39:15 +01:00
Jockel	9876092d3d	new tests	2017-02-20 14:33:19 +01:00
Jockel	1e88b52f44	fixed missing links	2017-02-20 11:47:44 +01:00
Jockel	d89226c4ce	update URLs for Schrolli91 Repo	2017-02-20 11:45:56 +01:00
Jockel	1b171b243b	added full testdata again	2017-02-20 11:27:44 +01:00
Jockel	26ac670546	update boswatch path ... added img on README	2017-02-20 11:18:08 +01:00
Jockel	07c3a98981	base build	2017-02-20 10:25:56 +01:00