Commits

Branch selector

 master

User selector

All users

All time

Commit History

Commits on May 18, 2012

• Merge pull request #37 from March-hare/32-report-filters-not-working-forreal

  Show description for d490902
  

  Mr. Evoltech

  committed
  d490902

  Copy full SHA for d490902

• Finishes up the fix

  

  evoltech

  committed
  957f066

  Copy full SHA for 957f066

• Fixes issues where values set in php where not making it to our overridden JS

  

  evoltech

  committed
  e519ece

  Copy full SHA for e519ece

Commits on Apr 30, 2012

• Merge pull request #34 from rjmackay/patch-1

  Show description for f651cd2
  

  Mr. Evoltech

  committed
  f651cd2

  Copy full SHA for f651cd2

• Update README.markdown

  rjmackay

  committed
  014eca1

  Copy full SHA for 014eca1

Commits on Apr 25, 2012

• Fix in progress

  

  Mr. Evoltech

  committed
  4a0b15c

  Copy full SHA for 4a0b15c

• Bulk of work, still working out the kinks

  

  Mr. Evoltech

  committed
  cc171c1

  Copy full SHA for cc171c1

Commits on Apr 18, 2012

• Merge pull request #31 from March-hare/4-unpaginate-incidents-on-reports

  Show description for 4f2e6d6
  

  Mr. Evoltech

  committed
  4f2e6d6

  Copy full SHA for 4f2e6d6

• Merge pull request #30 from March-hare/4-unpaginate-incidents-on-reports

  Show description for b4f94df
  

  Mr. Evoltech

  committed
  b4f94df

  Copy full SHA for b4f94df

• Fixes issues we were having with InfoWindow

  

  Mr. Evoltech

  committed
  e30dd3a

  Copy full SHA for e30dd3a

• This file should have not been here in the first place

  

  Mr. Evoltech

  committed
  d58af09

  Copy full SHA for d58af09

• Removed a debug statement

  

  Mr. Evoltech

  committed
  9e4d4eb

  Copy full SHA for 9e4d4eb

• There were a few typo bugs that got added with the last commit. Fixed.

  

  Mr. Evoltech

  committed
  6285f39

  Copy full SHA for 6285f39

• Completly replaces /decayimage/json with the new api interface

  Show description for c888271
  

  Mr. Evoltech

  committed
  c888271

  Copy full SHA for c888271

Commits on Apr 17, 2012

• Fix a typo preventing incidents from being displayed

  

  Mr. Evoltech

  committed
  c82a063

  Copy full SHA for c82a063

Commits on Apr 14, 2012

• Add the default decay image to /api/?task=decayimagecategories

  

  Mr. Evoltech

  committed
  735415b

  Copy full SHA for 735415b

• Merge branch 'master' of github.com:March-hare/decayimage

  

  Mr. Evoltech

  committed
  799ed24

  Copy full SHA for 799ed24

• This moves most of the functionality the was previously handled by the controller for /decayimage/json to extend the ushahidi API by responding to /api/?task=decayimagecategories and /api/?task=dec…

  Show description for 6fd8fdd
  

  Mr. Evoltech

  committed
  6fd8fdd

  Copy full SHA for 6fd8fdd

Commits on Apr 11, 2012

• Line ~250 of hooks/decayimage.php added lines to delete a key that is being

  Show description for 916c79c
  

  vanc

  authored and

  vanc1337

  committed
  916c79c

  Copy full SHA for 916c79c

Commits on Mar 28, 2012

• Fixes a bug where previous icon layers, if they existed, are not correctly removed

  

  Mr. Evoltech

  committed
  19d9d07

  Copy full SHA for 19d9d07

Commits on Mar 27, 2012

• This makes sure there is an array of category objects not an array of an

  Show description for bf26493
  

  Mr. Evoltech

  committed
  bf26493

  Copy full SHA for bf26493

• This adds the ability to present json for multiple categories

  

  Mr. Evoltech

  committed
  b147238

  Copy full SHA for b147238

Commits on Mar 25, 2012

• Adds incident title and description to the output

  Show description for f8ad190
  

  Mr. Evoltech

  committed
  f8ad190

  Copy full SHA for f8ad190

Commits on Mar 20, 2012

• This provides jsonp support

  

  Mr. Evoltech

  committed
  5a3e4eb

  Copy full SHA for 5a3e4eb

Commits on Mar 14, 2012

• Adding some additional error handling for image uploads

  

  Mr. Evoltech

  committed
  01e91a8

  Copy full SHA for 01e91a8

• Merge branch '11-Add-settings-link-in-the-plugins-listing' into beta

  

  Mr. Evoltech

  committed
  d974d28

  Copy full SHA for d974d28

• Merge branch '7-restore-default-icon' into beta

  Show description for 0e57eeb
  

  Mr. Evoltech

  committed
  0e57eeb

  Copy full SHA for 0e57eeb

• Merge pull request #24 from March-hare/5-Create-default-decayimage-when-category-is-added

  Show description for f557735
  

  Mr. Evoltech

  committed
  f557735

  Copy full SHA for f557735

• Merge pull request #23 from March-hare/8-Prevent-decayimage-from-installing-unless-endtime-is-installed

  Show description for 8d422ea
  

  Mr. Evoltech

  committed
  8d422ea

  Copy full SHA for 8d422ea

• Merge pull request #22 from March-hare/16-forgets-decay-on-page-error-reload

  Show description for e423263
  

  Mr. Evoltech

  committed
  e423263

  Copy full SHA for e423263

• Allows for restoring the default icon but also...

  Show description for 593c644
  

  Mr. Evoltech

  committed
  593c644

  Copy full SHA for 593c644

• Tested and signed off

  

  Mr. Evoltech

  committed
  2577f1c

  Copy full SHA for 2577f1c

Commits on Mar 13, 2012

• A warning in the readme is the best we can do for a dependency

  

  Mr. Evoltech

  committed
  7aff164

  Copy full SHA for 7aff164

• This adds builtin settings link to /admin/addons/plugins

  

  Mr. Evoltech

  committed
  2a73e84

  Copy full SHA for 2a73e84

Commits on Mar 12, 2012

• This will preserve user input across form validation while preventing

  Show description for cd32fd9
  

  Mr. Evoltech

  committed
  cd32fd9

  Copy full SHA for cd32fd9