Changeset 6323 for branches/2.1
- Timestamp:
- May 24, 2010, 1:19:04 PM (14 years ago)
- Location:
- branches/2.1
- Files:
-
- 158 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/2.1
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/about.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/action.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/cat_list.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/cat_modify.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/cat_move.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/cat_options.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/cat_perm.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/comments.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/configuration.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/element_set.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/element_set_global.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/element_set_ranks.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/element_set_unit.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/extend_for_templates.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/group_list.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/group_perm.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/help.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/history.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/index.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/intro.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/languages_installed.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/languages_new.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/maintenance.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/menubar.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/notification_by_mail.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/permalinks.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/photos_add.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/photos_add_direct.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/photos_add_ftp.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/photos_add_ploader.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/photos_add_settings.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/picture_modify.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/plugin.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/plugins_list.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/plugins_new.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/plugins_update.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/popuphelp.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/profile.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/rating.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/site_manager.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/site_reader_local.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/site_reader_remote.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/site_update.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/stats.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/tags.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/theme.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/clear
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/clear merged non-inheritable eligible /branches/2.0/admin/themes/clear 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/clear/index.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/clear/index.php merged eligible /branches/2.0/admin/themes/clear/index.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/clear/mail-css.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/clear/mail-css.tpl merged eligible /branches/2.0/admin/themes/clear/mail-css.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/clear/theme.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/clear/theme.css merged eligible /branches/2.0/admin/themes/clear/theme.css 4963
r6072 r6323 144 144 #content.content div.comment a.illustration{ margin-right: 30px;} 145 145 /* tabsheets are often used in admin pages => No specific css files */ 146 .tabsheet { 147 display: table; 148 margin: 0; 149 padding: 0 0 0 35px; 150 list-style-type:none; 151 list-style-image:none; 152 white-space: nowrap; 153 } 154 146 .tabsheet { 147 background-color:#f9f9f9; border:1px solid #f9f9f9; border-bottom:1px solid #aaa; display:table; 148 font-family:verdana,arial,helvetica,sans-serif; font-size:8px; 149 list-style-type:none; list-style-image:none; padding: 0; position:relative; text-decoration:none; 150 top:-2px; white-space:nowrap; margin: 0 0 0 -6px; padding-left:10px; 151 width:100%; } 155 152 .tabsheet li { background:#f1f1f1; float:left; margin:0 6px 0 0; overflow:hidden; text-align:right; border:1px solid #aaa; border-bottom:none; position:relative; top:11px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px;-webkit-border-top-left-radius:5px; -webkit-border-top-right-radius:5px;} 156 153 .tabsheet a { -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/clear/themeconf.inc.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/clear/themeconf.inc.php merged eligible /branches/2.0/admin/themes/clear/themeconf.inc.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/content.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/default-colors.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/default-layout.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/fix-ie5-ie6.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/index.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/layout.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/local-layout.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/local_head.tpl
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/menubar.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/picture.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/print.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/template
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template merged non-inheritable eligible /branches/2.0/admin/themes/default/template 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/admin.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/admin.tpl merged eligible /branches/2.0/admin/themes/default/template/admin.tpl 4963
r6056 r6323 92 92 </div> <!-- menubar --> 93 93 94 {if isset($TABSHEET)} 95 {$TABSHEET} 96 {/if} 94 <div id="content" class="content"> 97 95 98 <div id="content" class="content{if isset($TABSHEET)} with-tabs{/if}"> 96 {if isset($TABSHEET)} 97 {$TABSHEET} 98 {/if} 99 99 {if isset($U_HELP)} 100 100 <ul class="HelpActions"> -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/cat_list.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/cat_list.tpl merged eligible /branches/2.0/admin/themes/default/template/cat_list.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/cat_modify.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/cat_modify.tpl merged eligible /branches/2.0/admin/themes/default/template/cat_modify.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/cat_move.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/cat_move.tpl merged eligible /branches/2.0/admin/themes/default/template/cat_move.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/cat_options.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/cat_options.tpl merged eligible /branches/2.0/admin/themes/default/template/cat_options.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/cat_perm.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/cat_perm.tpl merged eligible /branches/2.0/admin/themes/default/template/cat_perm.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/check_integrity.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/check_integrity.tpl merged eligible /branches/2.0/admin/themes/default/template/check_integrity.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/comments.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/comments.tpl merged eligible /branches/2.0/admin/themes/default/template/comments.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/configuration.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/configuration.tpl merged eligible /branches/2.0/admin/themes/default/template/configuration.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/double_select.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/double_select.tpl merged eligible /branches/2.0/admin/themes/default/template/double_select.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/element_set_global.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/element_set_global.tpl merged eligible /branches/2.0/admin/themes/default/template/element_set_global.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/element_set_ranks.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/element_set_ranks.tpl merged eligible /branches/2.0/admin/themes/default/template/element_set_ranks.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/element_set_unit.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/element_set_unit.tpl merged eligible /branches/2.0/admin/themes/default/template/element_set_unit.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/extend_for_templates.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/extend_for_templates.tpl merged eligible /branches/2.0/admin/themes/default/template/extend_for_templates.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/footer.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/footer.tpl merged eligible /branches/2.0/admin/themes/default/template/footer.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/group_list.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/group_list.tpl merged eligible /branches/2.0/admin/themes/default/template/group_list.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/group_perm.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/group_perm.tpl merged eligible /branches/2.0/admin/themes/default/template/group_perm.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/header.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/header.tpl merged eligible /branches/2.0/admin/themes/default/template/header.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/help.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/help.tpl merged eligible /branches/2.0/admin/themes/default/template/help.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/history.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/history.tpl merged eligible /branches/2.0/admin/themes/default/template/history.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/install.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/install.tpl merged eligible /branches/2.0/admin/themes/default/template/install.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/intro.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/intro.tpl merged eligible /branches/2.0/admin/themes/default/template/intro.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/languages_installed.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/languages_installed.tpl merged eligible /branches/2.0/admin/themes/default/template/languages_installed.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/languages_new.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/languages_new.tpl merged eligible /branches/2.0/admin/themes/default/template/languages_new.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/maintenance.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/maintenance.tpl merged eligible /branches/2.0/admin/themes/default/template/maintenance.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/menubar.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/menubar.tpl merged eligible /branches/2.0/admin/themes/default/template/menubar.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/navigation_bar.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/navigation_bar.tpl merged eligible /branches/2.0/admin/themes/default/template/navigation_bar.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/notification_by_mail.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/notification_by_mail.tpl merged eligible /branches/2.0/admin/themes/default/template/notification_by_mail.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/permalinks.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/permalinks.tpl merged eligible /branches/2.0/admin/themes/default/template/permalinks.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/photos_add_direct.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/photos_add_direct.tpl merged eligible /branches/2.0/admin/themes/default/template/photos_add_direct.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/photos_add_ftp.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/photos_add_ftp.tpl merged eligible /branches/2.0/admin/themes/default/template/photos_add_ftp.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/photos_add_ploader.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/photos_add_ploader.tpl merged eligible /branches/2.0/admin/themes/default/template/photos_add_ploader.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/photos_add_settings.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/photos_add_settings.tpl merged eligible /branches/2.0/admin/themes/default/template/photos_add_settings.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/picture_modify.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/picture_modify.tpl merged eligible /branches/2.0/admin/themes/default/template/picture_modify.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/plugins_list.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/plugins_list.tpl merged eligible /branches/2.0/admin/themes/default/template/plugins_list.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/plugins_new.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/plugins_new.tpl merged eligible /branches/2.0/admin/themes/default/template/plugins_new.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/plugins_update.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/plugins_update.tpl merged eligible /branches/2.0/admin/themes/default/template/plugins_update.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/popuphelp.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/popuphelp.tpl merged eligible /branches/2.0/admin/themes/default/template/popuphelp.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/profile.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/profile.tpl merged eligible /branches/2.0/admin/themes/default/template/profile.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/profile_content.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/profile_content.tpl merged eligible /branches/2.0/admin/themes/default/template/profile_content.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/rating.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/rating.tpl merged eligible /branches/2.0/admin/themes/default/template/rating.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/site_manager.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/site_manager.tpl merged eligible /branches/2.0/admin/themes/default/template/site_manager.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/site_update.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/site_update.tpl merged eligible /branches/2.0/admin/themes/default/template/site_update.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/stats.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/stats.tpl merged eligible /branches/2.0/admin/themes/default/template/stats.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/tabsheet.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/tabsheet.tpl merged eligible /branches/2.0/admin/themes/default/template/tabsheet.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/tags.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/tags.tpl merged eligible /branches/2.0/admin/themes/default/template/tags.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/themes_installed.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/themes_installed.tpl merged eligible /branches/2.0/admin/themes/default/template/themes_installed.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/themes_new.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/themes_new.tpl merged eligible /branches/2.0/admin/themes/default/template/themes_new.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/thumbnail.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/thumbnail.tpl merged eligible /branches/2.0/admin/themes/default/template/thumbnail.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/upgrade.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/upgrade.tpl merged eligible /branches/2.0/admin/themes/default/template/upgrade.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/upload.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/upload.tpl merged eligible /branches/2.0/admin/themes/default/template/upload.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/user_list.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/user_list.tpl merged eligible /branches/2.0/admin/themes/default/template/user_list.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/template/user_perm.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/template/user_perm.tpl merged eligible /branches/2.0/admin/themes/default/template/user_perm.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/theme.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/themeconf.inc.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/thumbnails.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/default/uploadify.jGrowl.css
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes/roma
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/roma merged non-inheritable eligible /branches/2.0/admin/themes/roma 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/roma/index.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/roma/index.php merged eligible /branches/2.0/admin/themes/roma/index.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/roma/mail-css.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/roma/mail-css.tpl merged eligible /branches/2.0/admin/themes/roma/mail-css.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/roma/theme.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/roma/theme.css merged eligible /branches/2.0/admin/themes/roma/theme.css 4963
r6279 r6323 125 125 text-align:center; top:0; width:100%; z-index:99; } 126 126 #content.content div.comment a.illustration{ margin-right: 30px;} 127 /* content with tabs */128 .with-tabs {129 border-top: 1px solid #ff3363;130 }131 127 /* tabsheets are often used in admin pages => No specific css files */ 132 128 .tabsheet { 133 display: table; 134 margin: 0 0 -15px 0; 135 padding: 0 0 0 20px; 136 list-style-type:none; 137 list-style-image:none; 138 white-space: nowrap; 139 } 140 .tabsheet li { 141 background:#222222; float:left; margin:0 6px 0 0; overflow:hidden; text-align:right; border:1px solid #ff3363; border-bottom:none; position:relative; top:11px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px;-webkit-border-top-left-radius:5px; -webkit-border-top-right-radius:5px;} 129 background-color:#111111; border:0px none; border-bottom:1px solid #ff3363; display:table; 130 font-family:verdana,arial,helvetica,sans-serif; font-size:8px; 131 list-style-type:none; list-style-image:none; padding: 0; position:relative; text-decoration:none; 132 top:-2px; white-space:nowrap; margin: 0 0 0 -5px; padding-left:10px; 133 width:100%; } 134 .tabsheet li { background:#222222; float:left; margin:0 6px 0 0; overflow:hidden; text-align:right; border:1px solid #ff3363; border-bottom:none; position:relative; top:11px; -moz-border-radius-topleft:5px; -moz-border-radius-topright:5px;-webkit-border-top-left-radius:5px; -webkit-border-top-right-radius:5px;} 142 135 .tabsheet a { 143 136 outline:none; color:#666; display:block; font-size:11px; border:0; -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/roma/themeconf.inc.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/roma/themeconf.inc.php merged eligible /branches/2.0/admin/themes/roma/themeconf.inc.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes_installed.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/themes_new.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/thumbnail.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/upload.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/user_list.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/admin/user_perm.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/category.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/comments.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/feed.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/identification.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/index.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/install.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/nbm.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/notification.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/password.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/picture.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/popuphelp.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/profile.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/qsearch.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/random.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/register.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/search.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/search_rules.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/tags.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/upgrade.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/upgrade_feed.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/upload.php
- Property svn:mergeinfo changed (with no actual effect on merging)
-
branches/2.1/ws.php
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.