Commit Graph

4916 Commits

Author SHA1 Message Date
Davide Bellini a17fe26b7b Merge pull request #13 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-08 15:28:39 +02:00
James Brooks 318227f067 Boolean settings should be bools! (#2157)
Boolean settings should be bools!
2016-10-08 14:17:04 +01:00
Davide Bellini 7dca0bbf87 Merge pull request #12 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-08 12:26:02 +02:00
James Brooks dfeab93d88 Remove references to component in the Maintenance emails. Fixes #2153 2016-10-08 11:01:19 +01:00
James Brooks 4f807e6d93 Fix imports 2016-10-08 10:44:37 +01:00
James Brooks 96c0444783 Added middleware class headers 2016-10-08 10:37:21 +01:00
James Brooks dbc488b6b7 Don't use the config facade and redirect to the route 2016-10-08 10:36:54 +01:00
Davide Bellini 2825b629eb Merge pull request #11 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-08 08:42:31 +02:00
Graham Campbell aafae8097e Update all the things (#2155)
* Updated deps

* Rebuilt js
2016-10-07 20:07:34 +01:00
Davide Bellini 1b3855d4b5 Merge branch '2.4' of https://github.com/CachetHQ/Cachet into 2.4 2016-10-07 18:59:30 +02:00
Davide Bellini 3700f1485f Fixed incident update (#2151)
… and now tests are green :)
2016-10-07 17:53:19 +01:00
Davide Bellini 1faf5d1fe1 Merge pull request #9 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-07 18:52:25 +02:00
Davide Bellini 34d2d997c9 Fixed SweetAlert styles on Status Page (#2150)
Closes #2145
2016-10-07 17:52:21 +01:00
James Brooks 2913193b3c Merge pull request #2152 from abhimanyu003/patch-1
Using filter_var to validate emails
2016-10-07 17:50:59 +01:00
Abhimanyu Sharma adf3d194a8 Using internal
Using internal PHP function to validate for email.
2016-10-07 22:01:58 +05:30
Davide Bellini de41c0d50f Merge pull request #8 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-07 16:30:54 +02:00
James Brooks d9db453709 Merge pull request #2147 from CachetHQ/outage-typo
Fixed outage translation typo
2016-10-07 15:27:36 +01:00
Graham Campbell b482dc8c79 Fixed outage translation typo 2016-10-07 15:15:39 +01:00
Davide Bellini bc4d1a089b Merge pull request #7 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-07 15:11:08 +02:00
James Brooks 42713f51e3 Fix some docblocks 2016-10-07 13:51:59 +01:00
James Brooks b1e23e4145 Added missing Arctic timezone 2016-10-07 12:48:56 +01:00
James Brooks eb470abf09 Clean up the timezone listings 2016-10-07 12:47:55 +01:00
James Brooks a8261d23c0 Condense validation rules into array 2016-10-07 12:39:16 +01:00
James Brooks 985881c557 Fix validation of setup values at step 1 2016-10-07 12:38:36 +01:00
James Brooks f7a8b7ed19 Fix setup location 2016-10-07 12:29:18 +01:00
James Brooks bed038653a Standardise @joecohens name in the class headers 2016-10-07 12:25:40 +01:00
James Brooks c60c519755 Added console kernel header 2016-10-07 12:25:15 +01:00
James Brooks 0d9cd8fad9 Reword console command descriptions 2016-10-07 12:24:19 +01:00
James Brooks b19d321bae Added header 2016-10-07 12:23:04 +01:00
James Brooks f08fdbd524 Don't indent 2016-10-07 12:20:58 +01:00
James Brooks ca34f5279a Move the setup views into own namespace 2016-10-07 12:20:47 +01:00
James Brooks c6c439017a Only show the incidents headline if we have anything to show 2016-10-07 12:19:47 +01:00
James Brooks 1e7e9e8fe3 Updated deps 2016-10-07 10:40:59 +01:00
James Brooks 766dd60f0c Merge pull request #2142 from CachetHQ/incident-updates
Incident updates
2016-10-06 22:41:07 +01:00
James Brooks c94919f1b9 Backport Incident Updates from v3.0.0 2016-10-06 22:40:56 +01:00
Davide Bellini 315e4cc8b6 Merge pull request #6 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-06 11:36:42 +02:00
James Brooks c778ce91c3 Merge pull request #2138 from billmn/api-groups-order
Api groups order
2016-10-06 08:56:50 +01:00
Davide Bellini 7cdd537b42 Fixed groups order on API
Issue: if the request use “?sort=order” returns groups ordered by “order DESC”.

This is unexpected.
If I would a reversed order I have to use “sort=order&order=desc”
2016-10-05 09:26:52 +02:00
Davide Bellini 37efa3690d Merge pull request #5 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-04 22:34:23 +02:00
James Brooks 5b2d99e723 Merge pull request #2136 from CachetHQ/only-disrupted-days
Option to only show disrupted days. Closes #2088
2016-10-04 20:52:25 +01:00
Davide Bellini e1611e4876 Merge pull request #4 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-04 20:47:54 +02:00
James Brooks 628833a73f Merge branch 'ConnorVG-mail-testing' into 2.4 2016-10-04 19:20:36 +01:00
James Brooks ea69fc9313 Merge '2.4' 2016-10-04 19:20:29 +01:00
James Brooks 179de1ff28 Option to only show disrupted days. Closes #2088 2016-10-04 19:16:50 +01:00
James Brooks 0646b6b475 Fix docblocks 2016-10-04 19:10:08 +01:00
James Brooks 3d9928cbe3 Updated deps 2016-10-04 19:05:14 +01:00
Davide Bellini ff84a6d935 Fixed redirect when “Component group” was deleted (#2130) 2016-10-04 08:40:47 +01:00
James Brooks 555f852f09 Merge pull request #2129 from billmn/login-style
Fixed login button style
2016-10-04 08:29:33 +01:00
Davide Bellini f165547aab Fixed login button style 2016-10-04 09:07:54 +02:00
James Brooks 707b4a88bb Merge pull request #2127 from billmn/patch-1
Fixed Component Group’s order
2016-10-03 18:03:15 +01:00