Commit Graph

577 Commits

Author SHA1 Message Date
Max Kovalenko
2b2337eb8e Merge remote-tracking branch 'forked/2.4' into upgrade-google2fa
# Conflicts:
#	composer.lock
2019-07-13 10:39:25 +03:00
James Brooks
cc85dc69c4 Merge pull request #3702 from ojdon/3689-url-markdown-fix
Removed outer link. Fixes #3689
2019-07-12 07:06:30 +01:00
Ollie Reardon
d3269a6c05 Removed outer link. Fixes #3689 2019-07-11 21:54:11 +01:00
James Brooks
9f98683aff Fixes #3668 2019-07-11 13:14:16 +01:00
James Brooks
163f78ff13 Merge pull request #3423 from AntonioKL/patching-manage-subscribtion
Patching manage subscription
2019-07-11 13:06:46 +01:00
Max Kovalenko
87281f905a replaced bacon/bacon-qr-code with chillerlan/php-qrcode
removed imagick dependency

Signed-off-by: Max Kovalenko <mxss1998@yandex.ru>
2019-06-26 09:14:42 +03:00
James Brooks
8f91f6d92f Remove Laravolt dependency. Closes #3376 2019-06-23 16:08:03 +01:00
James Brooks
066837fa71 Merge pull request #3567 from MinThaMie/3562-not-notify-maintenance
Make maintenance also optional to notify subscribers
2019-06-23 09:02:56 +01:00
Anthony Bocci
67b43ed34d Add a missing "asset" call 2019-06-19 11:19:00 +02:00
Anthony Bocci
c5217637e6 Allow Cachet to be setup not from the server's root
The `asset()` helper was missing at some places so it was not possible
to install it in an other place than the server's root (/).

The paths have been fixed and now use the `asset()` helper. Also,
The steps process takes care of the current path.

See: #3618
2019-06-19 11:19:00 +02:00
Max Kovalenko
bb2ab92d22 CI fixes 2019-05-24 20:28:41 +03:00
Max Kovalenko
6086a275bf upgraded google2fa (0.7->5.0) & composer deps 2019-05-24 20:20:57 +03:00
Anne-Greeth van Herwijnen
a86793079c Make maintenance also optional to notify subscribers 2019-04-26 11:50:15 +02:00
James Brooks
af503cabd0 Merge pull request #3525 from danijelk/patch-1
Make sticked messages work on PHP7.3 - Resolves #3515
2019-04-12 21:12:52 +01:00
James Brooks
6a99399a36 Merge pull request #3540 from jzinkweg/feature/incident-update-mail
Include incident update message in mail notification
2019-04-12 21:06:47 +01:00
James Brooks
acb04e2703 Removes duplicate order. Closes #3439 2019-04-12 20:51:47 +01:00
jzinkweg
0cbaa75e67 Include incident update message in mail 2019-04-10 17:22:36 +02:00
Danijel K
5d904f1ea5 Make sticked messages work on PHP7.3
compact changed behaviour on PHP7.3, and I also can't see the need for it as date and incidents are still passed to the view.
This resolves #3515
2019-03-21 14:08:23 +01:00
Marko Sulamägi
521e650b80 Add a canonical tag with full URL 2019-03-13 10:18:22 +07:00
James Brooks
8d1bdf2a84 More UX and UI fixes 2019-02-18 22:06:32 +00:00
James Brooks
13e8b39892 Improve count call 2019-02-18 22:03:01 +00:00
James Brooks
d0221bad31 Remove badly added components class 2019-02-18 22:02:54 +00:00
tejaswivinod
b21f057a1d Change to appropriate tags to hide and select/unselect components in group 2019-02-09 12:16:13 -05:00
James Brooks
baa78b9762 Merge pull request #3432 from CachetHQ/hotfix/duplicate-order-statement
Remove duplicate order statement
2019-01-27 22:22:00 +00:00
Viktor Szépe
0c33ca6d22 Fix HTML encoding for Google Fonts 2019-01-27 15:49:20 +01:00
James Brooks
60a4c15d0e Merge pull request #2931 from nstapelbroek/feature/2895-custom-meta-descriptions-per-incident
Custom meta descriptions per incident
2019-01-27 14:31:34 +00:00
James Brooks
0ae510fdf0 Fix other duplicate order by statements 2019-01-26 15:00:42 +00:00
James Brooks
c0d9d9ceb8 Fully remove the Strengthify integration 2019-01-26 11:17:02 +00:00
James Brooks
f8b8ae8b65 Merge pull request #3197 from shuichiro-makigaki/schedule-template
Enable templates in scheduled maintenance dashboard
2019-01-26 10:59:49 +00:00
Antonio
123d24da93 Admin permision should override setting
enableSubscribers is used for Signup on the main dashboard, but cannot be forced for Admin on control
2019-01-19 03:16:32 +02:00
Antonio
27a0fb6008 Update index.blade.php 2019-01-19 03:05:12 +02:00
Antonio
01281b2c47 Update index.blade.php
Eding manage button for subscription
2019-01-19 02:12:28 +02:00
Graham Campbell
3d216fb3ab Fixed up vendor views 2018-12-28 14:17:57 +00:00
Graham Campbell
b18a8dff6b Commit new vendor files 2018-12-28 14:01:55 +00:00
Graham Campbell
5ffb5bc912 Upgraded to Laravel 5.7 2018-12-28 13:05:23 +00:00
James Brooks
3763a867a8 Merge pull request #3368 from CachetHQ/drop-feeds
Drop support for RSS & Atom feeds
2018-12-27 23:27:19 +00:00
James Brooks
08939854a9 Don't expose current mail password 2018-12-27 23:13:38 +00:00
James Brooks
b96c36fd61 Update Blade files 2018-12-27 22:44:00 +00:00
James Brooks
4a6fd7dc70 Merge pull request #3223 from stobbsm/2.4
Fixes Template not rendering when containing twig variables
2018-11-23 21:45:03 +00:00
Blake Nahin
0dcb11ab98 Remove extra parenthesis on subscribe page 2018-11-19 01:17:59 -08:00
Shuichiro MAKIGAKI
8db2b47aab Enable templates in scheduled maintenance dashboard 2018-11-14 16:06:16 +09:00
James Brooks
9de2ea22e3 Remove third-party password strength plugin 2018-11-06 17:55:09 +00:00
James Brooks
d900e274c6 Test on PHP 7.3 (#3286) 2018-10-18 23:21:00 +01:00
James Brooks
cdb14c9fb9 Merge pull request #3251 from anthonybocci/show-about-this-page
Include the partial "about-app" in index
2018-10-15 12:46:49 +01:00
James Wilson
18219bf328 Fixed #3101 2018-10-10 14:00:51 +01:00
Craig Ballinger
5886122a09 Update remaining hardcoded strings to support translation 2018-10-08 10:38:59 -04: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
Relative
55959d0048 Resolve styling error on signup view 2018-09-09 03:06:06 -04:00
Matthew Stobbs
53cb71ebaa Added v-pre to textarea to fix view not working 2018-08-20 10:57:49 -06:00
Nico Stapelbroek
33e5c34f55 Fix metaseo tests after updating to Laravel 5.6 2018-07-02 11:29:22 +02:00