227 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
thnilsen	ea582aeed6	Fix bug notifications not being sent. ... The code to handle sending of notification was missing. This change makes two different options available on how notifications will be handled which will be controlled by CRON_SERVER_IP config option. - If CRON_SERVER_IP is set, the server with the given IP should call URL ../admin/?task=cron every x minutes. If the config is left empty, the notification will be called once the incident has been saved. (The latter meothod might cause server timeout if there are large numbers of subscribers!) Other minor changes: - Removed old commented code - Removed call to syslog used for debugging	2020-08-15 21:09:57 +02:00
Thomas Nilsen	8d31ec7f7c	Merge branch 'master' into subscription2_dev ... Fix Subscriber CSS issue	2020-08-15 18:48:41 +02:00
Vojtěch Sajdl	eecde5f23a	Merge pull request #121 from yigitkeremoktay/patch-4 ... Fix contributors link	2020-08-15 15:15:55 +02:00
Yiğit Kerem Oktay	12e6fd693f	Fix contributors link	2020-08-14 22:36:50 +03:00
Vojtěch Sajdl	0b16909899	Merge pull request #120 from yigitkeremoktay/patch-3 ... Fix a major issue	2020-08-14 20:54:47 +02:00
Vojtěch Sajdl	9f2e2db846	Merge pull request #118 from yigitkeremoktay/patch-1 ... Fix back https://github.com/Pryx/server-status/pull/106	2020-08-14 20:52:19 +02:00
Yiğit Kerem Oktay	7fceaf75d2	Fix a major issue ... Makes this file functional.	2020-08-14 21:47:50 +03:00
Yiğit Kerem Oktay	0e78c04594	Fix back https://github.com/Pryx/server-status/pull/106 ... https://github.com/Pryx/server-status/pull/106 was reverted back via another PR this fixes it back again	2020-08-14 21:07:05 +03:00
Vojtěch Sajdl	96bf232ec5	Merge pull request #115 from yigitkeremoktay/patch-1 ... Çeviriler Güncellendi	2020-08-14 19:48:45 +02:00
Vojtěch Sajdl	f3aca0c172	Merge pull request #117 from yigitkeremoktay/patch-4 ... Some Graphical Improvements	2020-08-14 19:47:33 +02:00
Vojtěch Sajdl	d9f0587e88	Merge pull request #116 from yigitkeremoktay/patch-3 ... Added Example Sites and Install Guide	2020-08-14 19:46:18 +02:00
Yiğit Kerem Oktay	c6be6cb561	Add fix for language issue	2020-08-14 20:27:38 +03:00
Yiğit Kerem Oktay	10b485418c	Fix a bug caused copyright to go blank	2020-08-14 20:15:39 +03:00
Yiğit Kerem Oktay	2d10e18453	Missing Commit Added (Manual Merge 5)	2020-08-14 20:14:23 +03:00
Yiğit Kerem Oktay	0dd6c5edaf	Manual Merge 4	2020-08-14 20:07:00 +03:00
Yiğit Kerem Oktay	7d4aaf9948	Manual Merge Step 3	2020-08-14 20:05:34 +03:00
Yiğit Kerem Oktay	d99e754647	Manual Merge Step 2	2020-08-14 20:04:49 +03:00
Yiğit Kerem Oktay	f785d56b78	Manual Merge of PR 114 STEP 1	2020-08-14 20:02:42 +03:00
Yiğit Kerem Oktay	28431cc240	Added required definitions	2020-08-14 19:52:18 +03:00
Yiğit Kerem Oktay	7585a0d650	Logo size issue fixed	2020-08-14 19:50:56 +03:00
Yiğit Kerem Oktay	70c8a4fa0f	Add support for custom logo	2020-08-14 19:46:48 +03:00
Yiğit Kerem Oktay	17a6115aab	Some Graphical Improvements	2020-08-14 19:37:16 +03:00
Yiğit Kerem Oktay	27c90e30aa	Çeviriler Güncellendi	2020-08-14 19:12:36 +03:00
Yiğit Kerem Oktay	9674e371de	Delete Server_status_Turkish.mo	2020-08-14 19:11:27 +03:00
Yiğit Kerem Oktay	26e9135e60	Add files via upload	2020-08-14 19:10:54 +03:00
Yiğit Kerem Oktay	8dc7a342fe	Delete server-status.mo	2020-08-14 19:10:37 +03:00
Yiğit Kerem Oktay	05ee9256eb	Added Example Sites and Install Guide	2020-08-14 18:14:39 +03:00
Yiğit Kerem Oktay	09770165a6	Çeviriler Güncellendi ... Updated translations. Privacy policy may still need some translations.	2020-08-14 17:14:09 +03:00
Vojtěch Sajdl	a476a20737	Fix discord link	2020-08-14 14:51:05 +02:00
Vojtěch Sajdl	e96f8733a7	Merge pull request #112 from yigitkeremoktay/patch-1 ... Add some required info for creating server config	2020-08-14 14:46:39 +02:00
Yiğit Kerem Oktay	d538f7d358	Create IISWebConfig	2020-08-14 15:13:12 +03:00
Yiğit Kerem Oktay	af2f8969eb	Create ApacheHtaccess	2020-08-14 15:12:30 +03:00
Yiğit Kerem Oktay	34e3782a61	Add additional info	2020-08-14 15:11:42 +03:00
Yiğit Kerem Oktay	b14f60e08b	Add some required info for creating server config	2020-08-14 14:58:05 +03:00
Yiğit Kerem Oktay	484bbd60d0	Create create-htaccess.php (#108) ... * Create create-htaccess.php This file generates a .htaccess file that contains all necessary code for it. This is needed because some hosts do not either unzip hidden files or neither GitHub puts that file inside the zips. * Delete .htaccess * Add required code for creating htaccess * Add support for both iis and apache * Delete web.config * Rename create-htaccess.php to create-server-config.php * Rename file links for create-server-config.php * Last nitpick :)	2020-08-14 13:40:42 +02:00
Vojtěch Sajdl	7362c857b0	Merge pull request #106 from yigitkeremoktay/patch-1 ... Fix service labels not fitting inside container	2020-08-14 13:23:24 +02:00
Yiğit Kerem Oktay	ab085596ca	Patch 1.3	2020-08-14 14:00:38 +03:00
Yiğit Kerem Oktay	14e04d0737	Patch 1.2	2020-08-14 13:58:55 +03:00
Yiğit Kerem Oktay	f6acd559d5	Fix service labels not fitting inside container ... Service Labels are automatically pushed to a new line when there is no enough space	2020-08-14 12:09:12 +03:00
Vojtěch Sajdl	dc7fcdbd4f	Added discord to readme	2020-08-12 10:03:11 +02:00
thnilsen	4a4a3f7bdd	Merged Upstream master	2020-06-16 20:20:51 +02:00
thnilsen	e3d8e3ecf8	Added queue to handle sending of subscribers notifications	2020-06-16 20:11:25 +02:00
Vojtěch Sajdl	d9b7ed432e	Merge pull request #104 from Nothing4You/fix-maintenance-relative-dates ... Fix relative timestamps not properly displaying dates in the future.	2020-06-12 12:04:54 +02:00
Richard Schwab	0be50cf9f9	Fix relative timestamps not properly displaying dates in the future. ... In 184247c4ab (#99) jquery.timeago was updated from version 1.6.1 to 1.6.7. This changed the default value for allowFuture, which is responsible for restricting whether a date in the future would be shown e.g. as "3 days ago" or "3 days from now".	2020-06-12 11:30:09 +02:00
Vojtěch Sajdl	570895c7bd	Fix #102 - strip tags when saving incident	2020-06-03 09:13:54 +02:00
Vojtěch Sajdl	9eba848423	Merge pull request #101 from thnilsen/issue81 ... Remove urlencode() call from install routine	2020-05-28 14:46:53 +02:00
thnilsen	253bf925ce	Fixes issue #81, #91, #94, #95 by removing escaping of of what becomes the WEB_URL config parameter.	2020-05-27 19:31:25 +02:00
Vojtěch Sajdl	45a90aef71	Merge pull request #100 from thnilsen/issue64 ... Fix for translation when selecting a different language Fixes #64 #80 #84	2020-05-23 17:18:47 +02:00
thnilsen	02cd19a439	Fixes issue #64	2020-05-23 17:03:08 +02:00
Vojtěch Sajdl	41fd9a2745	Merge pull request #99 from Nothing4You/update-libs ... Fix #92 Update libs	2020-05-11 09:57:12 +02:00