Source Control Integration

master 4c79fe78 2017-03-20 09:23 Christian Grothoff Details Diff	Merge branch 'master' into stable
	mod - Makefile	Diff File
	mod - citizens.html.j2	Diff File
	mod - common/footer.j2.inc	Diff File
	mod - developers.html.j2	Diff File
	mod - dist/css/bootstrap.css	Diff File
	mod - dist/css/bootstrap.css.map	Diff File
	mod - dist/css/bootstrap.min.css	Diff File
	mod - dist/fonts/glyphicons-halflings-regular.eot	Diff File
	mod - dist/fonts/glyphicons-halflings-regular.svg	Diff File
	mod - dist/fonts/glyphicons-halflings-regular.ttf	Diff File
	mod - dist/fonts/glyphicons-halflings-regular.woff	Diff File
	mod - dist/js/bootstrap.js	Diff File
	mod - dist/js/bootstrap.min.js	Diff File
	mod - faq.html.j2	Diff File
	mod - governments.html.j2	Diff File
	add - i18nfix.py	Diff File
	mod - index.html.j2	Diff File
	mod - investors.html.j2	Diff File
	mod - locale/babel.map	Diff File
	mod - locale/de/LC_MESSAGES/messages.po	Diff File
	mod - locale/en/LC_MESSAGES/messages.po	Diff File
	mod - locale/es/LC_MESSAGES/messages.po	Diff File
	mod - locale/fr/LC_MESSAGES/messages.po	Diff File
	mod - locale/it/LC_MESSAGES/messages.po	Diff File
	mod - merchants.html.j2	Diff File
	mod - news.html.j2.inc	Diff File
	add - news/2017-03.inc	Diff File
	mod - template.py	Diff File
master c167a8ea 2017-03-20 01:07 Christian Grothoff Details Diff	add FOSSASIA talk to news
	mod - news.html.j2.inc	Diff File
	add - news/2017-03.inc	Diff File
master e3ec2367 2017-03-17 21:26 Christian Grothoff Details Diff	'despite' is wrong
	mod - index.html.j2	Diff File
master 78a8c7a8 2017-03-17 21:24 Christian Grothoff Details Diff	to the merchant is overly restrictive
	mod - index.html.j2	Diff File
	mod - web-common	Diff File
master 06f1c116 2017-03-15 13:00 Florian Dold Details Diff	i18n indentation fix
	mod - Makefile	Diff File
	add - i18nfix.py	Diff File
	mod - locale/babel.map	Diff File
	mod - locale/de/LC_MESSAGES/messages.po	Diff File
	mod - locale/en/LC_MESSAGES/messages.po	Diff File
	mod - locale/es/LC_MESSAGES/messages.po	Diff File
	mod - locale/fr/LC_MESSAGES/messages.po	Diff File
	mod - locale/it/LC_MESSAGES/messages.po	Diff File
	mod - template.py	Diff File
	mod - web-common	Diff File
master 506f4226 2017-03-14 21:40 Christian Grothoff Details Diff	so far all GPLv3+
	mod - developers.html.j2	Diff File
master a8fb3d8b 2017-03-13 19:44 Christian Grothoff Details Diff	update to bootstrap 3.3.7
	mod - dist/css/bootstrap.css	Diff File
	mod - dist/css/bootstrap.css.map	Diff File
	mod - dist/css/bootstrap.min.css	Diff File
	mod - dist/fonts/glyphicons-halflings-regular.eot	Diff File
	mod - dist/fonts/glyphicons-halflings-regular.svg	Diff File
	mod - dist/fonts/glyphicons-halflings-regular.ttf	Diff File
	mod - dist/fonts/glyphicons-halflings-regular.woff	Diff File
	mod - dist/js/bootstrap.js	Diff File
	mod - dist/js/bootstrap.min.js	Diff File
master c4bd8200 2017-03-13 18:44 Christian Grothoff Details Diff	revising gov page based on feedback from Sva and Marcello
	mod - common/footer.j2.inc	Diff File
	mod - developers.html.j2	Diff File
	mod - faq.html.j2	Diff File
	mod - governments.html.j2	Diff File
	mod - investors.html.j2	Diff File
master bc1806ef 2017-03-13 17:16 Christian Grothoff Details Diff	revising merchant's page based on feedback from Sva and Marcello
	mod - index.html.j2	Diff File
	mod - merchants.html.j2	Diff File
master b7814665 2017-03-13 15:54 Christian Grothoff Details Diff	revising index and citizen's pages based on feedback from Marcello and Sva
	mod - citizens.html.j2	Diff File
	mod - index.html.j2	Diff File
	mod - merchants.html.j2	Diff File
master 76095021 2017-03-10 18:27 Florian Dold Details Diff	sync version
	mod - wallet.html.j2	Diff File
master a0a4f566 2017-03-10 18:27 Florian Dold Details Diff	sync version
	mod - wallet.html.j2	Diff File
master 844073c2 2017-03-08 18:35 Christian Grothoff Details Diff	fix typo
	mod - news/2016-12.inc	Diff File
master c4bb7134 2017-03-08 11:25 Christian Grothoff Details Diff	simplify FAQ answers, i18n (merge)
	mod - locale/de/LC_MESSAGES/messages.po	Diff File
	mod - locale/en/LC_MESSAGES/messages.po	Diff File
	mod - locale/es/LC_MESSAGES/messages.po	Diff File
	mod - locale/fr/LC_MESSAGES/messages.po	Diff File
	mod - locale/it/LC_MESSAGES/messages.po	Diff File
master 85744ecb 2017-03-08 11:25 Christian Grothoff Details Diff	simplify FAQ answers, i18n (merge)
	mod - faq.html.j2	Diff File
master f037ab3c 2017-03-08 11:21 Christian Grothoff Details Diff	simplify FAQ answers, i18n
	mod - faq.html.j2	Diff File
	mod - locale/de/LC_MESSAGES/messages.po	Diff File
	mod - locale/en/LC_MESSAGES/messages.po	Diff File
	mod - locale/es/LC_MESSAGES/messages.po	Diff File
	mod - locale/fr/LC_MESSAGES/messages.po	Diff File
	mod - locale/it/LC_MESSAGES/messages.po	Diff File
master e0d2502d 2017-03-08 11:09 Christian Grothoff Details Diff	fix misc typos
	mod - citizens.html.j2	Diff File
	mod - developers.html.j2	Diff File
	mod - faq.html.j2	Diff File
	mod - governments.html.j2	Diff File
	mod - index.html.j2	Diff File
	mod - investors.html.j2	Diff File
	mod - merchants.html.j2	Diff File
master 392c1633 2017-03-08 11:00 Christian Grothoff Details Diff	ignore directories generated by jinja2
	mod - .gitignore	Diff File
master f7488e2f 2017-03-07 19:03 Christian Grothoff Details Diff	remove meanwhile
	mod - index.html.j2	Diff File
master f0a17a23 2017-03-07 19:00 Christian Grothoff Details Diff	there is no escape, Florian shall remain on the front page ;-)
	mod - news.html.j2.inc	Diff File
	add - news/2017-02.inc	Diff File
master 78aa30e2 2017-03-07 18:47 Christian Grothoff Details Diff	more press links
	mod - press.html.j2	Diff File
master 4fe484ad 2017-03-07 18:41 Christian Grothoff Details Diff	fix syntax issue
	mod - press.html.j2	Diff File
master 7da16e8a 2017-03-07 18:35 Christian Grothoff Details Diff	add press page with links
	mod - locale/de/LC_MESSAGES/messages.po	Diff File
	mod - locale/en/LC_MESSAGES/messages.po	Diff File
	mod - locale/es/LC_MESSAGES/messages.po	Diff File
	mod - locale/fr/LC_MESSAGES/messages.po	Diff File
	mod - locale/it/LC_MESSAGES/messages.po	Diff File
	add - press.html.j2	Diff File
master 8774fdd6 2017-03-07 18:24 Florian Dold Details Diff	prevent default also needs to be on mousedown
	mod - dist/js/pdf-view.js	Diff File
master 2e0c7044 2017-03-07 18:20 Christian Grothoff Details Diff	get rid of sub-heading
	mod - index.html.j2	Diff File

Changesets: www