aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFiles
* Merge branch 'develop'HEADv1.11masterFélix Sipma2016-07-156
|\
| * fix cover-cropped background imagesFélix Sipma2016-07-152
| * bump extra.css versionFélix Sipma2016-07-151
| * Merge branch 'grunt-cli' into developFélix Sipma2016-07-151
| |\
| | * add grunt-cli to package.jsonFélix Sipma2016-07-151
| |/
| * Merge branch 'upgrade-pip' into developFélix Sipma2016-07-151
| |\
| | * upgrade pipFélix Sipma2016-07-151
| |/
| * Merge branch 'worksite-inauguration-date' into developFélix Sipma2016-07-141
| |\ |/ /
| * add inauguration date to worksite_detailFélix Sipma2016-07-141
|/
* Merge branch 'develop'v1.10Félix Sipma2016-07-145
|\
| * Merge branch 'hotfix-slugify' into developFélix Sipma2016-07-143
| |\
| | * use slugify instead of escapejs + lowerFélix Sipma2016-07-143
| |/
| * Merge branch 'ident_name' into developFélix Sipma2016-07-143
| |\ |/ /
| * use ident_name as a fallback for nameFélix Sipma2016-07-143
|/
* Merge branch 'develop'v1.9Félix Sipma2016-07-141
|\
| * Merge branch 'hotfix-event-type' into developFélix Sipma2016-07-141
| |\ |/ /
| * Event can have no event_typehotfix-event-typeFélix Sipma2016-07-141
|/
* Merge branch 'develop'v1.8Félix Sipma2016-07-1428
|\
| * Merge branch 'gregpac-master' into developFélix Sipma2016-07-1425
| |\
| | * cherry pick commit from gregpacFélix Sipma2016-07-141
| | * partial revertFélix Sipma2016-07-142
| | * use navbar-brand for logoFélix Sipma2016-07-142
| | * Merge branch 'master' of https://github.com/gregpac/cartoterra-1 into gregpac...Félix Sipma2016-07-1424
| | |\ | |/ /
| | * new logo for cartoterra headergregpac2016-07-146
| | * structure of home page with fixed imagegregpac2016-07-146
| | * changed icons for maps and reduced size, deleted out of date iconsgregpac2016-07-1413
| |/ |/|
| * Merge branch 'date-filter' into developFélix Sipma2016-07-144
| |\
| | * add date filter to bigmap toolboxFélix Sipma2016-07-144
| |/
| * Merge branch 'hotfix-console-debug' into developFélix Sipma2016-07-131
| |\
| | * remove old console.debug from js codeFélix Sipma2016-07-131
| |/
| * Merge branch 'filters-display-fixes' into developFélix Sipma2016-07-081
| |\
| | * use div instead of ul>li in toolboxFélix Sipma2016-07-081
| | * use lower case in toolboxFélix Sipma2016-07-081
| |/
| * Merge branch 'subtypes-tool' into developFélix Sipma2016-07-084
| |\
| | * add subtype filter to map toolboxFélix Sipma2016-07-084
| |/
| * Merge branch 'fix-multiple-filters' into developFélix Sipma2016-07-081
| |\
| | * fix multiple filters toolboxFélix Sipma2016-07-081
| |/
| * Merge branch 'hotfix-console-debug' into developFélix Sipma2016-07-081
| |\
| | * remove useless console.debugFélix Sipma2016-07-081
| |/
| * Merge branch 'count-in-type-filter' into developFélix Sipma2016-07-073
| |\
| | * add entry count in type filterFélix Sipma2016-07-073
| |/
| * Merge branch 'techniques-tool' into developFélix Sipma2016-07-074
| |\ |/ /
| * add technique filter to map toolboxFélix Sipma2016-07-074
|/
* Merge branch 'develop'v1.7Félix Sipma2016-07-0513
|\
| * Merge branch 'map-tools' into developFélix Sipma2016-07-058
| |\
| | * toolbox for small screensFélix Sipma2016-07-051
| | * remove old sidebar from bigmapFélix Sipma2016-07-051
| | * add "add geodata" dropdown to navbarFélix Sipma2016-07-051
| | * add "add geodata" tool to toolboxFélix Sipma2016-07-053
| | * allow multiple toolboxesFélix Sipma2016-07-051