Commit Graph

6565 Commits

Author SHA1 Message Date
James Wilson 18219bf328 Fixed #3101 2018-10-10 14:00:51 +01:00
Cachet Bot e55f989c46 New translations cachet.php (German) 2018-10-09 11:12:58 +01:00
Cachet Bot 8d36bd5539 New translations cachet.php (French) 2018-10-09 11:12:53 +01:00
Cachet Bot 0a3f717ac6 New translations cachet.php (Finnish) 2018-10-09 11:12:48 +01:00
Cachet Bot ef32c5dd55 New translations cachet.php (English) 2018-10-09 11:12:44 +01:00
Cachet Bot b47a432744 New translations cachet.php (Greek) 2018-10-09 11:12:40 +01:00
Cachet Bot 9c8e48199d New translations cachet.php (Indonesian) 2018-10-09 11:12:36 +01:00
Cachet Bot cf957511ad New translations cachet.php (Hungarian) 2018-10-09 11:12:31 +01:00
Cachet Bot 20160304ba New translations cachet.php (Hebrew) 2018-10-09 11:12:28 +01:00
Cachet Bot 86841c1661 New translations forms.php (Dutch) 2018-10-09 11:12:22 +01:00
Cachet Bot 14b13447c7 New translations cachet.php (Catalan) 2018-10-09 11:12:18 +01:00
Cachet Bot 63e7e1841c New translations cachet.php (Chinese Simplified) 2018-10-09 11:12:15 +01:00
Cachet Bot 3761d16810 New translations cachet.php (Albanian) 2018-10-09 11:12:10 +01:00
Cachet Bot 43ff723613 New translations cachet.php (Arabic) 2018-10-09 11:12:07 +01:00
Cachet Bot 2eb539e80e New translations cachet.php (Dutch) 2018-10-09 11:12:04 +01:00
Cachet Bot d9201c4464 New translations cachet.php (Danish) 2018-10-09 11:12:00 +01:00
Cachet Bot 8fd42ad2e5 New translations cachet.php (Czech) 2018-10-09 11:11:56 +01:00
Cachet Bot d03c0cb1ab New translations cachet.php (Chinese Traditional) 2018-10-09 11:11:52 +01:00
Cachet Bot fee3dc4924 New translations cachet.php (Italian) 2018-10-09 11:11:48 +01:00
Cachet Bot 38afd983b9 New translations cachet.php (Thai) 2018-10-09 11:11:45 +01:00
Cachet Bot 858209ab1c New translations cachet.php (Swedish) 2018-10-09 11:11:41 +01:00
Cachet Bot 630820e83e New translations cachet.php (Spanish) 2018-10-09 11:11:37 +01:00
Cachet Bot 457e4ec83e New translations cachet.php (Russian) 2018-10-09 11:11:33 +01:00
Cachet Bot 4c2639eec7 New translations cachet.php (Turkish) 2018-10-09 11:11:30 +01:00
Cachet Bot 9f6ca366dd New translations forms.php (Zulu) 2018-10-09 11:11:27 +01:00
Cachet Bot 5bd640953e New translations cachet.php (Zulu) 2018-10-09 11:11:26 +01:00
Cachet Bot 61c20bcdcf New translations cachet.php (Vietnamese) 2018-10-09 11:11:21 +01:00
Cachet Bot d4ca237d26 New translations cachet.php (Ukrainian) 2018-10-09 11:11:17 +01:00
Cachet Bot c0c2677106 New translations cachet.php (Persian) 2018-10-09 11:11:09 +01:00
Cachet Bot 0c40946384 New translations forms.php (Norwegian) 2018-10-09 11:11:06 +01:00
Cachet Bot 15b66db835 New translations cachet.php (Norwegian) 2018-10-09 11:11:03 +01:00
Cachet Bot b2dbce0886 New translations cachet.php (Korean) 2018-10-09 11:10:59 +01:00
Cachet Bot 1ef86b1682 New translations cachet.php (Japanese) 2018-10-09 11:10:55 +01:00
Cachet Bot e3739fc50e New translations cachet.php (Romanian) 2018-10-09 11:10:49 +01:00
Cachet Bot ac24c4870f New translations cachet.php (Portuguese, Brazilian) 2018-10-09 11:10:44 +01:00
Cachet Bot c49452c8b2 New translations cachet.php (Portuguese) 2018-10-09 11:10:40 +01:00
Cachet Bot c20c727938 New translations cachet.php (Polish) 2018-10-09 11:10:35 +01:00
Cachet Bot d81ae71adc New translations cachet.php (Afrikaans) 2018-10-09 11:10:32 +01:00
James Brooks 48769d7e7c Merge pull request #3268 from craigballinger/2.4
Convert remaining hardcoded strings in the manage notifications form.
2018-10-09 11:07:33 +01:00
Craig Ballinger 5886122a09 Update remaining hardcoded strings to support translation 2018-10-08 10:38:59 -04:00
thomasxd24 1fdb7909d3 Revert schedule maintenance
commit of de172e5def have made the schedule maintenance disappear completely. 

This PR reverts the change. Please fix the change or revert back.
2018-10-05 19:34:00 +02:00
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