Graham Campbell 1607275d2d Merge branch '2.0' ...

# Conflicts:
#	VERSION
#	app/Handlers/Events/Incident/SendIncidentEmailNotificationHandler.php
#	app/Handlers/Events/Incident/SendMaintenanceEmailNotificationHandler.php
#	app/Models/Subscriber.php

2015-12-18 12:55:47 +00:00

..

auth

User can login with username or email

2015-12-16 19:15:03 +08:00

dashboard

Merge branch '2.0'

2015-12-18 12:55:47 +00:00

emails

Move $app_name into View composer

2015-11-21 22:25:48 +00:00

layout

Fixes #1234

2015-12-16 18:02:04 +00:00

partials

Fixes #1218

2015-12-16 18:15:25 +00:00

incident.blade.php

Let's not duplicate view code

2015-10-17 14:27:15 +01:00

index.blade.php

Move display_graphs into AppComposer

2015-11-21 23:09:20 +00:00

setup.blade.php

Fix up pageTitle variables

2015-11-21 22:20:15 +00:00

signup.blade.php

Move app_banner and app_banner_type into AppComposer

2015-11-21 22:41:45 +00:00

subscribe.blade.php

Remove duplicate banner image. Closes #1179

2015-11-24 21:51:27 +00:00