Skip to content
  • Marco Villegas's avatar
    Merge ksenzee/views3ui github master branch into 7.x-3.x · 98b13e41
    Marco Villegas authored
    Conflifts have been solved trusting completely on github branch, but at
    the same time removing the $Id$ CVS keyword that do not make sense any
    more.
    
    Conflicts:
    	README.txt
    	css/views-admin.css
    	css/views-list-rtl.css
    	css/views-list.css
    	css/views.css
    	docs/docs.php
    	handlers/views_handler_area.inc
    	handlers/views_handler_area_text.inc
    	handlers/views_handler_argument.inc
    	handlers/views_handler_argument_date.inc
    	handlers/views_handler_argument_formula.inc
    	handlers/views_handler_argument_group_by_numeric.inc
    	handlers/views_handler_argument_many_to_one.inc
    	handlers/views_handler_argument_null.inc
    	handlers/views_handler_argument_numeric.inc
    	handlers/views_handler_argument_string.inc
    	handlers/views_handler_field.inc
    	handlers/views_handler_field_boolean.inc
    	handlers/views_handler_field_counter.inc
    	handlers/views_handler_field_custom.inc
    	handlers/views_handler_field_date.inc
    	handlers/views_handler_field_group_by_numeric.inc
    	handlers/views_handler_field_markup.inc
    	handlers/views_handler_field_math.inc
    	handlers/views_handler_field_numeric.inc
    	handlers/views_handler_field_prerender_list.inc
    	handlers/views_handler_field_url.inc
    	handlers/views_handler_filter.inc
    	handlers/views_handler_filter_boolean_operator.inc
    	handlers/views_handler_filter_boolean_operator_string.inc
    	handlers/views_handler_filter_date.inc
    	handlers/views_handler_filter_equality.inc
    	handlers/views_handler_filter_group_by_numeric.inc
    	handlers/views_handler_filter_in_operator.inc
    	handlers/views_handler_filter_many_to_one.inc
    	handlers/views_handler_filter_numeric.inc
    	handlers/views_handler_filter_string.inc
    	handlers/views_handler_relationship.inc
    	handlers/views_handler_sort.inc
    	handlers/views_handler_sort_date.inc
    	handlers/views_handler_sort_group_by_numeric.inc
    	handlers/views_handler_sort_menu_hierarchy.inc
    	handlers/views_handler_sort_random.inc
    	help/about.html
    	help/analyze-theme.html
    	help/api-default-views.html
    	help/api-example.html
    	help/api-handlers.html
    	help/api-plugins.html
    	help/api-tables.html
    	help/api-upgrading.html
    	help/api.html
    	help/argument.html
    	help/display-attachment.html
    	help/display-block.html
    	help/display-default.html
    	help/display-feed.html
    	help/display-page.html
    	help/display.html
    	help/embed.html
    	help/example-author-block.html
    	help/example-recent-stories.html
    	help/example-user-feed.html
    	help/example-users-by-role.html
    	help/field.html
    	help/filter.html
    	help/getting-started.html
    	help/menu.html
    	help/new.html
    	help/overrides.html
    	help/path.html
    	help/relationship.html
    	help/sort.html
    	help/style-comment-rss.html
    	help/style-fields.html
    	help/style-grid.html
    	help/style-list.html
    	help/style-node-rss.html
    	help/style-node.html
    	help/style-row.html
    	help/style-rss.html
    	help/style-summary-unformatted.html
    	help/style-summary.html
    	help/style-table.html
    	help/style-unformatted.html
    	help/style.html
    	help/theme-css.html
    	help/updating.html
    	help/upgrading.html
    	help/using-theme.html
    	help/view-type.html
    	help/views.help.ini
    	images/sprites.png
    	includes/admin.inc
    	includes/ajax.inc
    	includes/analyze.inc
    	includes/base.inc
    	includes/cache.inc
    	includes/convert.inc
    	includes/form.inc
    	includes/handlers.inc
    	includes/plugins.inc
    	includes/tabs.inc
    	includes/view.inc
    	js/ajax.js
    	js/ajax_view.js
    	js/base.js
    	js/tabs.js
    	modules/aggregator.views.inc
    	modules/aggregator/views_handler_argument_aggregator_category_cid.inc
    	modules/aggregator/views_handler_argument_aggregator_fid.inc
    	modules/aggregator/views_handler_argument_aggregator_iid.inc
    	modules/aggregator/views_handler_field_aggregator_category.inc
    	modules/aggregator/views_handler_field_aggregator_title_link.inc
    	modules/aggregator/views_handler_field_aggregator_xss.inc
    	modules/aggregator/views_handler_filter_aggregator_category_cid.inc
    	modules/aggregator/views_plugin_row_aggregator_rss.inc
    	modules/book.views.inc
    	modules/book.views_convert.inc
    	modules/comment.views.inc
    	modules/comment.views_convert.inc
    	modules/comment.views_default.inc
    	modules/comment/views_handler_argument_comment_user_uid.inc
    	modules/comment/views_handler_field_comment.inc
    	modules/comment/views_handler_field_comment_depth.inc
    	modules/comment/views_handler_field_comment_link.inc
    	modules/comment/views_handler_field_comment_link_delete.inc
    	modules/comment/views_handler_field_comment_link_edit.inc
    	modules/comment/views_handler_field_comment_link_reply.inc
    	modules/comment/views_handler_field_comment_node_link.inc
    	modules/comment/views_handler_field_comment_username.inc
    	modules/comment/views_handler_field_last_comment_timestamp.inc
    	modules/comment/views_handler_field_ncs_last_comment_name.inc
    	modules/comment/views_handler_field_ncs_last_updated.inc
    	modules/comment/views_handler_field_node_comment.inc
    	modules/comment/views_handler_field_node_new_comments.inc
    	modules/comment/views_handler_filter_comment_user_uid.inc
    	modules/comment/views_handler_filter_ncs_last_updated.inc
    	modules/comment/views_handler_filter_node_comment.inc
    	modules/comment/views_handler_sort_comment_thread.inc
    	modules/comment/views_handler_sort_ncs_last_comment_name.inc
    	modules/comment/views_handler_sort_ncs_last_updated.inc
    	modules/comment/views_plugin_row_comment_rss.inc
    	modules/comment/views_plugin_row_comment_view.inc
    	modules/contact.views.inc
    	modules/contact/views_handler_field_contact_link.inc
    	modules/field.views.inc
    	modules/field/views_handler_field_field.inc
    	modules/field/views_handler_filter_field_list.inc
    	modules/filter.views.inc
    	modules/filter/views_handler_field_filter_format_name.inc
    	modules/locale.views.inc
    	modules/locale/views_handler_argument_locale_group.inc
    	modules/locale/views_handler_argument_locale_language.inc
    	modules/locale/views_handler_field_locale_group.inc
    	modules/locale/views_handler_field_locale_language.inc
    	modules/locale/views_handler_field_locale_link_edit.inc
    	modules/locale/views_handler_filter_locale_group.inc
    	modules/locale/views_handler_filter_locale_language.inc
    	modules/locale/views_handler_filter_locale_version.inc
    	modules/node.views.inc
    	modules/node.views_convert.inc
    	modules/node.views_default.inc
    	modules/node/views_handler_argument_dates_various.inc
    	modules/node/views_handler_argument_node_language.inc
    	modules/node/views_handler_argument_node_nid.inc
    	modules/node/views_handler_argument_node_type.inc
    	modules/node/views_handler_argument_node_vid.inc
    	modules/node/views_handler_field_history_user_timestamp.inc
    	modules/node/views_handler_field_node.inc
    	modules/node/views_handler_field_node_link.inc
    	modules/node/views_handler_field_node_link_delete.inc
    	modules/node/views_handler_field_node_link_edit.inc
    	modules/node/views_handler_field_node_path.inc
    	modules/node/views_handler_field_node_revision.inc
    	modules/node/views_handler_field_node_revision_link_delete.inc
    	modules/node/views_handler_field_node_revision_link_revert.inc
    	modules/node/views_handler_field_node_type.inc
    	modules/node/views_handler_filter_history_user_timestamp.inc
    	modules/node/views_handler_filter_node_access.inc
    	modules/node/views_handler_filter_node_status.inc
    	modules/node/views_handler_filter_node_type.inc
    	modules/node/views_plugin_argument_default_node.inc
    	modules/node/views_plugin_argument_validate_node.inc
    	modules/node/views_plugin_row_node_rss.inc
    	modules/node/views_plugin_row_node_view.inc
    	modules/poll.views.inc
    	modules/profile.views.inc
    	modules/profile.views_convert.inc
    	modules/profile/views_handler_field_profile_date.inc
    	modules/profile/views_handler_field_profile_list.inc
    	modules/profile/views_handler_filter_profile_selection.inc
    	modules/search.views.inc
    	modules/search.views_convert.inc
    	modules/search.views_default.inc
    	modules/search/views_handler_argument_search.inc
    	modules/search/views_handler_field_search_score.inc
    	modules/search/views_handler_filter_search.inc
    	modules/search/views_handler_sort_search_score.inc
    	modules/search/views_plugin_row_search_view.inc
    	modules/statistics.views.inc
    	modules/statistics.views_convert.inc
    	modules/statistics.views_default.inc
    	modules/statistics/views_handler_field_accesslog_path.inc
    	modules/system.views.inc
    	modules/system/views_handler_argument_file_fid.inc
    	modules/system/views_handler_field_file.inc
    	modules/system/views_handler_field_file_extension.inc
    	modules/system/views_handler_field_file_filemime.inc
    	modules/system/views_handler_field_file_status.inc
    	modules/system/views_handler_field_file_uri.inc
    	modules/system/views_handler_filter_file_status.inc
    	modules/system/views_handler_filter_system_type.inc
    	modules/taxonomy.views.inc
    	modules/taxonomy.views_convert.inc
    	modules/taxonomy.views_default.inc
    	modules/taxonomy/views_handler_argument_taxonomy.inc
    	modules/taxonomy/views_handler_argument_term_node_tid.inc
    	modules/taxonomy/views_handler_argument_term_node_tid_depth.inc
    	modules/taxonomy/views_handler_argument_term_node_tid_depth_modifier.inc
    	modules/taxonomy/views_handler_argument_vocabulary_vid.inc
    	modules/taxonomy/views_handler_field_taxonomy.inc
    	modules/taxonomy/views_handler_field_term_link_edit.inc
    	modules/taxonomy/views_handler_field_term_node_tid.inc
    	modules/taxonomy/views_handler_filter_term_node_tid.inc
    	modules/taxonomy/views_handler_filter_term_node_tid_depth.inc
    	modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
    	modules/taxonomy/views_handler_filter_vocabulary_vid.inc
    	modules/taxonomy/views_handler_relationship_node_term_data.inc
    	modules/taxonomy/views_plugin_argument_default_taxonomy_tid.inc
    	modules/taxonomy/views_plugin_argument_validate_taxonomy_term.inc
    	modules/translation.views.inc
    	modules/translation/views_handler_argument_node_tnid.inc
    	modules/translation/views_handler_field_node_language.inc
    	modules/translation/views_handler_field_node_link_translate.inc
    	modules/translation/views_handler_field_node_translation_link.inc
    	modules/translation/views_handler_filter_node_language.inc
    	modules/translation/views_handler_filter_node_tnid.inc
    	modules/translation/views_handler_filter_node_tnid_child.inc
    	modules/translation/views_handler_relationship_translation.inc
    	modules/upload.views.inc
    	modules/upload.views_convert.inc
    	modules/upload/views_handler_field_upload_description.inc
    	modules/upload/views_handler_field_upload_fid.inc
    	modules/upload/views_handler_filter_upload_fid.inc
    	modules/user.views.inc
    	modules/user.views_convert.inc
    	modules/user/views_handler_argument_user_uid.inc
    	modules/user/views_handler_argument_users_roles_rid.inc
    	modules/user/views_handler_field_user.inc
    	modules/user/views_handler_field_user_language.inc
    	modules/user/views_handler_field_user_link.inc
    	modules/user/views_handler_field_user_link_cancel.inc
    	modules/user/views_handler_field_user_link_delete.inc
    	modules/user/views_handler_field_user_link_edit.inc
    	modules/user/views_handler_field_user_mail.inc
    	modules/user/views_handler_field_user_name.inc
    	modules/user/views_handler_field_user_picture.inc
    	modules/user/views_handler_field_user_roles.inc
    	modules/user/views_handler_filter_user_current.inc
    	modules/user/views_handler_filter_user_name.inc
    	modules/user/views_handler_filter_user_roles.inc
    	modules/user/views_plugin_argument_default_current_user.inc
    	modules/user/views_plugin_argument_default_user.inc
    	modules/user/views_plugin_argument_validate_user.inc
    	modules/views.views.inc
    	plugins/views_plugin_access.inc
    	plugins/views_plugin_access_none.inc
    	plugins/views_plugin_access_perm.inc
    	plugins/views_plugin_access_role.inc
    	plugins/views_plugin_argument_default.inc
    	plugins/views_plugin_argument_default_fixed.inc
    	plugins/views_plugin_argument_default_php.inc
    	plugins/views_plugin_argument_validate.inc
    	plugins/views_plugin_argument_validate_numeric.inc
    	plugins/views_plugin_argument_validate_php.inc
    	plugins/views_plugin_cache.inc
    	plugins/views_plugin_cache_none.inc
    	plugins/views_plugin_cache_time.inc
    	plugins/views_plugin_display.inc
    	plugins/views_plugin_display_attachment.inc
    	plugins/views_plugin_display_block.inc
    	plugins/views_plugin_display_default.inc
    	plugins/views_plugin_display_feed.inc
    	plugins/views_plugin_display_page.inc
    	plugins/views_plugin_exposed_form.inc
    	plugins/views_plugin_exposed_form_basic.inc
    	plugins/views_plugin_exposed_form_input_required.inc
    	plugins/views_plugin_localization.inc
    	plugins/views_plugin_localization_core.inc
    	plugins/views_plugin_localization_none.inc
    	plugins/views_plugin_pager.inc
    	plugins/views_plugin_pager_full.inc
    	plugins/views_plugin_pager_mini.inc
    	plugins/views_plugin_pager_none.inc
    	plugins/views_plugin_pager_some.inc
    	plugins/views_plugin_query.inc
    	plugins/views_plugin_query_default.inc
    	plugins/views_plugin_row.inc
    	plugins/views_plugin_row_fields.inc
    	plugins/views_plugin_style.inc
    	plugins/views_plugin_style_default.inc
    	plugins/views_plugin_style_grid.inc
    	plugins/views_plugin_style_jump_menu.inc
    	plugins/views_plugin_style_list.inc
    	plugins/views_plugin_style_rss.inc
    	plugins/views_plugin_style_summary.inc
    	plugins/views_plugin_style_summary_jump_menu.inc
    	plugins/views_plugin_style_summary_unformatted.inc
    	plugins/views_plugin_style_table.inc
    	tests/handlers/views_handler_area_text.test
    	tests/handlers/views_handler_argument_null.test
    	tests/handlers/views_handler_field_boolean.test
    	tests/handlers/views_handler_field_counter.test
    	tests/handlers/views_handler_field_custom.test
    	tests/handlers/views_handler_field_date.test
    	tests/handlers/views_handler_field_file_size.test
    	tests/handlers/views_handler_field_math.test
    	tests/handlers/views_handler_field_url.test
    	tests/handlers/views_handler_field_xss.test
    	tests/handlers/views_handler_filter_date.test
    	tests/handlers/views_handler_filter_equality.test
    	tests/handlers/views_handler_filter_in_operator.test
    	tests/handlers/views_handler_filter_numeric.test
    	tests/handlers/views_handler_filter_string.test
    	tests/handlers/views_handler_sort.test
    	tests/handlers/views_handler_sort_date.test
    	tests/handlers/views_handler_sort_random.test
    	tests/templates/views-view--frontpage.tpl.php
    	tests/test_plugins/views_test_plugin_access_test_dynamic.inc
    	tests/test_plugins/views_test_plugin_access_test_static.inc
    	tests/user/views_user_argument_default.test
    	tests/user/views_user_argument_validate.test
    	tests/views_access.test
    	tests/views_analyze.test
    	tests/views_argument_default.test
    	tests/views_argument_validator.test
    	tests/views_basic.test
    	tests/views_cache.test
    	tests/views_exposed_form.test
    	tests/views_glossary.test
    	tests/views_groupby.test
    	tests/views_handlers.test
    	tests/views_module.test
    	tests/views_pager.test
    	tests/views_plugin_localization_test.inc
    	tests/views_query.test
    	tests/views_test.info
    	tests/views_test.install
    	tests/views_test.module
    	tests/views_test.views_default.inc
    	tests/views_translatable.test
    	tests/views_view.test
    	theme/theme.inc
    	theme/views-exposed-form.tpl.php
    	theme/views-more.tpl.php
    	theme/views-ui-edit-item.tpl.php
    	theme/views-ui-edit-tab.tpl.php
    	theme/views-ui-edit-view.tpl.php
    	theme/views-ui-list-views.tpl.php
    	theme/views-view-field.tpl.php
    	theme/views-view-fields.tpl.php
    	theme/views-view-grid.tpl.php
    	theme/views-view-list.tpl.php
    	theme/views-view-row-comment.tpl.php
    	theme/views-view-row-node.tpl.php
    	theme/views-view-row-rss.tpl.php
    	theme/views-view-rss.tpl.php
    	theme/views-view-summary-unformatted.tpl.php
    	theme/views-view-summary.tpl.php
    	theme/views-view-table.tpl.php
    	theme/views-view-unformatted.tpl.php
    	theme/views-view.tpl.php
    	views.drush.inc
    	views.info
    	views.install
    	views.module
    	views_export/views_export.css
    	views_export/views_export.info
    	views_export/views_export.module
    	views_ui.info
    	views_ui.module
    98b13e41