cartoterra.git - Cartoterra.net Website

	Commit message (Expand)	Author	Age	Files
*	Merge branch 'develop'HEAD v1.11 master	Félix Sipma	2016-07-15	6
\|\
\| *	fix cover-cropped background images	Félix Sipma	2016-07-15	2
\| *	bump extra.css version	Félix Sipma	2016-07-15	1
\| *	Merge branch 'grunt-cli' into develop	Félix Sipma	2016-07-15	1
\| \|\
\| \| *	add grunt-cli to package.json	Félix Sipma	2016-07-15	1
\| \|/
\| *	Merge branch 'upgrade-pip' into develop	Félix Sipma	2016-07-15	1
\| \|\
\| \| *	upgrade pip	Félix Sipma	2016-07-15	1
\| \|/
\| *	Merge branch 'worksite-inauguration-date' into develop	Félix Sipma	2016-07-14	1
\|/\|
\| *	add inauguration date to worksite_detail	Félix Sipma	2016-07-14	1
\|/
*	Merge branch 'develop'v1.10	Félix Sipma	2016-07-14	5
\|\
\| *	Merge branch 'hotfix-slugify' into develop	Félix Sipma	2016-07-14	3
\| \|\
\| \| *	use slugify instead of escapejs + lower	Félix Sipma	2016-07-14	3
\| \|/
\| *	Merge branch 'ident_name' into develop	Félix Sipma	2016-07-14	3
\|/\|
\| *	use ident_name as a fallback for name	Félix Sipma	2016-07-14	3
\|/
*	Merge branch 'develop'v1.9	Félix Sipma	2016-07-14	1
\|\
\| *	Merge branch 'hotfix-event-type' into develop	Félix Sipma	2016-07-14	1
\|/\|
\| *	Event can have no event_typehotfix-event-type	Félix Sipma	2016-07-14	1
\|/
*	Merge branch 'develop'v1.8	Félix Sipma	2016-07-14	28
\|\
\| *	Merge branch 'gregpac-master' into develop	Félix Sipma	2016-07-14	25
\| \|\
\| \| *	cherry pick commit from gregpac	Félix Sipma	2016-07-14	1
\| \| *	partial revert	Félix Sipma	2016-07-14	2
\| \| *	use navbar-brand for logo	Félix Sipma	2016-07-14	2
\| \| *	Merge branch 'master' of https://github.com/gregpac/cartoterra-1 into gregpac...	Félix Sipma	2016-07-14	24
\| \|/\|
\| \| *	new logo for cartoterra header	gregpac	2016-07-14	6
\| \| *	structure of home page with fixed image	gregpac	2016-07-14	6
\| \| *	changed icons for maps and reduced size, deleted out of date icons	gregpac	2016-07-14	13
\| \|/ \|/\|
\| *	Merge branch 'date-filter' into develop	Félix Sipma	2016-07-14	4
\| \|\
\| \| *	add date filter to bigmap toolbox	Félix Sipma	2016-07-14	4
\| \|/
\| *	Merge branch 'hotfix-console-debug' into develop	Félix Sipma	2016-07-13	1
\| \|\
\| \| *	remove old console.debug from js code	Félix Sipma	2016-07-13	1
\| \|/
\| *	Merge branch 'filters-display-fixes' into develop	Félix Sipma	2016-07-08	1
\| \|\
\| \| *	use div instead of ul>li in toolbox	Félix Sipma	2016-07-08	1
\| \| *	use lower case in toolbox	Félix Sipma	2016-07-08	1
\| \|/
\| *	Merge branch 'subtypes-tool' into develop	Félix Sipma	2016-07-08	4
\| \|\
\| \| *	add subtype filter to map toolbox	Félix Sipma	2016-07-08	4
\| \|/
\| *	Merge branch 'fix-multiple-filters' into develop	Félix Sipma	2016-07-08	1
\| \|\
\| \| *	fix multiple filters toolbox	Félix Sipma	2016-07-08	1
\| \|/
\| *	Merge branch 'hotfix-console-debug' into develop	Félix Sipma	2016-07-08	1
\| \|\
\| \| *	remove useless console.debug	Félix Sipma	2016-07-08	1
\| \|/
\| *	Merge branch 'count-in-type-filter' into develop	Félix Sipma	2016-07-07	3
\| \|\
\| \| *	add entry count in type filter	Félix Sipma	2016-07-07	3
\| \|/
\| *	Merge branch 'techniques-tool' into develop	Félix Sipma	2016-07-07	4
\|/\|
\| *	add technique filter to map toolbox	Félix Sipma	2016-07-07	4
\|/
*	Merge branch 'develop'v1.7	Félix Sipma	2016-07-05	13
\|\
\| *	Merge branch 'map-tools' into develop	Félix Sipma	2016-07-05	8
\| \|\
\| \| *	toolbox for small screens	Félix Sipma	2016-07-05	1
\| \| *	remove old sidebar from bigmap	Félix Sipma	2016-07-05	1
\| \| *	add "add geodata" dropdown to navbar	Félix Sipma	2016-07-05	1
\| \| *	add "add geodata" tool to toolbox	Félix Sipma	2016-07-05	3
\| \| *	allow multiple toolboxes	Félix Sipma	2016-07-05	1