Changeset 2ba4992 for installer


Ignore:
Timestamp:
Dec 5, 2014 3:14:40 PM (7 years ago)
Author:
zzz <zzz@…>
Branches:
master
Children:
9953bc3
Parents:
7ab6708 (diff), 5e67008 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

propagate from branch 'i2p.i2p.zzz.test2' (head 0feb2e6806927f68c7333aaa0892de185bb2629c)

to branch 'i2p.i2p' (head 0482fa843cb1e9d7ec281440056eef3a0ab07bdb)

Location:
installer/resources
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • installer/resources/blocklist.txt

    r7ab6708 r2ba4992  
    33# files in ~/.i2p (Linux) or %APPDATA%\I2P (Windows), be sure to
    44# edit the file in the configuration directory, NOT the install directory.
     5# When running as a Linux daemon, the configuration directory is /var/lib/i2p
     6# and the install directory is /usr/share/i2p .
    57#
    68# Blocking is now enabled by default.
  • installer/resources/clients.config

    r7ab6708 r2ba4992  
    44# files in ~/.i2p (Linux) or %APPDATA%\I2P (Windows), be sure to
    55# edit the file in the configuration directory, NOT the install directory.
     6# When running as a Linux daemon, the configuration directory is /var/lib/i2p
     7# and the install directory is /usr/share/i2p .
    68#
    79
  • installer/resources/eepsite/docroot/index.html

    r7ab6708 r2ba4992  
    55# files in ~/.i2p (Linux) or %APPDATA%\I2P (Windows), be sure to
    66# edit the file in the configuration directory, NOT the install directory.
     7# When running as a Linux daemon, the configuration directory is /var/lib/i2p
     8# and the install directory is /usr/share/i2p .
    79#
    810-->
  • installer/resources/eepsite/jetty.xml

    r7ab6708 r2ba4992  
    3333<!-- files in ~/.i2p (Linux) or %APPDATA%\I2P (Windows), be sure to            -->
    3434<!-- edit the file in the configuration directory, NOT the install directory.  -->
     35<!-- When running as a Linux daemon, the configuration directory is            -->
     36<!-- /var/lib/i2p and the install directory is /usr/share/i2p .                -->
    3537<!--                                                                           -->
    3638<!-- ========================================================================= -->
  • installer/resources/i2ptunnel.config

    r7ab6708 r2ba4992  
    44# files in ~/.i2p (Linux) or %APPDATA%\I2P (Windows), be sure to
    55# edit the file in the configuration directory, NOT the install directory.
     6# When running as a Linux daemon, the configuration directory is /var/lib/i2p
     7# and the install directory is /usr/share/i2p .
    68#
    79
  • installer/resources/themes/susimail/dark/susimail.css

    r7ab6708 r2ba4992  
    250250input.configure {
    251251     background: #000 url('/susimail/icons/wrench.png') no-repeat 2px center;
     252     min-height: 22px;
     253}
     254
     255input.saveas {
     256     background: #000 url('/susimail/icons/drive_edit.png') no-repeat 2px center;
    252257     min-height: 22px;
    253258}
  • installer/resources/themes/susimail/light/susimail.css

    r7ab6708 r2ba4992  
    275275}
    276276
     277input.saveas {
     278     background: #ddf url('/susimail/icons/drive_edit.png') no-repeat 4px center;
     279     padding: 2px 3px 2px 24px;
     280     min-height: 22px;
     281}
     282
    277283input[type=file], input.new_upload {
    278284     background: #ddf url('/themes/console/images/add.png') no-repeat 4px center;
Note: See TracChangeset for help on using the changeset viewer.