4750 Commits

Author SHA1 Message Date
VeekeeFr
e301b9c82a Merge pull request #2 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2017-09-10 19:37:31 +02:00
James Brooks
e9d6795a04 Fix PHP 5.6 2017-09-10 14:49:40 +01:00
James Brooks
747470a80b Fix deps 2017-09-10 14:47:13 +01:00
VeekeeFr
7d4a32408b Merge pull request #1 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2017-09-09 14:30:55 +02:00
James Brooks
7cfcf5e280 Fixes #2677 2017-09-09 13:16:50 +01:00
James Brooks
ff4e59eaf1 Merge branch '2.4' of github.com:CachetHQ/Cachet into 2.4 2017-09-09 13:08:15 +01:00
James Brooks
d5ff8d387f Merge pull request #2699 from VeekeeFr/refresh_rate
added auto-refresh on master status page
2017-09-07 08:58:51 +01:00
Vitor Baptista
981b440412 Merge branch '2.4' into patch-1 2017-08-31 17:09:28 +01:00
jvictor
6330f8a2fb added auto-refresh on master status page 2017-08-31 16:09:27 +02:00
James Brooks
057e4d5393 Show a different message when subscribers are disabled 2017-08-27 11:34:22 +01:00
James Brooks
197493b9d7 Update deps 2017-08-27 11:29:25 +01:00
Vitor Baptista
d1813df703 Trust proxies in local IPs
This allows CachetHQ to be served behind proxies
running in the local network.
2017-08-25 14:05:02 +01:00
James Brooks
824c812279 If not logged in, redirect to login page 2017-08-21 19:40:56 +01:00
Graham Campbell
613b7445fb Apply fixes from StyleCI (#2684)
[ci skip] [skip ci]
2017-08-12 12:36:06 +01:00
James Brooks
44d659c8b6 Revert "Update composer.lock"
This reverts commit 93373449ab74b5e0d65b59e17e3ae907b3229ccc.

Doctrine is now 7.0
2017-07-27 20:23:41 -04:00
James Brooks
4091b910ff Update docblocks 2017-07-27 20:20:08 -04:00
James Brooks
0186d195c2 Sync artisan file 2017-07-27 20:18:44 -04:00
James Brooks
93373449ab Update composer.lock 2017-07-27 20:16:02 -04:00
James Brooks
89e222f0d8 Merge pull request #2668 from CachetHQ/include-when
Use the includeWhen macro
2017-07-27 19:34:36 -04:00
James Brooks
b62f9bb334 Merge pull request #2667 from CachetHQ/use-carry
Use reduce method
2017-07-27 19:34:11 -04:00
James Brooks
c9b4ee0ee6 Use the includeWhen macro 2017-07-27 15:58:04 -04:00
James Brooks
379440d3de Use reduce method 2017-07-27 15:52:27 -04:00
James Brooks
746408dedb CHange Demo 2017-07-27 07:30:49 -04:00
James Brooks
5b63bcf0c3 Merge pull request #2661 from CachetHQ/fix-dashboard-api-routes
Dashboard API routes are not meant for the browser
2017-07-26 14:23:44 -04:00
James Brooks
6c84d8965e Merge pull request #2662 from CachetHQ/controller-resources
Rename controller methods following Laravel's resource controllers
2017-07-26 14:23:34 -04:00
James Brooks
77c7fb39ad Merge pull request #2663 from CachetHQ/cache-settings
Statically cache settings
2017-07-26 14:23:23 -04:00
James Brooks
58717e0e05 Merge pull request #2664 from CachetHQ/logout-redirect
Use cachet_redirect helper when logging out
2017-07-26 14:23:12 -04:00
James Brooks
4571d473a7 Merge pull request #2665 from CachetHQ/cache-user
Cache the user into a variable
2017-07-26 14:23:00 -04:00
James Brooks
219ba8608c Cache the user into a variable 2017-07-26 08:42:39 -04:00
James Brooks
26f0f3f50c Use cachet_redirect helper when logging out 2017-07-26 08:41:52 -04:00
James Brooks
8fcef7b711 Dashboard API routes are not meant for the browser 2017-07-26 08:32:37 -04:00
James Brooks
85c10f1436 Rename controller methods following Laravel's resource controllers 2017-07-26 08:31:11 -04:00
James Brooks
8c1974ae56 Statically cache settings 2017-07-26 08:11:37 -04:00
James Brooks
daeadc0e52 Revert "Update deps"
This reverts commit 128187f4ba6a32a4441dc5894016b0587bf8f95b.
2017-07-25 20:59:45 -04:00
James Brooks
5e8e0526d8 Merge pull request #2660 from CachetHQ/setup-vue
Setup Vue
2017-07-25 20:59:05 -04:00
James Brooks
3c55a47154 Setup Vue 2017-07-25 15:52:54 -04:00
James Brooks
2b22caf296 Use .on 2017-07-25 14:52:10 -04:00
James Brooks
128187f4ba Update deps 2017-07-25 14:44:06 -04:00
James Brooks
eb19cf4dde Merge pull request #2642 from CachetHQ/incident-components
Create incident_components table
2017-07-25 14:42:07 -04:00
James Brooks
7622a8f474 Add status_id column 2017-07-25 14:40:43 -04:00
James Brooks
acf0a2b662 Compile assets 2017-07-25 14:38:07 -04:00
James Brooks
861f0351c5 Fix JS for setup 2017-07-25 14:38:02 -04:00
James Brooks
19c4bd6799 Merge pull request #2657 from CachetHQ/fix-icons
Use right type attribute for icons
2017-07-25 11:51:22 +01:00
James Brooks
2fbab285f3 Apply fixes from StyleCI
[ci skip] [skip ci]
2017-07-25 10:51:07 +00:00
James Brooks
a71dd8754d Fixes #2654 - Use right type attribute for icons 2017-07-25 06:50:50 -04:00
James Brooks
d06027b2fa Apply fixes from StyleCI (#2655)
[ci skip] [skip ci]
2017-07-25 02:48:31 +01:00
James Brooks
e13680d4be Send more info to Beacon 2017-07-24 21:48:05 -04:00
James Brooks
c1f298361b Create exception interfaces 2017-07-24 21:48:05 -04:00
Connor S. Parks
ddc583c90f Merge pull request #2645 from m1guelpf/patch-1
The safer, the better
2017-07-19 10:51:08 +01:00
Miguel Piedrafita
0373356604 The safer, the better
Move link to HTTPS 🔒
2017-07-19 11:38:26 +02:00