Matthias Mees 1448313fb8 Merge branch '2.0' of github.com:s9y/Serendipity into 2.0 ...

Conflicts:
	templates/2k11/admin/entries.tpl
	templates/2k11/admin/serendipity_editor.js.tpl
	templates/2k11/admin/style.css

2015-01-17 18:12:15 +01:00

..

admin

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

2015-01-17 18:12:15 +01:00

img

syndication update (subtome, defaults, google)

2014-06-09 20:10:45 +02:00

js

Switch 2k11 frontend to new details polyfill.

2014-10-29 20:25:39 +01:00

UTF-8

Replace relevant occurrences of 'Template' with 'Theme'

2014-03-11 20:25:20 +01:00

commentform.tpl

consistent preview/save

2013-10-04 15:51:05 +02:00

comments_by_author.tpl

remove old @ for smarty internal modifiers and stringify and/or fix escape properties

2015-01-14 12:52:20 +01:00

comments.tpl

remove old @ for smarty internal modifiers and stringify and/or fix escape properties

2015-01-14 12:52:20 +01:00

config.inc.php

assign has_freetag in backend

2014-12-06 15:52:31 +01:00

content.tpl

Added 2k11 to templates.

2011-11-28 07:44:46 +01:00

entries_archives.tpl

Updated 2k11 to v1.1.8.

2012-08-01 14:25:01 +02:00

entries_summary.tpl

2k11: Remove pubdate attribute which apparently is deprecated now.

2014-01-08 13:44:39 +01:00

entries.tpl

remove old @ for smarty internal modifiers and stringify and/or fix escape properties

2015-01-14 12:52:20 +01:00

index.tpl

remove old @ for smarty internal modifiers and stringify and/or fix escape properties

2015-01-14 12:52:20 +01:00

info.txt

This is my proposal on implementing the ability to switch frontend and backend templates independently.

2014-05-14 12:58:06 +02:00

lang_cs.inc.php

Backported 2k11 translations from master branch.

2013-03-31 22:03:24 +02:00

lang_cz.inc.php

Backported 2k11 translations from master branch.

2013-03-31 22:03:24 +02:00

lang_de.inc.php

Replace relevant occurrences of 'Template' with 'Theme'

2014-03-11 20:25:20 +01:00

lang_en.inc.php

Replace relevant occurrences of 'Template' with 'Theme'

2014-03-11 20:25:20 +01:00

media_showitem.tpl

remove old @ for smarty internal modifiers and stringify and/or fix escape properties

2015-01-14 12:52:20 +01:00

plugin_calendar.tpl

remove old @ for smarty internal modifiers and stringify and/or fix escape properties

2015-01-14 12:52:20 +01:00

plugin_categories.tpl

Updated 2k11 to v1.1.6.

2012-04-18 15:33:43 +02:00

plugin_commentsearch_searchresults.tpl

remove old @ for smarty internal modifiers and stringify and/or fix escape properties

2015-01-14 12:52:20 +01:00

plugin_contactform.tpl

Updated 2k11 to v1.1.8.

2012-08-01 14:25:01 +02:00

plugin_findmore.tpl

remove old @ for smarty internal modifiers and stringify and/or fix escape properties

2015-01-14 12:52:20 +01:00

plugin_staticblock.tpl

Basic support for static blocks (includeentry plugin) in 2k11.

2013-09-28 18:05:07 +02:00

plugin_staticpage_searchresults.tpl

Updated 2k11 to v1.2.3.

2012-10-15 08:36:10 +02:00

plugin_staticpage_sidebar.tpl

Added 2k11 to templates.

2011-11-28 07:44:46 +01:00

plugin_staticpage.tpl

2k11: Remove pubdate attribute which apparently is deprecated now.

2014-01-08 13:44:39 +01:00

preview_backend_fullsize.jpg

backend preview file changed

2014-05-21 11:59:16 +02:00

preview_fullsize.jpg

Added 2k11 to templates.

2011-11-28 07:44:46 +01:00

preview_iframe.tpl

preview iframe fix wrong modernizr version

2015-01-09 16:14:55 +01:00

preview.png

Added 2k11 to templates.

2011-11-28 07:44:46 +01:00

sidebar.tpl

Replaced hard-coded $item.class in sidebar.tpl.

2013-07-21 16:28:16 +02:00

style.css

Switch 2k11 frontend to new details polyfill.

2014-10-29 20:25:39 +01:00

trackbacks.tpl

remove old @ for smarty internal modifiers and stringify and/or fix escape properties

2015-01-14 12:52:20 +01:00