Martyn Inglis c51d44fe43 Merge branch 'master' into celery-jobs ...

Conflicts:
	app/main/views/sms.py

2016-02-24 15:46:38 +00:00

..

assets

Add banner back on send sms page

2016-02-23 11:24:40 +00:00

main

Removed print statement

2016-02-24 15:45:46 +00:00

notify_client

Merge branch 'master' into celery-jobs

2016-02-24 15:46:38 +00:00

status

…

templates

Put banner on the choose sms template page

2016-02-23 11:49:47 +00:00

__init__.py

Inline images in CSS

2016-02-22 13:39:02 +00:00

asset_fingerprinter.py

Make URLs for assets cache-proof

2016-02-10 16:00:29 +00:00

its_dangerous_session.py

Fix for bug of cookie expiry.

2016-02-15 11:43:16 +00:00

proxy_fix.py

…

utils.py

User permissions added with test.

2016-02-19 16:38:04 +00:00

version.py

…