Changeset 5728


Ignorieren:
Zeitstempel:
07.09.2010 08:27:03 (vor 7 Jahren)
Autor:
oliver
Nachricht:
  • Bump 7240/7270 v2/v3 Labor Preview to 18237
Ort:
trunk
Dateien:
6 bearbeitet

Legende:

Unverändert
Hinzugefügt
Entfernt
  • trunk/Config.in

    r5717 r5728  
    19261926    default "FRITZ.Box_Fon_WLAN_7240.73.04.80.image"            if  FREETZ_TYPE_FON_WLAN_7240 && \ 
    19271927                                            ! FREETZ_TYPE_LABOR 
    1928     default "Labor_FRITZ.Box_Fon_WLAN_7240.73.04.85-18202.image"        if  FREETZ_TYPE_FON_WLAN_7240 && \ 
     1928    default "Labor_FRITZ.Box_Fon_WLAN_7240.73.04.85-18237.image"        if  FREETZ_TYPE_FON_WLAN_7240 && \ 
    19291929                                            FREETZ_TYPE_PREVIEW 
    19301930    default "FRITZ.Box_Fon_WLAN_7270.54.04.80.image"            if  FREETZ_TYPE_FON_WLAN_7270 && \ 
     
    19411941    default "FRITZ.Box_Fon_WLAN_7270_16_LabNAS.AnnexB.54.04.80-16561.image" if  FREETZ_TYPE_FON_WLAN_7270_16MB && \ 
    19421942                                            FREETZ_TYPE_LABOR_NAS 
    1943     default "Labor_FRITZ.Box_Fon_WLAN_7270_v2.54.04.85-18202.image"     if  FREETZ_TYPE_FON_WLAN_7270 && \ 
     1943    default "Labor_FRITZ.Box_Fon_WLAN_7270_v2.54.04.85-18237.image"     if  FREETZ_TYPE_FON_WLAN_7270 && \ 
    19441944                                            FREETZ_TYPE_PREVIEW 
    19451945    default "FRITZ.Box_Fon_WLAN_7270_v3.74.04.80.image"         if  FREETZ_TYPE_FON_WLAN_7270_V3 && \ 
     
    19541954    default "FRITZ.Box_Fon_WLAN_7270_v3_LabNAS.AnnexB.74.04.80-16561.image" if  FREETZ_TYPE_FON_WLAN_7270_V3 && \ 
    19551955                                            FREETZ_TYPE_LABOR_NAS 
    1956     default "Labor_FRITZ.Box_Fon_WLAN_7270_v3.74.04.85-18202.image"     if  FREETZ_TYPE_FON_WLAN_7270_V3 && \ 
     1956    default "Labor_FRITZ.Box_Fon_WLAN_7270_v3.74.04.85-18237.image"     if  FREETZ_TYPE_FON_WLAN_7270_V3 && \ 
    19571957                                            FREETZ_TYPE_PREVIEW 
    19581958    default "FRITZ.Box_Fon_WLAN_7570_vDSL.en-de-fr.75.04.82.image"      if  FREETZ_TYPE_FON_WLAN_7570 
  • trunk/FIRMWARES

    r5705 r5728  
    3333    * Labor Preview: 29.04.80-16352 
    3434* Fritz!Box Fon WLAN 7240: 73.04.80 
    35     * Preview: 73.04.85-18202 
     35    * Preview: 73.04.85-18237 
    3636    * Alien 7270 
    3737* Fritz!Box Fon WLAN 7270: 54.04.80 7270 v3: 74.04.80 
     
    4242    * Labor IPv6: 54.04.80-17603|74.04.80-17603 
    4343    * Labor NAS: 54.04.80-16561|74.04.80-16561 
    44     * Preview: 54.04.85-18202|74.04.85-18202 
     44    * Preview: 54.04.85-18237|74.04.85-18237 
    4545* Fritz!Box Fon WLAN 7570 (Multi-Language, Annex A/B): 75.04.82 
    4646    * Alien Speedport W920V 
  • trunk/patches/7240_preview/de/190-webmenu.patch

    r5705 r5728  
    1 --- usr/www/all/templates/menu_page_end.html.orig   2010-09-02 15:11:54.000000000 +0200 
    2 +++ usr/www/all/templates/menu_page_end.html    2010-09-03 09:44:48.000000000 +0200 
     1--- usr/www/all/templates/menu_page_end.html.orig   2010-09-02 15:19:59.000000000 +0200 
     2+++ usr/www/all/templates/menu_page_end.html    2010-09-03 09:39:07.000000000 +0200 
    33@@ -11,7 +11,8 @@ 
    44 box.out("<a href='http://www.avm.de/en/fritzclips' target='_blank'>{?22:958?}</a> | ") 
    55 end 
    6  box.out("<a href='"..os.getenv("CONFIG_ACCESSORY_URL").."' target='_blank'>{?22:2?}</a> | ") 
     6 box.out("<a href='"..href.get("/menus/programs.lua").."' >{?22:2?}</a> | ") 
    77-box.out("<a href='http://www.avm.de' target='_blank' style='margin-right:0px;'>www.avm.de</a> ") 
    8 +box.out("<a href='http://www.avm.de' target='_blank' >www.avm.de</a> | ") 
    9 +box.out("<a href='http://www.freetz.org' target='_blank' style='margin-right:0px;'>www.freetz.org</a>") 
     8+box.out("<a href='http://www.avm.de' target='_blank'>www.avm.de</a> | ") 
     9+box.out("<a href='http://www.freetz.org' target='_blank' style='margin-right:0px;'>www.freetz.org</a> ") 
    1010 end 
    1111 ?> 
    1212 </div> 
    13 --- usr/www/all/templates/menu_page_head.html.orig  2010-09-02 15:11:53.000000000 +0200 
    14 +++ usr/www/all/templates/menu_page_head.html   2010-09-03 09:44:48.000000000 +0200 
     13--- usr/www/all/templates/menu_page_head.html.orig  2010-09-02 15:20:01.000000000 +0200 
     14+++ usr/www/all/templates/menu_page_head.html   2010-09-03 09:39:07.000000000 +0200 
    1515@@ -97,4 +97,23 @@ 
    1616 box.out("</div>") 
     
    3838 </div> 
    3939--- usr/www/all/menus/menu_freetz.lua.orig  1970-01-01 01:00:00.000000000 +0100 
    40 +++ usr/www/all/menus/menu_freetz.lua   2010-09-03 09:44:48.000000000 +0200 
     40+++ usr/www/all/menus/menu_freetz.lua   2010-09-03 09:39:07.000000000 +0200 
    4141@@ -0,0 +1,16 @@ 
    4242+menu.add_item{ 
  • trunk/patches/7270_preview/de/190-webmenu.patch

    r5705 r5728  
    44 box.out("<a href='http://www.avm.de/en/fritzclips' target='_blank'>{?22:958?}</a> | ") 
    55 end 
    6  box.out("<a href='"..os.getenv("CONFIG_ACCESSORY_URL").."' target='_blank'>{?22:2?}</a> | ") 
     6 box.out("<a href='"..href.get("/menus/programs.lua").."' >{?22:2?}</a> | ") 
    77-box.out("<a href='http://www.avm.de' target='_blank' style='margin-right:0px;'>www.avm.de</a> ") 
    8 +box.out("<a href='http://www.avm.de' target='_blank' >www.avm.de</a> | ") 
    9 +box.out("<a href='http://www.freetz.org' target='_blank' style='margin-right:0px;'>www.freetz.org</a>") 
     8+box.out("<a href='http://www.avm.de' target='_blank'>www.avm.de</a> | ") 
     9+box.out("<a href='http://www.freetz.org' target='_blank' style='margin-right:0px;'>www.freetz.org</a> ") 
    1010 end 
    1111 ?> 
  • trunk/patches/7270_v3_preview/de/190-webmenu.patch

    r5705 r5728  
    1 --- usr/www/all/templates/menu_page_end.html.orig   2010-09-02 15:26:28.000000000 +0200 
    2 +++ usr/www/all/templates/menu_page_end.html    2010-09-03 09:44:15.000000000 +0200 
     1--- usr/www/all/templates/menu_page_end.html.orig   2010-09-02 15:19:59.000000000 +0200 
     2+++ usr/www/all/templates/menu_page_end.html    2010-09-03 09:39:07.000000000 +0200 
    33@@ -11,7 +11,8 @@ 
    44 box.out("<a href='http://www.avm.de/en/fritzclips' target='_blank'>{?22:958?}</a> | ") 
    55 end 
    6  box.out("<a href='"..os.getenv("CONFIG_ACCESSORY_URL").."' target='_blank'>{?22:2?}</a> | ") 
     6 box.out("<a href='"..href.get("/menus/programs.lua").."' >{?22:2?}</a> | ") 
    77-box.out("<a href='http://www.avm.de' target='_blank' style='margin-right:0px;'>www.avm.de</a> ") 
    8 +box.out("<a href='http://www.avm.de' target='_blank' >www.avm.de</a> | ") 
    9 +box.out("<a href='http://www.freetz.org' target='_blank' style='margin-right:0px;'>www.freetz.org</a>") 
     8+box.out("<a href='http://www.avm.de' target='_blank'>www.avm.de</a> | ") 
     9+box.out("<a href='http://www.freetz.org' target='_blank' style='margin-right:0px;'>www.freetz.org</a> ") 
    1010 end 
    1111 ?> 
    1212 </div> 
    13 --- usr/www/all/templates/menu_page_head.html.orig  2010-09-02 15:25:43.000000000 +0200 
    14 +++ usr/www/all/templates/menu_page_head.html   2010-09-03 09:44:15.000000000 +0200 
     13--- usr/www/all/templates/menu_page_head.html.orig  2010-09-02 15:20:01.000000000 +0200 
     14+++ usr/www/all/templates/menu_page_head.html   2010-09-03 09:39:07.000000000 +0200 
    1515@@ -97,4 +97,23 @@ 
    1616 box.out("</div>") 
     
    3838 </div> 
    3939--- usr/www/all/menus/menu_freetz.lua.orig  1970-01-01 01:00:00.000000000 +0100 
    40 +++ usr/www/all/menus/menu_freetz.lua   2010-09-03 09:44:15.000000000 +0200 
     40+++ usr/www/all/menus/menu_freetz.lua   2010-09-03 09:39:07.000000000 +0200 
    4141@@ -0,0 +1,16 @@ 
    4242+menu.add_item{ 
  • trunk/patches/cond/480-alarmclock_7270_preview.patch

    r5705 r5728  
    1 --- usr/www/all/html/de/home/home.html.orig 2010-09-02 15:12:02.000000000 +0200 
    2 +++ usr/www/all/html/de/home/home.html  2010-09-03 09:44:52.000000000 +0200 
    3 @@ -180,6 +180,11 @@ 
     1--- usr/www/all/html/de/home/home.html.orig 2010-09-07 10:16:36.732880528 +0200 
     2+++ usr/www/all/html/de/home/home.html  2010-09-07 10:16:37.599070329 +0200 
     3@@ -179,6 +179,11 @@ 
    44 <td class="tdLed">&nbsp;</td> 
    55 <td><script type="text/javascript">document.write(WeckerDisplay(2));</script></td> 
     
    1313 </div></div></div></div></div></div> 
    1414 <? include ../html/de/home/rbb_refresh.html ?> 
    15 --- usr/www/all/html/de/home/home.js.orig   2010-09-03 09:44:48.000000000 +0200 
    16 +++ usr/www/all/html/de/home/home.js    2010-09-03 09:44:52.000000000 +0200 
     15--- usr/www/all/html/de/home/home.js.orig   2010-09-07 10:16:32.699718712 +0200 
     16+++ usr/www/all/html/de/home/home.js    2010-09-07 10:16:37.600950398 +0200 
    1717@@ -224,6 +224,7 @@ 
    1818 var NachtEnabled = "<? query box:settings/night_time_control_enabled ?>"; 
     
    4040 jslDisplay("trIntFax", g_intFaxActive == "1"); 
    4141 jslDisplay("trSperre",RufsperreAktiv == true); 
    42 @@ -1416,8 +1418,10 @@ 
     42@@ -1424,8 +1426,10 @@ 
    4343 } 
    4444 return DisplayString; 
     
    5151 var Active = "<? query telcfg:settings/AlarmClock<? echo $var:wnr ?>/Active ?>"; 
    5252 var Time = "<? query telcfg:settings/AlarmClock<? echo $var:wnr ?>/Time ?>"; 
    53 @@ -1427,13 +1431,29 @@ 
     53@@ -1435,13 +1439,29 @@ 
    5454 { 
    5555 return WeckerString(Active,Time,Num,Weekdays); 
     
    8181 function PortfwDisplay(){ 
    8282 var infotext=""; 
    83 @@ -1652,6 +1672,8 @@ 
     83@@ -1660,6 +1680,8 @@ 
    8484 jslSetValue("uiPostWeckernr",0);break; 
    8585 case 1: 
     
    9090 jslGoTo('fon','wecker'); 
    9191 } 
    92 --- usr/www/all/html/de/fon/wecker.html.orig    2010-09-02 15:12:05.000000000 +0200 
    93 +++ usr/www/all/html/de/fon/wecker.html 2010-09-03 09:44:52.000000000 +0200 
     92--- usr/www/all/html/de/fon/wecker.html.orig    2010-09-06 15:09:12.000000000 +0200 
     93+++ usr/www/all/html/de/fon/wecker.html 2010-09-07 10:16:37.602920852 +0200 
    9494@@ -3,14 +3,25 @@ 
    9595 {?txtWakeupCall?} 
     
    118118 <p class="mb10">{?388:3268?}</p> 
    119119 <p class="mb10">{?388:2396?}</p> 
    120 --- usr/www/all/html/de/fon/wecker.js.orig  2010-09-02 15:11:56.000000000 +0200 
    121 +++ usr/www/all/html/de/fon/wecker.js   2010-09-03 09:44:52.000000000 +0200 
     120--- usr/www/all/html/de/fon/wecker.js.orig  2010-09-06 15:09:16.000000000 +0200 
     121+++ usr/www/all/html/de/fon/wecker.js   2010-09-07 10:16:37.603727574 +0200 
    122122@@ -24,8 +24,9 @@ 
    123123 var mCount = "<? query telcfg:settings/Foncontrol ?>"; 
Hinweis: Hilfe zur Verwendung der Changeset-Ansicht finden Sie unter TracChangeset.