Commit graph

15 commits

Author SHA1 Message Date
Bruno
1fd6f813b9 Merge branch 'master' into i18n
Conflicts:
	view/template/content/faq.php
	view/template/content/home.php
	view/template/content/news.php
	view/template/download/get.php
	view/template/page/learn.php
	view/template/page/publish.php
	view/template/page/team.php
	view/template/page/what.php
2016-07-21 15:35:29 -04:00
Bruno
eee4fed3cf added Portuguese translation 2016-07-21 14:26:49 -04:00
Jeremy Kauffman
d4095ca5aa blog footer, refactor to view partials, remove old content 2016-07-14 09:30:04 -04:00
Jeremy Kauffman
5afcf54f38 job and alex bios 2016-07-11 14:04:35 -04:00
Alex Grintsvayg
a31fb27387 multiple meta images for posts 2016-07-04 13:07:27 -04:00
Jeremy Kauffman
aa0becca34 dynamic press kit + new bio format 2016-06-29 10:52:05 -04:00
Bruno
6b8b69fbc9 some more work on team.php 2016-06-16 17:21:48 -04:00
Jeremy Kauffman
dba4b5aa29 fix typo in reilly bio 2016-06-16 16:20:33 -04:00
Bruno
372b579469 i18n of files including team.php 2016-06-16 15:46:23 -04:00
Jeremy Kauffman
57ed8272a2 add reilly bio 2016-06-16 15:08:37 -04:00
Alex Grintsvayg
e86146d96a ssl ALL the things 2016-05-26 13:59:21 -04:00
Alex Grin
acebabe526 fix bad merge 2016-05-06 14:06:34 -04:00
Jeremy Kauffman
f605400ba2 Merge remote-tracking branch 'origin/master' into blogs_are_dumb 2016-04-28 12:36:00 -04:00
Jeremy Kauffman
db03e5e636 merge blog, merge essay, new /get, new /learn 2016-04-28 12:35:36 -04:00
Jeremy Kauffman
925d622875 Some people, when confronted with a problem, think, I know, I'll implement my own CMS. Now they have two problems. 2016-04-16 20:12:04 -04:00
Renamed from view/page/team.php (Browse further)