Code

Updating master from develop#83

Code

Merged

silenceway merged 36 commits intomasterAyudaEcuador/Ushahidi_Web:masterfrom developAyudaEcuador/Ushahidi_Web:developCopy head branch name to clipboardApr 25, 2016

+33,910-276

Commits

Commits on Apr 21, 2016

• media queries para mobile y desktops

  ugosan

  committed
  85cbf5f

  Copy full SHA for 85cbf5f

• layout responsivo para mobile, se cambia el menu de categorías para quedarse en una columna lateral

  ugosan

  committed
  af92a4f

  Copy full SHA for af92a4f

• Titulo h3 para "How to report"

  ugosan

  committed
  4787058

  Copy full SHA for 4787058

• Merge pull request #73 from ugosan/develop

  Show description for 6800cd1
  silenceway

  committed
  6800cd1

  Copy full SHA for 6800cd1

• arreglando popup de filtros y 'how to report'

  ugosan

  committed
  ca640d7

  Copy full SHA for ca640d7

• Merge pull request #74 from ugosan/develop

  Show description for 17e8fb9
  silenceway

  committed
  17e8fb9

  Copy full SHA for 17e8fb9

• Se carga la localización GPS del dispositivo al crearse un nuevo report

  Show description for 909e8c8
  ugosan

  committed
  909e8c8

  Copy full SHA for 909e8c8

• Update in category block

  silenceway

  committed
  e49add8

  Copy full SHA for e49add8

• Category Block Update

  silenceway

  committed
  6be0eed

  Copy full SHA for 6be0eed

• Arreglado menu de categorías y tipos

  ugosan

  committed
  3b410a2

  Copy full SHA for 3b410a2

Commits on Apr 22, 2016

• Agregar insignia de waffle.io

  jreyes33

  committed
  f061495

  Copy full SHA for f061495

• Especificar la rama para los PRs en la guía de contribución

  jreyes33

  committed
  7ae84f5

  Copy full SHA for 7ae84f5

• Ushahidi embed plugin

  silenceway

  committed
  8bc2ea0

  Copy full SHA for 8bc2ea0

• Update category block

  silenceway

  committed
  4ae9e30

  Copy full SHA for 4ae9e30

• Update category block

  silenceway

  committed
  25a6ee1

  Copy full SHA for 25a6ee1

• Update plugins code

  silenceway

  committed
  56a2767

  Copy full SHA for 56a2767

• Map Embed Update

  silenceway

  committed
  9f83fa9

  Copy full SHA for 9f83fa9

• se modifica el ancho de los campos para que se vea un tamanio uniforme y la alineacion de la seccion de informacion opcional.

  Gabicha

  committed
  67aa785

  Copy full SHA for 67aa785

• +@claucece Actualizamos el diseño de las categorias en el mapa embebido

  sauljabin

  committed
  fd72d32

  Copy full SHA for fd72d32

• Merged branch develop into develop

  sauljabin

  committed
  f40d402

  Copy full SHA for f40d402

• +@claucece Mejora en tamaño de la fuente mapa embebido

  sauljabin

  committed
  ae643bc

  Copy full SHA for ae643bc

• +@sauljabin actualizado filtro de categorías para dispositivos móviles

  claucece

  committed
  15cd0b5

  Copy full SHA for 15cd0b5

• Merge branch 'master' into develop

  jreyes33

  committed
  e9e54b3

  Copy full SHA for e9e54b3

Commits on Apr 24, 2016

• Updates in home layout

  Show description for 42f8f0a
  silenceway

  committed
  42f8f0a

  Copy full SHA for 42f8f0a

• Remove link in icon.

  silenceway

  committed
  bfb8a73

  Copy full SHA for bfb8a73

• Update navigation items.

  silenceway

  committed
  2b333b1

  Copy full SHA for 2b333b1

• Add language to ushahidi.js

  silenceway

  committed
  454f50e

  Copy full SHA for 454f50e

• Added missing image in template

  silenceway

  committed
  3dae9cb

  Copy full SHA for 3dae9cb

• Missing template images

  silenceway

  committed
  6b9a8e3

  Copy full SHA for 6b9a8e3

• Fix missing map in reports page

  silenceway

  committed
  453c780

  Copy full SHA for 453c780

• Adding 'submited by' to csv report

  silenceway

  committed
  731d8b4

  Copy full SHA for 731d8b4

• Adding 'Analysis Matrix' plugin

  silenceway

  committed
  97d543a

  Copy full SHA for 97d543a

• Adding plugin timemap.

  silenceway

  committed
  9dd08d6

  Copy full SHA for 9dd08d6

• Fix media.php error with mtime undefined variable

  silenceway

  committed
  c66a867

  Copy full SHA for c66a867

• Fixed $mtime notification error

  silenceway

  committed
  e35739a

  Copy full SHA for e35739a

• Update timemap.

  silenceway

  committed
  681b874

  Copy full SHA for 681b874