2555 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Graham Campbell	b60c1a9b05	Fixed up composer.json	2015-11-20 10:22:12 +00:00
James Brooks	46fc1dbc63	Merge pull request #1159 from phecho/enhance-redirect ... Fixes issue #1158	2015-11-20 09:32:39 +00:00
phecho	32b66df5f0	Fixes issue #1158	2015-11-20 17:02:11 +08:00
James Brooks	031d89ea4a	Merge pull request #1157 from phecho/fix-schedule-delete ... Give a right tip when a schedule be deleted successfully.	2015-11-20 08:21:47 +00:00
phecho	e14ebe80e9	Give a right tip when a schedule be deleted successfully.	2015-11-20 09:43:46 +08:00
James Brooks	72233ff4ac	Merge pull request #1154 from phecho/improve-dashboard ... Add links for both of incidents & subscribers in dashboard default page	2015-11-19 17:59:40 +00:00
James Brooks	1db5dcbfe6	Fixes #1155	2015-11-19 17:58:01 +00:00
phecho	638f5d0862	Add links for both of incidents & subscribers in dashboard default page	2015-11-19 21:59:25 +08:00
James Brooks	1bf6f8e8c9	Merge pull request #1153 from phecho/add-cancel-btn-template ... Add cancel button for incident templates	2015-11-19 12:54:22 +00:00
phecho	a9d9f7ba03	Add cancel button for incident templates	2015-11-19 20:24:22 +08:00
James Brooks	ee7d6fc9eb	Merge pull request #1152 from phecho/fixed-remove-banner-bug ... Fixed app banner can not be removed in the theme setting page	2015-11-19 11:43:52 +00:00
James Brooks	a8d60edb6a	Merge pull request #1149 from phecho/fix-profile-dropdown ... Fixes #1148	2015-11-19 11:10:48 +00:00
phecho	da30282843	Fixed app banner can not be removed in the theme setting page	2015-11-19 17:35:48 +08:00
phecho	899065b8e8	Fixes #1148	2015-11-18 22:06:51 +08:00
James Brooks	03eace0b00	Merge pull request #1144 from phecho/setup-not-responding ... Fixes #1143	2015-11-17 18:30:33 +00:00
phecho	c765e22164	Fixes #1143	2015-11-18 02:08:46 +08:00
James Brooks	14e1c3d11d	Merge pull request #1141 from phecho/fixes-language-detection ... Fixes issue #1140 v2.0.0-RC3	2015-11-16 18:18:01 +00:00
Graham Campbell	28893f4702	Merge pull request #1139 from phecho/adjust-travis-compile-orders-of-php ... Adjust the orders of php compiler for travis	2015-11-16 16:15:31 +00:00
phpGitAdmin	7ddf4277f7	Adjust the orders of php compiler for travis as desc	2015-11-17 00:07:21 +08:00
phpGitAdmin	94c46d15cf	Fixes #1140	2015-11-16 23:56:07 +08:00
James Brooks	147a6add23	Merge pull request #1138 from phecho/added-tips ... Add tips in the situation of no items	2015-11-16 10:11:52 +00:00
guanshiliang	2a1bd732bd	Adjust the orders of php compiler for travis	2015-11-16 11:33:05 +08:00
guanshiliang	4149ee86bf	Add tips in the situation of no items	2015-11-16 11:14:56 +08:00
James Brooks	9cf600f36c	Fixes #1137	2015-11-15 18:05:23 +00:00
James Brooks	d4020aed29	Merge pull request #1136 from phecho/master ... Improved language package of zh-CN	2015-11-15 16:13:45 +00:00
James Brooks	cc3f08260e	Metrics should include the current hour. Fixes #1113	2015-11-15 16:13:20 +00:00
guanshiliang	696eb48472	Improved language package of zh-CN	2015-11-15 23:56:16 +08:00
James Brooks	73820735f5	Merge pull request #1132 from cachethq/api-template-incidents ... Incident API can now use incident templates with Twig templating	2015-11-15 11:57:09 +00:00
James Brooks	2a12b0ca85	Merge pull request #1131 from cachethq/update-langs ... Updated Crowdin lang strings	2015-11-15 11:56:32 +00:00
James Brooks	af176d7c7a	Incident API can now use incident templates with Twig templating	2015-11-15 11:32:51 +00:00
Graham Campbell	1483863dae	Updated lock file	2015-11-14 15:16:15 +00:00
Graham Campbell	3064663350	Updated dependencies	2015-11-14 15:11:02 +00:00
James Brooks	ce71d7f3ac	Merge pull request #1133 from cachethq/analysis-86Yb9z ... Applied fixes from StyleCI	2015-11-12 22:52:14 +00:00
Graham Campbell	54d1aca33e	Updated psysh	2015-11-12 21:28:02 +00:00
James Brooks	5ef28fba01	Applied fixes from StyleCI	2015-11-12 13:21:45 -05:00
Graham Campbell	1a5ef0750a	Updated dependencies	2015-11-12 15:27:50 +00:00
James Brooks	fe45d2411c	Updated Crowdin lang strings	2015-11-12 10:59:28 +00:00
James Brooks	819fc9563f	Merge pull request #1129 from phecho/master ... Fixed dashboard icons	2015-11-11 16:42:46 +00:00
Phecho	4c10cb2df9	Merge branch 'master' into master	2015-11-12 00:27:39 +08:00
phecho	d93ecc85e3	Adjusted the subMenu order of Settings	2015-11-12 00:22:40 +08:00
phecho	cf89f5fcec	Fixed dashboard icons	2015-11-12 00:10:08 +08:00
James Brooks	326183311e	Merge pull request #1128 from phecho/master ... Updated Chinese(zh-CN & zh-TW) forms translations	2015-11-11 16:04:56 +00:00
Phecho	30a4d6e85b	Merge branch 'master' into master	2015-11-11 23:01:19 +08:00
phecho	4c67bf70ff	Adjusted the order of sidebar item	2015-11-11 23:00:40 +08:00
phecho	ccbc114f62	Updated Chinese(zh-CN & zh-TW) forms translations	2015-11-11 22:38:01 +08:00
James Brooks	a35ccfdc8b	Merge pull request #1127 from phecho/master ... Added lang package of traditional chinese(zh-TW)	2015-11-11 13:43:34 +00:00
phecho	4a5c810341	Added lang package of traditional chinese(zh-TW)	2015-11-11 21:17:20 +08:00
James Brooks	de1be2eefe	Merge pull request #1125 from phecho/master ... Improved zh-CN localization	2015-11-11 09:24:59 +00:00
phecho	76a6500c26	Fixed translations of dashboard page title	2015-11-11 15:31:11 +08:00
phecho	3b2359db1d	Fixed translations of dashboard page title	2015-11-11 15:10:57 +08:00