3993 Commits

Author SHA1 Message Date
James Brooks
5a9f6134c4 Completely refactor all routes 2016-10-12 21:47:46 +01:00
Abhimanyu Sharma
d93859119d Using defaults 2016-10-12 23:31:45 +05:30
Davide Bellini
cb639999d5 Merge pull request #17 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-11 23:39:37 +02:00
James Brooks
446e428486 Updated deps 2016-10-11 19:32:45 +01:00
Davide Bellini
e2441e7321 Merge pull request #16 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-10 14:42:22 +02:00
James Brooks
d7c1cedc9b Merge pull request #2163 from abhimanyu003/2.4
Added placeholders
2016-10-10 13:32:39 +01:00
Abhimanyu Sharma
dd7943632a Added placeholders 2016-10-10 15:51:02 +05:30
Davide Bellini
931c4f5acb Merge pull request #15 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-10 08:57:33 +02:00
James Brooks
f66ae54c15 Fix syntax in PHP 5.5 2016-10-09 12:35:15 +01:00
James Brooks
1327ea985e Truncate incident updates before seeding 2016-10-09 11:19:16 +01:00
Davide Bellini
a9f06ae899 Merge pull request #14 from CachetHQ/2.4
Update from upstream repo CachetHQ/Cachet
2016-10-09 12:13:16 +02:00
James Brooks
20e585a879 Use the auth.logout route 2016-10-09 11:11:54 +01:00
James Brooks
a0b6ce9601 Alias the feed routes better 2016-10-09 11:11:46 +01:00
James Brooks
4a539b3826 Use the auth.two-factor route 2016-10-09 11:11:33 +01:00
James Brooks
580c23f102 Don't use the SVG for 2fa page 2016-10-08 18:57:14 +01:00
James Brooks
c432702740 Don't indent 2016-10-08 18:54:18 +01:00
James Brooks
70f2f1d32e Merge pull request #2158 from CachetHQ/remember-me
Add remember me functionality to login
2016-10-08 18:25:01 +01:00
James Brooks
1794622ed0 Use route helper more 2016-10-08 18:24:45 +01:00
James Brooks
8b8114576d Don't use the config facade for settings 2016-10-08 17:55:46 +01:00
James Brooks
a5d3a71063 Formatting 2016-10-08 17:45:40 +01:00
James Brooks
e12c94827d Merge pull request #2159 from CachetHQ/setup-modifications
Setup modifications
2016-10-08 17:40:44 +01:00
James Brooks
16d5737727 Merge pull request #2160 from abhimanyu003/2.4
Minor HTML tweaks
2016-10-08 17:40:07 +01:00
James Brooks
b457f5d7a2 Applied fixes from StyleCI
[ci skip] [skip ci]
2016-10-08 16:30:44 +00:00
James Brooks
0371d86be0 Making changes to the setup screen 2016-10-08 17:30:32 +01:00
Abhimanyu Sharma
22cbe16007 Minor HTML tweaks 2016-10-08 21:39:39 +05:30
James Brooks
e0fa69bc37 Applied fixes from StyleCI
[ci skip] [skip ci]
2016-10-08 15:40:07 +00:00
James Brooks
b0d5306023 Add remember me functionality to login 2016-10-08 16:39:53 +01:00
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