Changeset 684


Ignore:
Timestamp:
Sep 12, 2011, 10:56:57 PM (6 years ago)
Author:
root
Message:

web: merge our local configuration changes with trac 0.12's.

Location:
web/trunk/trac
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • web/trunk/trac/conf/trac.ini

    r683 r684  
    1616
    1717[components]
    18 wikirename.web_ui.wikirenamemodule = enabled
    1918tracmenus.* = enabled
    2019tracmenus.web_ui.* = enabled
     20wikirename.web_ui.wikirenamemodule = enabled
    2121
    2222[header_logo]
     
    3333
    3434[mainnav]
    35 browser = disabled
     35browser.parent = menu20_devel
    3636menu10_home = enabled
    3737menu10_home.href = http://abuse.zoy.org/
     
    3939menu10_home.order = 10
    4040menu10_home.parent = top
    41 menu20_download = enabled
    42 menu20_download.href = http://abuse.zoy.org/wiki/download
    43 menu20_download.label = Download
    44 menu20_download.order = 20
    45 menu20_download.parent = top
    46 menu30_screenshots = enabled
    47 menu30_screenshots.href = http://abuse.zoy.org/wiki/screenshots
    48 menu30_screenshots.label = Screenshots
    49 menu30_screenshots.order = 30
    50 menu30_screenshots.parent = top
    51 menu40_devel = enabled
    52 menu40_devel.href = http://abuse.zoy.org/wiki/dev
    53 menu40_devel.label = Development
    54 menu40_devel.order = 40
    55 menu40_devel.parent = top
    56 newticket.label = New Bug
    57 roadmap = disabled
     41menu20_10_notes = enabled
     42menu20_10_notes.href = http://abuse.zoy.org/wiki/dev
     43menu20_10_notes.label = Notes
     44menu20_10_notes.order = 10
     45menu20_10_notes.parent = menu20_devel
     46menu20_devel = enabled
     47menu20_devel.href = http://abuse.zoy.org/wiki/dev
     48menu20_devel.label = Development

     49menu20_devel.order = 20
     50menu20_devel.parent = top
     51menu30_download = enabled
     52menu30_download.href = http://abuse.zoy.org/wiki/download
     53menu30_download.label = Download
     54menu30_download.order = 30
     55menu30_download.parent = top
     56menu40_screenshots = enabled
     57menu40_screenshots.href = http://abuse.zoy.org/wiki/screenshots
     58menu40_screenshots.label = Screenshots
     59menu40_screenshots.order = 40
     60menu40_screenshots.parent = top
     61menu50_bugs = enabled
     62menu50_bugs.href = http://abuse.zoy.org/report
     63menu50_bugs.label = Bug Reports

     64menu50_bugs.order = 50
     65menu50_bugs.parent = top
     66newticket.label = Report New
     67newticket.parent = menu50_bugs
     68roadmap.order = 20
     69roadmap.parent = menu20_devel
    5870search = disabled
    59 tickets.label = Bug Reports
    6071tickets.href = http://abuse.zoy.org/report/1
    61 timeline = disabled
     72tickets.label = Browse
     73tickets.parent = menu50_bugs
     74timeline.parent = menu20_devel
    6275wiki = disabled
    6376
  • web/trunk/trac/conf/trac.ini.sample

    r153 r684  
    11# -*- coding: utf-8 -*-
     2
     3[account-manager]
     4account_changes_notify_addresses =
     5# authentication_url = <inherited>
     6force_passwd_change = True
     7generated_password_length = 8
     8hash_method = HtDigestHashMethod
     9htdigest_realm =
     10notify_actions = []
     11# password_file = <inherited>
     12# password_format = <inherited>
     13# password_store = <inherited>
     14persistent_sessions = False
     15reset_password = True
    216
    317[attachment]
    418max_size = 262144
    519render_unsafe_content = false
     20
     21[authz_policy]
     22# authz_file = <inherited>
     23
     24[bitten]
     25adjust_timestamps = False
     26build_all = False
     27chart_style = height: 220px; width: 220px;
     28logs_dir = log/bitten
     29quick_status = False
     30slave_timeout = 3600
     31stabilize_wait = 0
    632
    733[browser]
     
    2248wiki_format_messages = true
    2349
     50[git]
     51cached_repository = false
     52git_bin = /usr/bin/git
     53persistent_cache = false
     54shortrev_len = 7
     55
    2456[header_logo]
    2557alt = (please configure the [header_logo] section in trac.ini)
     
    3971log_type = none
    4072
     73[menu-custom]
     74managed_menus = mainnav,metanav
     75serve_ui_files = True
     76
    4177[milestone]
    4278stats_provider = DefaultTicketGroupStatsProvider
     
    4884mime_map = text/x-dylan:dylan,text/x-idl:ice,text/x-ada:ads:adb
    4985php_path = php
     86pygments_default_style = trac
     87pygments_modes =
    5088silvercity_modes =
    5189tab_width = 8
     90treat_as_binary = application/octet-stream,application/pdf,application/postscript,application/msword,application/rtf,
    5291
    5392[notification]
     
    5695always_notify_reporter = false
    5796always_notify_updater = true
     97ambiguous_char_width = single
     98email_sender = SmtpEmailSender
    5899ignore_domains =
    59 mime_encoding = base64
     100mime_encoding = none
     101notify_on_failed_build = true
     102notify_on_successful_build = false
     103sendmail_path = sendmail
    60104smtp_always_bcc =
    61105smtp_always_cc =
     
    77121[project]
    78122admin =
     123admin_trac_url = .
    79124descr = My example project
    80125footer = Visit the Trac open source project at<br /><a href="http://trac.edgewall.org/">http://trac.edgewall.org/</a>
     
    87132default_query = status!=closed&owner=$USER
    88133items_per_page = 100
     134ticketlink_query = ?status=!closed
    89135
    90136[report]
     
    99145
    100146[search]
     147# default_disabled_filters = <inherited>
    101148min_query_length = 3
     149
     150[spam-filter]
     151akismet_api_key =
     152akismet_api_url = rest.akismet.com/1.1/
     153akismet_karma = 5
     154attachment_sample_size = 16384
     155bayes_karma = 10
     156bayes_min_training = 25
     157extlinks_karma = 2
     158ip_blacklist_karma = 5
     159ip_blacklist_servers = bsb.empty.us, sc.surbl.org
     160ip_throttle_karma = 3
     161logging_enabled = true
     162max_external_links = 4
     163max_posts_by_ip = 10
     164min_karma = 0
     165purge_age = 7
     166regex_karma = 5
     167session_karma = 9
     168trust_authenticated = true
     169
     170[sqlite]
     171# extensions = <inherited>
    102172
    103173[svn]
     
    106176
    107177[ticket]
     178commit_ticket_update_check_perms = true
     179commit_ticket_update_commands.close = close closed closes fix fixed fixes
     180commit_ticket_update_commands.refs = addresses re references refs see
     181commit_ticket_update_envelope =
     182commit_ticket_update_notify = true
     183default_cc =
    108184default_component =
     185default_description =
     186default_keywords =
    109187default_milestone =
     188default_owner =
    110189default_priority = major
    111190default_resolution = fixed
     191default_severity =
     192default_summary =
    112193default_type = defect
    113194default_version =
     195max_comment_size = 262144
    114196max_description_size = 262144
    115197preserve_newlines = default
     
    118200
    119201[timeline]
    120 abbreviated_messages = true
     202abbreviated_messages = True
    121203changeset_collapse_events = false
    122204changeset_long_messages = false
     
    128210
    129211[trac]
     212auth_cookie_lifetime = 0
     213auth_cookie_path =
    130214authz_file =
    131215authz_module_name =
     216auto_preview_timeout = 2.0
    132217auto_reload = False
     218backup_dir = db
    133219base_url =
    134 check_auth_ip = true
     220check_auth_ip = false
    135221database = sqlite:db/trac.db
    136 default_charset = iso-8859-15
     222debug_sql = False
     223default_charset = utf-8
    137224default_handler = WikiModule
     225default_language =
     226default_timezone =
     227genshi_cache_size = 128
    138228htdocs_location =
    139229ignore_auth_case = false
    140230mainnav = wiki,timeline,roadmap,browser,tickets,newticket,search
    141231metanav = login,logout,prefs,help,about
     232mysqldump_path = mysqldump
     233never_obfuscate_mailto = false
    142234permission_policies = DefaultPermissionPolicy, LegacyAttachmentPolicy
    143235permission_store = DefaultPermissionStore
     236pg_dump_path = pg_dump
    144237repository_dir =
     238repository_sync_per_request = (default)
    145239repository_type = svn
    146 request_filters = None
     240# request_filters = <inherited>
     241resizable_textareas = true
     242secure_cookies = False
    147243show_email_addresses = false
     244show_ip_addresses = false
    148245templates_dir = /usr/share/trac/templates
    149246timeout = 20
    150247use_base_url_for_redirect = False
    151248
     249[versioncontrol]
     250allowed_repository_dir_prefixes =
     251
    152252[wiki]
    153253ignore_missing_pages = false
     254max_size = 262144
    154255render_unsafe_content = false
     256safe_schemes = cvs,file,ftp,git,irc,http,https,news,sftp,smb,ssh,svn,svn+ssh
    155257split_page_names = false
    156258
  • web/trunk/trac/htdocs/main.css

    r620 r684  
    769769}
    770770
    771 .sf-menu li {
    772 text-align: right;
    773 }
    774 
Note: See TracChangeset for help on using the changeset viewer.