Commit Graph

13 Commits

Author SHA1 Message Date
Mikael Nordfeldth f79aec36fe Merge remote-tracking branch 'statusnet/master'
This merges GNU Social with current development of StatusNet. The only conflicts were some documentation, where GNU Social's versions were retained.

Conflicts:
	doc-src/about
	doc-src/faq
	plugins/OpenID/doc-src/openid
2013-08-12 12:23:17 +02:00
Evan Prodromou ac1ea3e8cf Remove template plugin
I don't think this still works; it's probably a bad idea to leave it in 1.0.x.
2011-09-20 11:06:18 -04:00
Matt Lee aa42c61211 fixed path 2010-12-06 16:00:46 -05:00
Matt Lee ec50eccf28 fixed path 2010-12-06 15:58:34 -05:00
Matt Lee bcb7832fc5 updated CSS, added feedback button 2010-12-06 15:56:26 -05:00
Matt Lee 4f2d3b733a updated template 2010-11-29 15:16:24 -05:00
Matt Lee 0d4588e4b6 added link to get the code 2010-09-17 11:50:21 -04:00
Ian Denhardt 8d47f98894 cleaned up template; was badly indented and missing an opening <html> tag. 2010-08-02 15:39:00 -04:00
Matt Lee e82f9bc588 fixes for paths, etc 2010-07-26 22:10:17 -04:00
Matt Lee 6b34a2111d GNU social plugin (for look/feel), theme, template 2010-07-26 22:05:33 -04:00
Brenda Wallace 6bae2ad03a fix up tpl/index.php so doesn't throw errors on hosts with php shorttags on 2009-08-25 09:14:43 +12:00
Craig Andrews 95ba22c5d7 Switch DOCTYPE's to the XHTML 5 DOCTYPE 2009-08-05 18:27:27 -04:00
Brian c8343e75fc tpl/index.php 0.1 2009-03-24 12:42:42 -07:00