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

..

font

New iconfont build with new 'Publish now' icon

2015-01-17 16:42:26 +01:00

img

Added new backend template files (smartified core tpls and 2k11 admin tpls as well as related assets).

2012-12-03 00:59:42 +01:00

js

Update bundled jQuery sortable plugin for backend.

2015-01-01 16:23:36 +01:00

category.inc.tpl

fix input title categoryname

2014-11-24 14:58:51 +01:00

comments.inc.tpl

References #189

2014-06-25 12:28:59 +02:00

config_template.tpl

Rewrite positioning of .field_info.

2014-06-20 18:01:48 +02:00

configuration.inc.tpl

Show configuration form after saving

2014-08-18 16:59:26 +02:00

entries_overview.inc.tpl

Removed stupid HTML5/jQuery progress hints.

2013-06-01 11:09:10 +02:00

entries.inc.tpl

Rework code to work with array.

2014-08-08 10:59:40 +02:00

entries.tpl

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

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

groups.inc.tpl

Rewrite positioning of .field_info.

2014-06-20 18:01:48 +02:00

guess_input.tpl

short modifier - escape default is html

2014-02-28 10:04:12 +01:00

images.inc.tpl

Revert "no Umlauts note for image directories"

2014-11-25 09:42:17 +01:00

import.inc.tpl

The import tpl needs some extra headings.

2014-04-26 18:48:51 +02:00

index.tpl

Update bundled modernizr for backend.

2015-01-01 16:04:10 +01:00

installer.inc.tpl

Update bundled modernizr for backend.

2015-01-01 16:04:10 +01:00

maintenance.inc.tpl

References #189

2014-06-25 12:28:59 +02:00

media_choose.tpl

fix doubled html-section in media choose (#150)

2014-06-24 23:22:51 +02:00

media_items.tpl

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

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

media_pane.tpl

References #189

2014-06-25 12:28:59 +02:00

media_properties.tpl

More i18n maintenance (stray markers, hard-coded constants)

2014-03-07 13:29:28 +01:00

media_upload.tpl

References #189

2014-06-25 12:28:59 +02:00

oldie.css

Updated build of backend's oldie stylesheet.

2014-11-11 10:40:13 +01:00

overview.inc.tpl

New iconfont build with new 'Publish now' icon

2015-01-17 16:42:26 +01:00

personal.inc.tpl

short modifier - escape default is html

2014-02-28 10:04:12 +01:00

plugin_config_item.tpl

Rewrite positioning of .field_info.

2014-06-20 18:01:48 +02:00

plugin_config.tpl

init plugin nuggets when not using default JS-Editor

2014-10-14 15:25:55 +02:00

plugins.inc.tpl

Show no update msg for event and sidebar (#226)

2014-11-11 16:47:11 +01:00

serendipity_editor.js.tpl

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

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

show_plugins.fnc.tpl

fix non-existing constant

2015-01-09 19:08:20 +01:00

style.css

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

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

templates.inc.tpl

References #189

2014-06-25 12:28:59 +02:00

upgrader.inc.tpl

Update bundled modernizr for backend.

2015-01-01 16:04:10 +01:00

users.inc.tpl

User the user id variable properly so the correct user is deleted

2014-06-12 16:38:46 +02:00

wysiwyg_init.tpl

simplify tb tweak in 77033ef

2014-11-26 10:52:32 +01:00