Commit Graph

6524 Commits

Author SHA1 Message Date
Anthony Bocci
ba0fdf1368 Include the partial "about-app"
In the settings it's possible to fill a field "About this page". If we
refer to the demo the content of this field is supposed to be shown
under the status on the status page.

The problem was the information was not shown even if it was not empty.
So if we typed "We are a company ...", this was not shown, nowhere.
Technically the problem was because the partial "about-app" was not
included so the information was never shown.

To fix that I have included the partial "about-app" in the index.
Now if the field empty nothing is shown (the same as before) but if the
field is not empty so the information is shown under the status bar.

See: #3249
2018-09-21 19:51:01 +02:00
James Brooks
de172e5def Merge pull request #3236 from Wouter0100/patch-1
Show schedules till they are completed
2018-09-14 08:17:46 +01:00
James Brooks
f8d4415998 Merge pull request #3239 from FNCxPro/patch-1
Resolve styling error on signup view
2018-09-12 17:59:00 +01:00
Matthew Stobbs
a05fec97cc Merge pull request #2 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2018-09-10 09:09:26 -06:00
James Brooks
73f761b179 Merge pull request #3240 from Matthewrbowker/patch-1
Added missing parenthesis to config.yml
2018-09-10 14:40:50 +01:00
Matthew Bowker
67801f142a Added missing parenthesis to config.yml 2018-09-09 09:58:11 -06:00
Relative
55959d0048 Resolve styling error on signup view 2018-09-09 03:06:06 -04:00
Wouter van Os
9b4e8c1545 Show schedules till they are completed
Currently schedules are shown on the status page when they are in the status upcoming or in progress. But, when the scheduled time is in the past - it's hidden, even when it's still going on.

This PR fixes this issue by hiding the maintenance when it's in the status completed, or the completed time has passed.
2018-09-06 23:43:10 +02:00
Matthew Stobbs
d3bb50b24a Merge branch '2.4' into 2.4 2018-09-06 10:21:49 -06:00
Cachet Bot
3b4c0250dd New translations forms.php (Chinese Simplified) 2018-09-05 09:30:10 +01:00
James Brooks
a740d5c8c0 Merge pull request #3220 from gazben/patch-1
Add bool cast to boolean Incident parameters
2018-09-05 09:24:28 +01:00
Matthew Stobbs
6e426eabfa Revert .env.example to 2.4 branch default 2018-08-20 11:07:44 -06:00
Matthew Stobbs
b389e4a3c9 Reverted .env.example 2018-08-20 11:00:41 -06:00
Matthew Stobbs
53cb71ebaa Added v-pre to textarea to fix view not working 2018-08-20 10:57:49 -06:00
Gazder Bence
15a87a8e78 Add bool cast to boolean Incident parameters 2018-08-16 10:35:09 +02:00
James Brooks
5663498ba9 Apply fixes from StyleCI (#3212) 2018-08-07 13:39:04 +01:00
James Brooks
ce6d2fe7cd Merge pull request #3211 from CachetHQ/l10n_2.4
New Crowdin translations
2018-08-07 13:38:12 +01:00
Cachet Bot
75c0f64de6 New translations forms.php (Dutch) 2018-08-07 09:00:14 +01:00
Cachet Bot
60b99189ce New translations forms.php (Chinese Simplified) 2018-08-07 09:00:12 +01:00
James Brooks
1035ab8567 Merge pull request #3196 from nstapelbroek/feature/remove-backup-manager
Removed backup manager
2018-07-24 20:57:17 +01:00
Nico Stapelbroek
129d5ac30d Reinstall twig because it was required for the incident templates 2018-07-24 15:40:14 +02:00
Nico Stapelbroek
6e54cd92bf Create upgrade docs to keep track of changes between backwards incompatible versions 2018-07-24 15:27:27 +02:00
Nico Stapelbroek
ecd634a37c Update composer dependencies without laravel-backup and twig 2018-07-24 11:39:51 +02:00
Nico Stapelbroek
1a07b3f8d9 Remove references to the Laravel backup manager
As proposed in https://github.com/CachetHQ/Cachet/pull/3150 the current backup solution produces too many edge cases when configured with the non-default options. Cachet should not be held responsible for backups since it's unable to complete this task properly. Feel free to re-add a laravel backup solution to your custom cachet instance.
2018-07-24 11:39:06 +02:00
James Brooks
415c6de378 Merge pull request #3191 from TakeMeNL/feature/api-get-incident-templates
Added GET incident templates to use in POST incidents template
2018-07-20 07:44:57 +01:00
TakeMeNL
39c0829fce Code style fixes 2018-07-20 00:23:17 +02:00
TakeMeNL
c60f1bd50f Added GET incident templates to use in POST incidents template 2018-07-20 00:17:46 +02:00
James Brooks
090502385c Apply fixes from StyleCI (#3188)
[ci skip] [skip ci]
2018-07-17 07:53:05 +01:00
James Brooks
43720a46ce Merge pull request #3176 from CachetHQ/l10n_2.4
New Crowdin translations
2018-07-17 07:52:30 +01:00
Cachet Bot
60108c4b8d New translations pagination.php (German) 2018-07-12 08:44:19 +01:00
Cachet Bot
99ef27b846 New translations forms.php (German) 2018-07-12 08:44:17 +01:00
Cachet Bot
67245f63fb New translations dashboard.php (German) 2018-07-12 08:44:16 +01:00
Cachet Bot
8762f44336 New translations cachet.php (German) 2018-07-12 08:44:15 +01:00
Cachet Bot
8b25d24e67 New translations notifications.php (French) 2018-07-12 08:44:14 +01:00
Cachet Bot
ddcafd7569 New translations pagination.php (French) 2018-07-12 08:44:12 +01:00
Cachet Bot
464cdf32a2 New translations forms.php (French) 2018-07-12 08:44:11 +01:00
Cachet Bot
9168c9b323 New translations dashboard.php (French) 2018-07-12 08:44:10 +01:00
Cachet Bot
5f71286a3f New translations cachet.php (French) 2018-07-12 08:44:08 +01:00
Cachet Bot
3a511b1ddb New translations notifications.php (Finnish) 2018-07-12 08:44:07 +01:00
Cachet Bot
2a98083f59 New translations validation.php (Finnish) 2018-07-12 08:44:06 +01:00
Cachet Bot
52d9bcf1a0 New translations pagination.php (Finnish) 2018-07-12 08:44:05 +01:00
Cachet Bot
a88c595cd8 New translations forms.php (Finnish) 2018-07-12 08:44:04 +01:00
Cachet Bot
ef79ff5186 New translations dashboard.php (Finnish) 2018-07-12 08:44:03 +01:00
Cachet Bot
0fdb1be9ab New translations cachet.php (Finnish) 2018-07-12 08:44:02 +01:00
Cachet Bot
2bbcdb5110 New translations notifications.php (English) 2018-07-12 08:44:00 +01:00
Cachet Bot
ece0043144 New translations forms.php (English) 2018-07-12 08:43:58 +01:00
Cachet Bot
7969d4f357 New translations dashboard.php (English) 2018-07-12 08:43:57 +01:00
Cachet Bot
d021b88799 New translations cachet.php (English) 2018-07-12 08:43:56 +01:00
Cachet Bot
ad24286103 New translations setup.php (Finnish) 2018-07-12 08:43:54 +01:00
Cachet Bot
0cdd2ebdb4 New translations validation.php (Dutch) 2018-07-12 08:43:53 +01:00