Skip to content
Commits on Nov 26, 2012
  1. @rjmackay

    Update i18n submodule

    rjmackay committed Nov 27, 2012
Commits on Nov 25, 2012
  1. @rjmackay

    Safer optimization for User_Model::has_permission() #948

    * Avoids breaking tests
    * Just caches the repeated query, not the permission check
    rjmackay committed Nov 26, 2012
  2. @rjmackay

    Revert "Optimize has_permissions check to only check superadmin acces…

    …s once"
    
    This reverts commit 60e3a4b.
    Related to #948
    rjmackay committed Nov 26, 2012
Commits on Nov 23, 2012
  1. @aoduor
Commits on Nov 21, 2012
  1. @brianherbert
Commits on Nov 20, 2012
  1. @rjmackay

    Merge remote-tracking branch 'ushahidi/master' into develop

    Conflicts:
    	sql/upgrade101-102.sql
    	sql/ushahidi.sql
    
    Moved existing upgrade 101-102 to upgrade 102-103
    rjmackay committed Nov 21, 2012
  2. @kamaulynder

    Version 2.6.1

    kamaulynder committed Nov 20, 2012
  3. @kamaulynder

    Merge pull request #910 from rjmackay/2.6.x

    2.6 post launch fixes
    kamaulynder committed Nov 20, 2012
Commits on Nov 18, 2012
  1. @rjmackay

    Change Cache tag 'error' messages 'alerts' #938

    Unsupported cache tags should be more like a notice, not an error.
    Currently it just generates pointless log chatter. Changing
    most of the errors to alert or info.
    rjmackay committed Nov 19, 2012
Commits on Nov 15, 2012
  1. @rjmackay
  2. @rjmackay
  3. @rjmackay
  4. @rjmackay
  5. @rjmackay

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

    Conflicts:
    
    	application/i18n
    rjmackay committed Oct 24, 2012
  6. @rjmackay
  7. @rjmackay
  8. @rjmackay
  9. @rjmackay
  10. @rjmackay

    Optimize has_permissions check to only check superadmin access once

    Caches result in a static variable after first call
    rjmackay committed Nov 15, 2012
Commits on Nov 13, 2012
  1. @aoduor

    Closes #922. Giving custom div end tags unique names by incrementing …

    …field id. Related to #910
    aoduor committed Nov 13, 2012
  2. @rjmackay
  3. @rjmackay

    Clean up geocoding in core #933

    * Remove GoogleMapAPI library as its mostly unused
    * Move http request for map::geocoder() from GoogleMapAPI
    * Use map::geocoder() instead of Geocoder::geocoder_location()
      from ReportsImporter
    * Remove unused Proximity library
    * Make Geocoder::geocoder_location() use map::geocoder() instead
      of implementing the geocoder call twice.
    rjmackay committed Nov 13, 2012
  4. @rjmackay

    Remove hardcoded http or https urls where possible #689

    * Changes externals urls to use HTTP/HTTPS based on site protocol (for js)
      or external_site_protocol for remote requests from PHP
    * Adds external_site_protocol config option
      This is so users in firewalled locations (ie. China) can still set up
      a working site
    * Also change settings.api_url_all to be built from map::base() data
    rjmackay committed Nov 13, 2012
  5. @rjmackay
  6. @rjmackay
Commits on Nov 12, 2012
  1. @rjmackay

    Merge pull request #872 from rjmackay/feature/admin-reports-sorting-220

    Add reports search form #220
    rjmackay committed Nov 12, 2012
  2. @rjmackay
  3. @rjmackay
  4. @rjmackay
  5. @rjmackay
  6. @rjmackay
  7. @rjmackay

    Make forgot password tokens use better random token #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 committed Nov 12, 2012
  8. @rjmackay
Commits on Nov 6, 2012
  1. @rjmackay
  2. @rjmackay

    Add config option to enable the profiler everywhere

    * Render profiler output in scheduler
    * Disable profiler in /json controller
    
    Conflicts:
    
    	application/controllers/scheduler.php
    rjmackay committed Nov 7, 2012
Something went wrong with that request. Please try again.