Commit Graph

2564 Commits

Author SHA1 Message Date
James Brooks
d08283f8a5 Pre-select the users language on setup 2015-11-21 13:49:14 +00:00
James Brooks
bcd7763f84 Fix up bad Input name and condition on setup 2015-11-21 13:45:47 +00:00
James Brooks
043b02c8b2 Merge pull request #1165 from phecho/fix-incident-edit
Fixes #1164
2015-11-21 10:38:03 +00:00
phecho
4015f4f150 Fixes issue #1164 2015-11-21 10:10:52 +08:00
James Brooks
e89c75d8bc Merge pull request #1162 from cachethq/js-drop-hq
Drop the HQ on js
2015-11-20 18:25:31 +00:00
Joseph Cohen
fcc21ce337 Drop the HQ on js 2015-11-20 12:02:19 -06:00
James Brooks
5a499cdc76 Merge pull request #1160 from phecho/improve-localization-zh
Improved zh-CN language resources for issue #1158
2015-11-20 11:03:14 +00:00
phecho
499584a110 Improved zh-CN language resources for issue #1158 2015-11-20 18:54:10 +08:00
Graham Campbell
5307e1014c Updated composer.lock 2015-11-20 10:23:19 +00:00
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
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