Changeset 6276 for branches/2.1
- Timestamp:
- May 22, 2010, 11:48:17 AM (14 years ago)
- Location:
- branches/2.1
- Files:
-
- 94 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
set to
/branches/2.0/admin merged eligible /trunk/admin merged non-inheritable eligible
-
Property
svn:mergeinfo
set to
-
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
set to
/branches/2.0/admin/cat_list.php merged eligible /trunk/admin/cat_list.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/cat_modify.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/cat_modify.php merged eligible /trunk/admin/cat_modify.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/cat_move.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/cat_move.php merged eligible /trunk/admin/cat_move.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/cat_options.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/cat_options.php merged eligible /trunk/admin/cat_options.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/cat_perm.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/cat_perm.php merged eligible /trunk/admin/cat_perm.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/comments.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/comments.php merged eligible /trunk/admin/comments.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/configuration.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/configuration.php merged eligible /trunk/admin/configuration.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/element_set.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/element_set.php merged eligible /trunk/admin/element_set.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/element_set_global.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/element_set_global.php merged eligible /trunk/admin/element_set_global.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/element_set_ranks.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/element_set_ranks.php merged eligible /trunk/admin/element_set_ranks.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/element_set_unit.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/element_set_unit.php merged eligible /trunk/admin/element_set_unit.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/extend_for_templates.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/extend_for_templates.php merged eligible /trunk/admin/extend_for_templates.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/group_list.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/group_list.php merged eligible /trunk/admin/group_list.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/group_perm.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/group_perm.php merged eligible /trunk/admin/group_perm.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/help.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/help.php merged eligible /trunk/admin/help.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/history.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/history.php merged eligible /trunk/admin/history.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/index.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/index.php merged eligible /trunk/admin/index.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/intro.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/intro.php merged eligible /trunk/admin/intro.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/languages_installed.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/languages_installed.php merged eligible /branches/2.0/admin/languages_installed.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/languages_new.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/languages_new.php merged eligible /branches/2.0/admin/languages_new.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/maintenance.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/maintenance.php merged eligible /trunk/admin/maintenance.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/menubar.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/menubar.php merged eligible /trunk/admin/menubar.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/notification_by_mail.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/notification_by_mail.php merged eligible /trunk/admin/notification_by_mail.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/permalinks.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/permalinks.php merged eligible /trunk/admin/permalinks.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/photos_add.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/photos_add.php merged eligible /branches/2.0/admin/photos_add.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/photos_add_direct.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/photos_add_direct.php merged eligible /branches/2.0/admin/photos_add_direct.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/photos_add_ftp.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/photos_add_ftp.php merged eligible /branches/2.0/admin/photos_add_ftp.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/photos_add_ploader.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/photos_add_ploader.php merged eligible /branches/2.0/admin/photos_add_ploader.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/photos_add_settings.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/photos_add_settings.php merged eligible /branches/2.0/admin/photos_add_settings.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/picture_modify.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/picture_modify.php merged eligible /trunk/admin/picture_modify.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/plugin.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/plugin.php merged eligible /trunk/admin/plugin.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/plugins_list.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/plugins_list.php merged eligible /trunk/admin/plugins_list.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/plugins_new.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/plugins_new.php merged eligible /trunk/admin/plugins_new.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/plugins_update.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/plugins_update.php merged eligible /trunk/admin/plugins_update.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/popuphelp.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/popuphelp.php merged eligible /branches/2.0/admin/popuphelp.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/profile.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/profile.php merged eligible /trunk/admin/profile.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/rating.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/rating.php merged eligible /trunk/admin/rating.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/site_manager.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/site_manager.php merged eligible /trunk/admin/site_manager.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/site_reader_local.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/site_reader_local.php merged eligible /trunk/admin/site_reader_local.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/site_reader_remote.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/site_reader_remote.php merged eligible /trunk/admin/site_reader_remote.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/site_update.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/site_update.php merged eligible /trunk/admin/site_update.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/stats.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/stats.php merged eligible /trunk/admin/stats.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/tags.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/tags.php merged eligible /trunk/admin/tags.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/theme.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/theme.php merged eligible /branches/2.0/admin/theme.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes merged non-inheritable eligible /branches/2.0/admin/themes 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default merged non-inheritable eligible /branches/2.0/admin/themes/default 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/content.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/content.css merged eligible /branches/2.0/admin/themes/default/content.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/default-colors.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/default-colors.css merged eligible /branches/2.0/admin/themes/default/default-colors.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/default-layout.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/default-layout.css merged eligible /branches/2.0/admin/themes/default/default-layout.css 4963
r6000 r6276 830 830 background-repeat: no-repeat; 831 831 background-position: 5px 5px; 832 padding:5px 70px 0pt 30px;832 padding:5px 70px 0pt 53px; 833 833 min-height: 54px; 834 834 } -
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/fix-ie5-ie6.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/fix-ie5-ie6.css merged eligible /branches/2.0/admin/themes/default/fix-ie5-ie6.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/index.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/index.php merged eligible /branches/2.0/admin/themes/default/index.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/layout.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/layout.css merged eligible /branches/2.0/admin/themes/default/layout.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/local-layout.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/local-layout.css merged eligible /branches/2.0/admin/themes/default/local-layout.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/local_head.tpl
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/local_head.tpl merged eligible /branches/2.0/admin/themes/default/local_head.tpl 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/menubar.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/menubar.css merged eligible /branches/2.0/admin/themes/default/menubar.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/picture.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/picture.css merged eligible /branches/2.0/admin/themes/default/picture.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/print.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/print.css merged eligible /branches/2.0/admin/themes/default/print.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/theme.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/theme.css merged eligible /branches/2.0/admin/themes/default/theme.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/themeconf.inc.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/themeconf.inc.php merged eligible /branches/2.0/admin/themes/default/themeconf.inc.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/thumbnails.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/thumbnails.css merged eligible /branches/2.0/admin/themes/default/thumbnails.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes/default/uploadify.jGrowl.css
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes/default/uploadify.jGrowl.css merged eligible /branches/2.0/admin/themes/default/uploadify.jGrowl.css 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes_installed.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes_installed.php merged eligible /branches/2.0/admin/themes_installed.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/themes_new.php
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
/trunk/admin/themes_new.php merged eligible /branches/2.0/admin/themes_new.php 4963
-
Property
svn:mergeinfo
set to
(toggle deleted branches)
-
branches/2.1/admin/thumbnail.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/thumbnail.php merged eligible /trunk/admin/thumbnail.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/upload.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/upload.php merged eligible /trunk/admin/upload.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/user_list.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/user_list.php merged eligible /trunk/admin/user_list.php merged eligible
-
Property
svn:mergeinfo
set to
-
branches/2.1/admin/user_perm.php
-
Property
svn:mergeinfo
set to
/branches/2.0/admin/user_perm.php merged eligible /trunk/admin/user_perm.php merged eligible
-
Property
svn:mergeinfo
set to
-
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.