1828 Commits

Author SHA1 Message Date
James Brooks
48b6d2c34d
Apply fixes from StyleCI (#2981)
[ci skip] [skip ci]
2018-03-30 17:58:25 +01:00
James Brooks
42227d937d Fixes #2976 2018-03-30 17:57:49 +01:00
James Brooks
8fe2c22ac8 Use camel case for variable name 2018-03-30 17:57:49 +01:00
James Brooks
778547b2c9
Merge pull request #2725 from CachetHQ/incident-user-id
Incident user
2018-03-27 21:32:12 +01:00
James Brooks
d63b9b2b3c Strip HTML from email notifications. Fixes #2935 2018-03-27 21:25:42 +01:00
James Brooks
0c96e67678 Revert "Use Markdown in mail notifications. Fixes #2935"
This reverts commit d4cd685b79e416934f6b9006c5eeee98fc242cc5.
2018-03-27 21:23:33 +01:00
James Brooks
d87197ae7c
Apply fixes from StyleCI (#2972)
[ci skip] [skip ci]
2018-03-27 19:24:17 +01:00
James Brooks
edbb0f6031
Merge pull request #2890 from uxen-ab/subscriber-not-able-to-change-his-subscriptions-2887
Adds a line in the notification email to manage its subscriptions.
2018-03-27 19:24:05 +01:00
James Brooks
e05c6f9868
Merge pull request #2965 from CachetHQ/rss-category
Add incident status to RSS feeds
2018-03-27 19:23:32 +01:00
Jordy van Dortmont
190d951c51 Fix trailing default metric points #2539 2018-03-27 18:25:45 +02:00
Jordy van Dortmont
7e00b6fb88 Fix superfluous metric point 2018-03-27 15:29:04 +02:00
A
d63de58f8f Use 'cachet.subscriber.manage.manage_at_link'
The new translation is used to manage its subscriptions.
2018-03-27 10:53:27 +02:00
A
763d74687f Uses the translation cachet.subscriber.manage.
When a component's status changes or when an incident is
created/updated, an email is sent to every people that has subscribed.
At the end of the mail a link to manage its subscription has been
introduced.
Now, it uses the translation.
2018-03-27 10:48:46 +02:00
A
81fd5f4420 Adds a line in the notification email to manage its subscriptions.
Untill now a subscriber wasn't able to manage its subscription because
there was no link anywhere, so it was forced to unsubscribe and then
subscribe again.

Now the link is in the notification email, after 'Unsubscribe at'.

Related to #2887
2018-03-27 10:47:27 +02:00
A
2d4d823959 Adds a line in the notification email to manage its subscriptions.
Untill now a subscriber wasn't able to manage its subscription because
there was no link anywhere, so it was forced to unsubscribe and then
subscribe again.

Now the link is in the notification email, after 'Unsubscribe at'.

Related to #2887
2018-03-27 10:44:13 +02:00
James Brooks
e15199f953 Add incident status to RSS feeds 2018-03-26 21:21:13 +01:00
James Brooks
3f26f40fae Seed the incident user 2018-03-26 20:57:09 +01:00
James Brooks
1e3516d7b7 Track who created incident. Closes #2717 2018-03-26 20:54:23 +01:00
James Brooks
af93563bf7
Merge pull request #2959 from JordyvanDortmont/sqlite3
Fix SQLite metric points retrieval datetime
2018-03-26 20:08:16 +01:00
Jordy van Dortmont
be93436d49 Fix SQLite metric points retrieval datetime 2018-03-25 00:19:39 +01:00
Anthony Bocci
d4c1e145fa Redirect to setting page on image uploading error
In the settings we can upload an image as banner. There are some
verifications that are done on the file to check that it's a valid
image.
If the file is not valid, a redirection is done to the theme page with
an error message.

When redirecting to the theme page because of an error on the file, the
controller redirects to an URL set in a variable. The problem was this
variable '$redirectUrl' was undefined, so the controller thrown an
error. The problem occured only if there was an error on the file, but
it worked well if the file was a valid image.

In the controller's constructor a 'submenu' field is set with panel
items and url, so the variable '$redirectUrl' is set to the theme
page URL. Now if there is an error with the file, the user is well
redirected and the error is displayed.

See: CachetHQ/Cachet#2956
2018-03-24 00:05:20 +01:00
James Brooks
0fcd939f50
Merge pull request #2825 from rarguelloF/only-display-incidents
Add the possibility of only displaying incidents in the timeline
2018-03-17 13:13:16 +00:00
James Brooks
d4cd685b79 Use Markdown in mail notifications. Fixes #2935 2018-03-17 13:09:43 +00:00
Nico Stapelbroek
cd4d457bc0 Fix a bug where the redirect route is unable to resolve when rate limited 2018-02-11 21:24:24 +01:00
Nico Stapelbroek
206022acfd Fix invalid amount of arguments in CreateIncidentUpdateCommandTest 2018-01-27 22:45:19 +01:00
James Brooks
5b1d9ef0f6 Fix up 2018-01-21 22:03:15 +00:00
Knight Tan
14366df3c4 align the rules for styleci 2018-01-21 21:59:04 +00:00
Knight Tan
d2975cd1eb added component and status to CreateIncidentUpdateCommand 2018-01-21 21:59:04 +00:00
Knight Tan
ab01609bb5 allow incident update to update component status, bug fix #2767 2018-01-21 21:59:04 +00:00
James Brooks
88e9cdf3d7
Merge pull request #2877 from nstapelbroek/feature/2720-suppress-notifications-in-maintenance
Suppress notifications while in maintenance mode
2018-01-21 20:59:21 +00:00
James Brooks
4274395a40
Apply fixes from StyleCI (#2879)
[ci skip] [skip ci]
2018-01-21 20:46:11 +00:00
James Brooks
27838248a9
Merge pull request #2874 from uxen-ab/bugs-in-the-average-metrics-graph
Bugs in the average metrics graph
2018-01-21 20:45:55 +00:00
James Brooks
7a4ec0535d Fixes part of #2775 2018-01-21 18:49:12 +00:00
Nico Stapelbroek
14e15ca543 Fix codestyle 2018-01-21 14:32:29 +01:00
Nico Stapelbroek
b4c721d042 Make sure end users know about the notification suppression when editing incidents 2018-01-21 14:14:03 +01:00
Nico Stapelbroek
53142e2c93 Fix a bug where notifications are send because the end of the maintenance time is set 2018-01-21 13:38:18 +01:00
Nico Stapelbroek
e358332048 Determine if notifications are suppressed when handeling events 2018-01-21 13:05:46 +01:00
James Brooks
f53f88f950 Don't send notifications when within maintenance window. Fixes #2720 2018-01-21 12:32:33 +01:00
A
9af7978d68 Merge branch '2.4' into bugs-in-the-average-metrics-graph 2018-01-17 09:52:04 +01:00
A
fc2e6f4062 Improves sorting of metric's labels.
When selecting the time of metric's points only the time was selected,
not the date. The issue with this is mainly in the view "Last 12 hours".
Example:
It's 11:10 am and I choose the "Last 12 hours" view, the metrics points
will be from 23:00 yesterday to 11:00 am today.
When giving all these datas and labels to ChartJS, it sorts the points
by label from lower to highter. It means 23:00 (from yesterday) will be
after the datas of today, it doesn't have sense.

To fix it, I've added in the repositories the date in addition to the
time. So it's no longer 11:00 that is selected but 2018-01-15 11:00.
I've updated the Metric vue in order to cut the label when displaying so
it doesn't change the displaying.
Because there are metric views that are based on date but not time,
there is a condition in the Metric vue to cut the string only if the
time is present.

Related to CachetHQ/Cachet#2848
2018-01-15 11:28:41 +01:00
A
d8208be179 Prevents to select metric points in future.
The metrics had problem with the points, if I post/save a metric point
that is created in the future, it was selected.

Example:
It is 10:00 am, I post or save a metric point and it's 'created at'
10:30 am. Using the "Last 12 hours" the metric point would be selected.

This update is applied on all the SQL queries, on minutes, hours, days.

Related to CachetHQ/Cachet#2848
2018-01-15 11:13:57 +01:00
Nico Stapelbroek
fe90f1aa7d Remove indentation inside blade conditionals 2018-01-14 22:29:06 +01:00
Nico Stapelbroek
1da6764b63 Fetch updates using the eloquent relationship instead of re-querying 2018-01-14 22:17:26 +01:00
Nico Stapelbroek
55f6ee7dc7 Fix styleci violations 2018-01-13 18:32:02 +01:00
Nico Stapelbroek
569b15000a Implement edit IncidentUpdate feature 2018-01-13 17:43:35 +01:00
Nico Stapelbroek
700c936662 Restore add incident update functionality 2018-01-13 15:47:31 +01:00
Nico Stapelbroek
532d8a20c5 Create an incident updates overview page 2018-01-13 15:42:02 +01:00
Rodrigo Argüello Flores
c968a8f67a
Add the possibility of showing only incidents in the timeline, no matter the date 2018-01-12 12:53:10 +01:00
James Brooks
42fd84ea79 Fixes #2859 2018-01-11 21:43:01 +00:00
James Brooks
8746412467 Update language files 2017-12-03 17:47:45 +00:00