diff options
29 files changed, 110 insertions, 42 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html index d8acbde8..4d68ac34 100644 --- a/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html +++ b/mayor-orig/mayor-felveteli/www/static/hu_HU/felveteli/felveteli.html @@ -3,8 +3,8 @@ <h2>2021/2022-es tanév</h2> <div style="margin-top: 6px; text-align:center;"> - <a style="font-weight: bold; font-size: 16px; color: #837389;" href="/vmg/felveteli/FT2021.pdf"> - Felvételi Tájékoztató 2021/2022 [PDF] + <a style="font-weight: bold; font-size: 16px; color: #837389;" href="/vmg/felveteli/FT2021b.pdf" title="Fissítve: 2020. november 9."> + Felvételi Tájékoztató 2021/2022 (.pdf) </a> </div> -</div>
\ No newline at end of file +</div> diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev +++ b/mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev +++ b/mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev +++ b/mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev +++ b/mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php index 625b6b13..031ad51e 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php @@ -36,8 +36,9 @@ return ($_TANEV['szemeszter'][1]['statusz'] == 'aktív') // Csak aktív szemeszterbe írhatunk && ( ((__VEZETOSEG || __NAPLOADMIN) && $Feladat && $haladasiOraAdat['eredet']=='órarend') - || $time <= time() - ) // A jövőbeli órák nem írhatók be, kivéve, ha az előírt tanári feladat (pl versenyfelügyelet)! + || $time <= time() // A jövőbeli órák nem írhatók be, kivéve, ha az előírt tanári feladat (pl versenyfelügyelet)! + || $time >= time() // Pandemic Release + ) && ( // Az admin bármikor módosíthat - de csak vezetői utasításra teszi! __NAPLOADMIN diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php index 5e23e4ec..0a931863 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/tanar.php @@ -66,9 +66,11 @@ } elseif ($SET['mkId'] == '') { if (count($where) > 0) $W = 'WHERE ' . implode(' AND ',$where); $q = "SELECT tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz, - hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora + hetiKotelezoOraszam,hetiLekotottMinOraszam,hetiLekotottMaxOraszam,hetiKotottMaxOraszam,hetiMunkaora $extraAttrs - FROM ".__INTEZMENYDBNEV.".tanar $W ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)"; + FROM ".__INTEZMENYDBNEV.".tanar +-- LEFT JOIN ".__INTEZMENYDBNEV.".tanarKepesites USING (tanarId) LEFT JOIN ".__INTEZMENYDBNEV.".kepesitesTargy USING (kepesitesId) + $W ORDER BY CONCAT_WS(' ', ViseltCsaladiNev, viseltUtoNev)"; } else { if (count($where) > 0) $W = 'AND ' . implode(' AND ',$where); $q = "SELECT tanar.tanarId AS tanarId, TRIM(CONCAT_WS(' ',viseltNevElotag, ViseltCsaladiNev, viseltUtoNev)) AS tanarNev, statusz, diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php index 8c0d870c..fb04a3ca 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/intezmeny/valtas-pre.php @@ -5,6 +5,7 @@ require_once('include/modules/naplo/share/intezmenyek.php'); require_once('include/modules/naplo/share/szemeszter.php'); require_once('include/modules/naplo/share/tanar.php'); + require_once('include/modules/naplo/share/targy.php'); require_once('include/modules/naplo/share/osztaly.php'); require_once('include/modules/naplo/share/munkakozosseg.php'); @@ -40,6 +41,7 @@ } } $ADAT['tanarok'] = getTanarok(array('extraAttrs'=>'titulus,statusz,besorolas','telephelyId'=>__TELEPHELYID)); + $ADAT['targyak'] = getTargyak(array('arraymap'=>array('targyId'))); $lr = db_connect('naplo_intezmeny'); for($i=0; $i<count($ADAT['tanarok']); $i++) { $_tanarId = $ADAT['tanarok'][$i]['tanarId']; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml index 756ec408..6811b588 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/intezmeny/valtas.phtml @@ -13,7 +13,7 @@ function putTanarLista($ADAT) { if ($T['titulus']!='') echo '<div class="titulus">'.$T['titulus'].'</div>'; if ($T['statusz']=='külső óraadó') echo '<div class="titulus">'.$T['statusz'].'</div>'; if ($T['besorolas']=='Gyakornok') echo '<div class="titulus">'.kisbetus($T['besorolas']).'</div>'; -// if ($T['besorolas']=='Mesterpedagógus') echo '<div class="titulus">'.kisbetus($T['besorolas']).'</div>'; + if ($T['besorolas']=='Mesterpedagógus') echo '<div class="titulus">'.kisbetus($T['besorolas']).'</div>'; $osztalyai = ($ADAT['tanarOsztaly'][$T['tanarId']]); for ($j=0; $j<count($osztalyai); $j++) { @@ -28,6 +28,19 @@ function putTanarLista($ADAT) { echo $munkakozossegei[$j]['munkakozossegNev']. ' munkaközösség-vezető'; echo '</div>'; } + +/* + $targyai = explode(',',$T['kepesitesTargyIdk']); + if (count($targyai)>0) { + echo '<div class="" style="color:#aaa; font-size:smaller">'; + for ($j=0; $j<count($targyai); $j++) { + $_targyId = $targyai[$j]; + echo ' '.$ADAT['targyak'][$_targyId][0]['targyNev'].' '; + } + echo '</div>'; + } +*/ + echo '</td>'; if (($i+1) % 3 == 0 && $i!=count($ADAT['tanarok'])-1) echo '</tr><tr>'; } diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php index 1c5c8bc9..652c18ae 100644 --- a/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php +++ b/mayor-orig/mayor-portal/www/include/modules/portal/hirek/egyhir.php @@ -41,6 +41,9 @@ } } else $q = ''; if ($q!='') $r = db_query($q,array('modul'=>'portal','result'=>'insert','values'=>$v)); + $q = "DELETE FROM `hirKategoria` WHERE hirId=%u"; + $v = array($hirId); + db_query($q,array('modul'=>'portal','result'=>'delete','values'=>$v)); if (is_array($DATA['kategoriaId'])) { for ($i=0; $i<count($DATA['kategoriaId']); $i++) { $q = "INSERT IGNORE INTO `hirKategoria` (hirId,kategoriaId) VALUES (%u,%u)"; diff --git a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php index 0de316b6..7b59782a 100644 --- a/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php +++ b/mayor-orig/mayor-portal/www/include/modules/portal/share/hirek.php @@ -13,7 +13,7 @@ return $r; } - function getHirek($SET = array('all'=>true,'tolDt'=>'', 'igDt'=>'', 'id' => '', 'flag'=>array(), 'class'=>array(), 'cid'=>array(), 'limit'=>'', 'lang'=>'hu_HU') ) { + function getHirek($SET = array('all'=>true,'tolDt'=>'', 'igDt'=>'', 'id' => '', 'flag'=>array(), 'class'=>array(), 'cid'=>array(), 'limit'=>'', 'lang'=>'hu_HU', 'kategoria'=>array()) ) { $tolDt = $SET['tolDt']; $igDt = $SET['igDt']; if ($tolDt!='') $W[] = "kdt<='$tolDt'"; @@ -21,6 +21,8 @@ if (count($SET['flag'])>0) $W[] = "flag IN (".implode(',',$SET['flag']).")"; if (count($SET['class'])>0) $W[] = "class IN (".implode(',',$SET['class']).")"; if (count($SET['cid'])>0) $W[] = "cid IN (".implode(',',$SET['cid']).")"; + if (is_array($SET['kategoria']) && count($SET['kategoria'])>0 && !is_null($SET['kategoria'][0])) + $W[] = "kategoriaId IN (".implode(',',$SET['kategoria']).")"; if ($SET['lang']!='') $W[] = "lang='".$SET['lang']."'"; if ($SET['limit']!='') $L = ' LIMIT '.$SET['limit']; diff --git a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php index dc4e79d5..d8026e35 100644 --- a/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php +++ b/mayor-orig/mayor-portal/www/policy/private/portal/portal/portal-pre.php @@ -5,7 +5,13 @@ require_once('include/modules/portal/share/kerdoiv.php'); require_once('include/modules/session/groupInfo.php'); - $ADAT['hirek'] = getHirek(array('cid'=>array(0),'tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1,6),'csoport'=>$AUTH['my']['categories'])); + $ADAT['kategoriak'] = getKategoriak(); + for ($i=0; $i<count($ADAT['kategoriak']); $i++) { + $RESTRICTKATEGORIA[] = intval($ADAT['kategoriak'][$i]['id']); + } + $kategoriaId = readVariable($_GET['kategoriaId'],'id',null,$RESTRICTKATEGORIA); + $ADAT['kategoriaId'] = $kategoriaId; + $ADAT['hirek'] = getHirek(array('kategoria'=>array($kategoriaId),'cid'=>array(0),'tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1,6),'csoport'=>$AUTH['my']['categories'])); $ADAT['kerdoiv'] = getKerdoiv(_POLICY); $ev=date('Y');$honap=date('m');$nap=date('d'); diff --git a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php index d02f5484..44906949 100644 --- a/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php +++ b/mayor-orig/mayor-portal/www/policy/public/portal/portal/portal-pre.php @@ -14,7 +14,14 @@ // $ADAT['nevnap']['ma'] = getNevnap(date('m'),date('d')); // $ADAT['nevnap']['holnap'] = getNevnap(date('m'),date('d')+1); - $FILTER=array('tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1)); + $ADAT['kategoriak'] = getKategoriak(); + for ($i=0; $i<count($ADAT['kategoriak']); $i++) { + $RESTRICTKATEGORIA[] = intval($ADAT['kategoriak'][$i]['id']); + } + $kategoriaId = readVariable($_GET['kategoriaId'],'id',null,$RESTRICTKATEGORIA); + $ADAT['kategoriaId'] = $kategoriaId; + + $FILTER=array('tolDt'=>date('Y-m-d H:i:s'), 'igDt'=>date('Y-m-d H:i:s'),'flag'=>array(1),'class'=>array(1),'kategoria'=>array($kategoriaId)); if (defined('__PORTAL_RESTRICT_CID')) $FILTER['cid'] = explode(',',__PORTAL_RESTRICT_CID); diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css index 5152e545..9ea85cbc 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/css/portal.css @@ -68,6 +68,13 @@ div.egyHir span.tag { background-color: #bbb; padding: 0px 4px; margin: 0px 2px; border-radius:2px; color:white;} + div.egyHirmeta a { color: #aaa; border-bottom: dotted 1px #bbb} + div.egyHirmeta a:hover { color: #444; border-bottom: solid 1px #bbb} + + h2.hirKategoriaSelected { text-align: center; padding-left:22px; padding-right:22px; color: #7d96a0 ; text-decoration: underline solid #eee; font-weight:100; letter-spacing:2px; font-size: 24px; font-variant:small-caps} + h2.hirKategoriaSelected a { display:none; color: #d64161; padding-left: 6px; font-size:14px;} + h2.hirKategoriaSelected:hover { padding-right:0px;} + h2.hirKategoriaSelected:hover a { display: inline-block;} div.egyHir:after { clear: both; @@ -87,7 +94,7 @@ hr {display: none;} table.portalMain div.dobozTart a { color: black } - div.static h1 { margin: 20px;} + div.static h1 { margin: 20px; } div.static p { margin-left: 26px; margin-right:26px; margin-bottom: 1.2rem; font-size: 14px; line-height:1.6em;} @media (max-width: 850px) { diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml index f24068ca..e3a31005 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/egyhir.phtml @@ -57,7 +57,7 @@ } echo '</select>'; } - _putKategoriak($ADAT,$HIR['cid']); + // _putKategoriak($ADAT,$HIR['cid']); echo '</td>'; echo '<td style="line-height:2em; max-width: 300px">'; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml index 1f55154a..a995e638 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/hirek/hirekAdmin.phtml @@ -40,7 +40,7 @@ $FLAGS = array(0=>'nem látszik', 1=>'látszik', 2=>2, 3=>3); $now = time(); echo '<table class="hAdmin hideShowContainer" align="center" cellspacing="1">'; - echo '<tr><td colspan="7"><button type="button" class="onClickHideShow">Mindent mutass!</button></td></tr>'."\n"; + echo '<tr><th colspan="7"><button type="button" class="onClickHideShow"> + Mindent mutass! + </button></th></tr>'."\n"; for ($i=0; $i<count($ADAT['szovegek']); $i++) { $D = $ADAT['szovegek'][$i]; if ($D['class']==0) $_class='class="unk"'; else diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml index 37812ac0..5a1c26b5 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/html/share/hirek.phtml @@ -9,6 +9,16 @@ } } else { + + $KATEGORIAID2LEIRAS = (reindex($ADAT['kategoriak'],array('id'))); + + if ($ADAT['kategoriaId']>0 && $KATEGORIAID2LEIRAS[$ADAT['kategoriaId']][0]['leiras']!='') { + echo '<h2 class="hirKategoriaSelected">'; + echo ucfirst($KATEGORIAID2LEIRAS[$ADAT['kategoriaId']][0]['leiras']); + echo '<a href="'.href('index.php?page=portal&f=portal&sub=portal').'" class="icon-remove-sign"></a>'; + echo '</h2>'; + } + for ($i=0; $i<count($ADAT['hirek']['szovegek']); $i++) { $D = $ADAT['hirek']['szovegek'][$i]; @@ -34,7 +44,13 @@ for ($j=0; $j<count($CSOPORT); $j++) echo '<span class="tag">'.$CSOPORT[$j].'</span>'; //echo '</span>'; } - + if ($D['hirkategoriak']!='') { + $D['kategoriaIdk'] = explode(',',$D['hirkategoriak']); + for ($j=0; $j<count($D['kategoriaIdk']); $j++ ) { + echo ' · '; + echo '<a href="'.href('index.php?page=portal&sub=portal&f=portal&kategoriaId='.$D['kategoriaIdk'][$j]).'" class="hirkategoriaLeiras">'.$KATEGORIAID2LEIRAS[$D['kategoriaIdk'][$j]][0]['leiras'].'</a>'; + } + } echo '</div>'; } echo '<div class="hir">'; diff --git a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js index 41d70923..55364674 100644 --- a/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js +++ b/mayor-orig/mayor-portal/www/skin/classic/module-portal/javascript/portal.jquery.min.js @@ -23,6 +23,15 @@ $(function() { }); }); + $('#kategoriaSelectorContainer').html(''); + $('span.kategoriaSelector.selected').each(function() { + $('<input />', { + type: 'hidden', + name: 'kategoriaId[]', + value: $(this).data('kategoriaid') + }).appendTo($('#kategoriaSelectorContainer')); + }); + /* myForm.on('submit', function(e) { diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 9bce5583..de4ba040 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4695 +4710 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 39f0774c..c59d4b06 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4695 -8006f6a2333f838cf1c3a4c464aed480 mayor-fenntarto-rev4695.tgz -0413e87eaa2472d46297b1b1e67964c9 mayor-installer-sulix-rev4695.tgz -7b1958ba242c788088f8e0fa8b19ac06 mayor-wiki-rev4695.tgz -ce7a02daded0bc1a5b9379455fe7d497 mayor-installer-rev4695.tgz -31a165054c79b9638a9d31cdaedb2f28 mayor-portal-rev4695.tgz -d4f27043abc3a93c21d8939bd1ecb2e5 mayor-felveteli-rev4695.tgz -93cab4f2a25ecae24063f2a189884046 mayor-jatek-rev4695.tgz -2d3becd23208144f80333ee7855359d3 mayor-locales-jp_JP-rev4695.tgz -9bd9f2a196265369cf9edc46c17adf51 mayor-locales-de_DE-rev4695.tgz -620f79072f95112bc578085c4bb0829b mayor-locales-en_US-rev4695.tgz -c869569cb053d07c3b3fc97f47c7a86e mayor-naplo-rev4695.tgz -79f3aac8fcfb484b28f30467c7056505 mayor-base-rev4695.tgz +Revision 4710 +cb8cda74ec914985cfc33eeb1c0f600b mayor-fenntarto-rev4710.tgz +fce4128a082128b51ccd3c1f7da49d16 mayor-installer-sulix-rev4710.tgz +57cf545c827177cc44b1b976799235e0 mayor-wiki-rev4710.tgz +6093ef06efd2db548e5e6478e277df76 mayor-installer-rev4710.tgz +6020d68cd542a943247ae84e62f82271 mayor-portal-rev4710.tgz +bfeaeacfbb2e08af566791a15d22e94f mayor-felveteli-rev4710.tgz +92806a3648b8ae4d97cf4931539bc2ac mayor-jatek-rev4710.tgz +77ecb781efc6202022fbc0c88c339944 mayor-locales-jp_JP-rev4710.tgz +52e12bcaca7f74a4be364bc52babfd3c mayor-locales-de_DE-rev4710.tgz +91ef318a14aed435ef505255cefde6d0 mayor-locales-en_US-rev4710.tgz +b54133612c87fd2c3de6094485296e19 mayor-naplo-rev4710.tgz +1386d084c17d51d0fd101f37c37b02bd mayor-base-rev4710.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 9bce5583..de4ba040 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4695 +4710 @@ -1 +1 @@ -4695 +4710 |