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.

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

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

Conversation

rjmackay
Copy link
Contributor

@kamaulynder heres the fixes for 2.6 .. merge them when your ready to do the retagging etc. Maybe its worth waiting another couple of days for fixes to accumulate and pushing a 2.6.1 all the fixes at once?
I've skipped the CDN fix since its only really relevant for Crowdmap

@brianherbert This includes a couple of fixes not on crowdmap yet
e951d34 fix for mobile alerts is a little more minor
f8a167d is major, and fixes the issue Heather has emailed about (missing map on reports pages)

cc/ @evansims

brianherbert and others added 5 commits October 25, 2012 08:44
* Fix the way keepOnTop event listener was added so that eventListeners
  is always defined
Skip any reports without locations and avoid undefined errors
$this-> was being used in a static function. Changed to self::
@ghost ghost assigned kamaulynder Oct 24, 2012
@brianherbert
Copy link
Contributor

These have been pushed up to Crowdmap but this needs to remain open until someone can pull it into Ushahidi core.

@rjmackay
Copy link
Contributor Author

@brianherbert added 1 more fix you probably want

@rjmackay
Copy link
Contributor Author

@kamaulynder any progress on merging this for release? .. we're getting these bugs resubmitted now..

@rjmackay rjmackay mentioned this pull request Nov 11, 2012
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.
@kamaulynder
Copy link
Contributor

Yes.

On Mon, Nov 12, 2012 at 1:24 AM, Robbie MacKay notifications@github.comwrote:

@kamaulynder https://github.com/kamaulynder any progress on merging
this for release? .. we're getting these bugs resubmitted now..


Reply to this email directly or view it on GitHubhttps://github.com//pull/910#issuecomment-10273173.

Too brief? Here's why! http://emailcharter.org
Regards
Linda Kamau
Coder!!

@rjmackay
Copy link
Contributor Author

Consider this for inclusion: 14f424e

aoduor added a commit that referenced this pull request Nov 13, 2012
kamaulynder added a commit that referenced this pull request Nov 20, 2012
@kamaulynder kamaulynder merged commit 946fc86 into ushahidi:master Nov 20, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants