Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

2.6 post launch fixes #910

Merged
merged 13 commits into from
Nov 20, 2012
Merged

2.6 post launch fixes #910

merged 13 commits into from
Nov 20, 2012

Commits on Oct 24, 2012

  1. Allowing UTF-8 report titles. Closes ushahidi#908

    @brianherbert @rjmackay
    brianherbert authored and rjmackay committed Oct 24, 2012
    Configuration menu
    Copy the full SHA
    6450be9 View commit details
    Browse the repository at this point in the history

  2. Fix htmlentities calls not using UTF8 

    Related to ushahidi#908
    @rjmackay
    rjmackay committed Oct 24, 2012
    Configuration menu
    Copy the full SHA
    045dcd1 View commit details
    Browse the repository at this point in the history

  3. Ushahidi.js Fix broken map on /reports/view/XXX pages 

    * Fix the way keepOnTop event listener was added so that eventListeners
  is always defined
    @rjmackay
    rjmackay committed Oct 24, 2012
    Configuration menu
    Copy the full SHA
    f8a167d View commit details
    Browse the repository at this point in the history

  4. Fix json/cluster when some reports have no location ushahidi#907 

    Skip any reports without locations and avoid undefined errors
    @rjmackay
    rjmackay committed Oct 24, 2012
    Configuration menu
    Copy the full SHA
    91708b6 View commit details
    Browse the repository at this point in the history

  5. Fix errors when signing up for mobile alerts ushahidi#895 

    $this-> was being used in a static function. Changed to self::
    @rjmackay
    rjmackay committed Oct 24, 2012
    Configuration menu
    Copy the full SHA
    e951d34 View commit details
    Browse the repository at this point in the history

  6. Restore Openlayers TMS support so cloudmade works again ushahidi#911 

    Costs us 2kb in download size, worth it.
    @rjmackay
    rjmackay committed Oct 24, 2012
    Configuration menu
    Copy the full SHA
    cc54806 View commit details
    Browse the repository at this point in the history

Commits on Oct 28, 2012

  1. Fix /json/index when some reports have no location ushahidi#907 

    Same issue as with the clusters code.
    @rjmackay
    rjmackay committed Oct 28, 2012
    Configuration menu
    Copy the full SHA
    39b4a83 View commit details
    Browse the repository at this point in the history

Commits on Nov 12, 2012

  1. Make forgot password tokens use better random token ushahidi#646 

    Fixes security issue discovered by Timothy D. Morgan <tim.morgan@owasp.org>
Forgotten password challenges were guessable based on users last login
and email address. Tokens are now generated based on a HMAC of login time
and email address using a salt and secret key specifically for these
tokens.
    @rjmackay
    rjmackay committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    e8c7ecd View commit details
    Browse the repository at this point in the history

  2. Merge commit 'e8c7ecd' into 2.6.x

    @rjmackay
    rjmackay committed Nov 12, 2012
    Configuration menu
    Copy the full SHA
    199e03b View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2012

  1. Fix more information link on /reports ushahidi#935

    @rjmackay
    rjmackay committed Nov 15, 2012
    Configuration menu
    Copy the full SHA
    cf51ed2 View commit details
    Browse the repository at this point in the history

  2. Make Settings_Model::save_setting() work when inserting new records too 

    Conflicts:

	application/i18n
    @rjmackay
    rjmackay committed Nov 15, 2012
    Configuration menu
    Copy the full SHA
    7171c53 View commit details
    Browse the repository at this point in the history

  3. Make sure we clear the cache after generating forgot_password_secret u… 

    …shahidi#646
    @rjmackay
    rjmackay committed Nov 15, 2012
    Configuration menu
    Copy the full SHA
    6538852 View commit details
    Browse the repository at this point in the history

  4. Fix missing table prefix in customforms::get_custom_form_fields() ush… 

    …ahidi#932
    @rjmackay
    rjmackay committed Nov 15, 2012
    Configuration menu
    Copy the full SHA
    f7cbc22 View commit details
    Browse the repository at this point in the history