mirror_php/Cachet
1
0
Fork 0
mirror of https://github.com/CachetHQ/Cachet.git synced 2025-01-17 21:49:01 +01:00
Code Issues Projects Releases Wiki Activity
2,794 Commits 16 Branches 56 Tags
Commit Graph

388 Commits

Author SHA1 Message Date
James Brooks
3a0c052f8b Last hour of metric points 2015-12-24 11:27:22 +00:00
Graham Campbell
61ea28b1aa Use binput in the views 2015-12-23 15:04:27 +00:00
Graham Campbell
2951f9a0db Cleanup language files 2015-12-23 13:25:10 +00:00
Graham Campbell
0507ff3937 Merge pull request #1260 from cachethq/sync 
Pull in changes from Laravel
 2015-12-23 12:26:20 +00:00
Graham Campbell
5e3ab3b6ea Pull in changes from Laravel 2015-12-23 12:07:54 +00:00
phecho
8a47dd873f Move HumanStatus to Presenter 2015-12-23 19:44:06 +08:00
phecho
61b01d7c2d Finished off zh-TW translation 2015-12-23 17:58:50 +08:00
phecho
e1fa49d1f7 Added missing translation 2015-12-22 08:48:18 +08:00
Graham Campbell
1607275d2d Merge branch '2.0' 
# Conflicts:
#	VERSION
#	app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
#	app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
#	app/Models/Subscriber.php
 2015-12-18 12:55:47 +00:00
James Brooks
d2beb6263e Remove indentation 2015-12-18 09:07:40 +00:00
James Brooks
f75c9f5500 Fixes #1218 2015-12-16 18:15:25 +00:00
Graham Campbell
cfe0cefeb3 Merge branch 'master' of https://github.com/cachethq/Cachet 2015-12-16 18:11:27 +00:00
Graham Campbell
57491b8062 Merge branch '2.0' 2015-12-16 18:11:12 +00:00
James Brooks
3a5405e032 Merge pull request #1231 from phecho/dev-login 
User can login with username or email
 2015-12-16 18:03:47 +00:00
James Brooks
b9b282ba7b Fixes #1234 2015-12-16 18:02:04 +00:00
phecho
89c708de07 Fixed issue #1195 2015-12-16 21:42:02 +08:00
phecho
c57c9db54a User can login with username or email 2015-12-16 19:15:03 +08:00
Graham Campbell
ffeaed336e Merge branch '2.0' 2015-12-07 11:59:29 +00:00
James Brooks
cf19fecdbe Fixes #1202 2015-12-07 07:18:06 +00:00
Joe Cohen
f3fec2c58c Merge pull request #1189 from cachethq/update-system 
Update check system
 2015-12-01 02:22:11 -06:00
Graham Campbell
860407533f Merge branch '2.0' 2015-11-30 11:55:06 +00:00
James Brooks
a35430a4fd Fixes a bug with dashboard_login_link setting. Fixes #1190 2015-11-29 15:37:24 +00:00
James Brooks
b5b60fff45 Added update checking, part of #109 2015-11-29 11:00:10 +00:00
James Brooks
e46ee644ae Make alert links readable 2015-11-29 10:53:55 +00:00
Joseph Cohen
e78c9261f6 Embed the banner on the mail layout 2015-11-24 16:27:33 -06:00
James Brooks
6bffb66ed2 Remove duplicate banner image. Closes #1179 2015-11-24 21:51:27 +00:00
James Brooks
963c94a3e7 Update trans 2015-11-22 19:29:12 +00:00
James Brooks
bba87f6c46 Lowercase service trans 2015-11-22 19:28:18 +00:00
James Brooks
f814d13a64 Fixed bad variable 2015-11-21 23:16:06 +00:00
James Brooks
66c410a7c4 Fix undefined variable 2015-11-21 23:16:06 +00:00
James Brooks
c64df7eed7 Move display_graphs into AppComposer 2015-11-21 23:09:20 +00:00
James Brooks
51a4a1789e Forgot a file 2015-11-21 23:08:37 +00:00
James Brooks
970d903b48 style_fullwidth_header setting is now in AppComposer 2015-11-21 23:07:42 +00:00
Graham Campbell
a025ffb915 Usr strict equals 2015-11-21 23:06:18 +00:00
James Brooks
b31cab0654 Move more Setting facades into AppComposer 2015-11-21 23:05:20 +00:00
James Brooks
a2d7c49c2a Move $app_locale into AppComposer 2015-11-21 22:58:37 +00:00
James Brooks
dff9faaa5d Use $app_stylesheet from AppComposer 2015-11-21 22:48:22 +00:00
Graham Campbell
7a09667cc0 Removed code duplication 2015-11-21 22:45:04 +00:00
James Brooks
0e6ac90f7b Move app_banner and app_banner_type into AppComposer 2015-11-21 22:41:45 +00:00
James Brooks
2e1e7a383d Better condition to check for $app_domain 2015-11-21 22:37:25 +00:00
James Brooks
44fea779df Remove $app_url in favour of AppComposer usage 2015-11-21 22:36:09 +00:00
James Brooks
d76fa9465e Remove redundant condition for page titles 2015-11-21 22:32:05 +00:00
James Brooks
4c793590b2 Use the right variable name for page titles 2015-11-21 22:30:35 +00:00
James Brooks
1a9dbe2979 Remove unused error view 2015-11-21 22:27:49 +00:00
James Brooks
e806ef0663 Move $app_name into View composer 2015-11-21 22:25:48 +00:00
James Brooks
a8dd60063e Fix up pageTitle variables 2015-11-21 22:20:15 +00:00
James Brooks
bf20a324ac Outdent setup view blade 2015-11-21 22:15:59 +00:00
James Brooks
8ecefc65fb Hide the notify checkbox if subscribers isn't enabled 2015-11-21 14:35:35 +00:00
James Brooks
1bd54696c9 Add link on components page too 2015-11-21 13:54:20 +00:00
James Brooks
13391165bc Add link to add component suggestion 2015-11-21 13:52:32 +00:00