Switch sessions to database again
Remove extra call to auto_login()
Merge branch 'feature/auth-token-changes' into develop
Fix unicorn styling messing with adminmap
Disable session id regeneration - otherwise we have issues with database session driver
Undo accidental commit of encryption key
Minor edit to Incident API test, to accomodate deployments that will probably return lower than 20 incidents via the API
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web into develop
Adding support for new RiverID Facebook API methods.
Fix Array to string conversion error at image file uploading

This is temporary workaround.

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Translate header of alert verification pages

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Restore city selection dropdown box functioning

Restore functioning of city selection dropdown box above of the map on
the 'Submit Report' page. It was broken due merging of
reports_submit_edit_js.php and reports_submit_js.php files.

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Make cluster title translatable

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Remove dropped property reporter.service_userid from reporters view

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Recognize .jpeg files as photos

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Add tooltips to categories in report submit form

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Retrieve cities' names in site language

Signed-off-by: Yauhen Kharuzhy <jekhor@gmail.com>
Merge branch 'develop' of github.com:ushahidi/Ushahidi_Web into develop
Adding profile ui hooks for Facebook Open Graph stuff.
Hide inactive custom forms on the frontend and show on backend #503