Overview
Comment: | Merge trunk |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | emails |
Files: | files | file ages | folders |
SHA3-256: |
67b1affc1701e29b77a34d1f48ab2d92 |
User & Date: | bohwaz on 2021-11-14 20:56:07 |
Other Links: | branch diff | manifest | tags |
Context
2021-11-14
| ||
23:10 | Implement opt-out, and email verification check-in: 4e1c522d05 user: bohwaz tags: emails | |
20:56 | Merge trunk check-in: 67b1affc17 user: bohwaz tags: emails | |
20:55 | Implement email bounces and optout check-in: 8f9d4ac696 user: bohwaz tags: emails | |
15:50 | Bump version check-in: b6ac2181be user: bohwaz tags: trunk, stable, 1.1.14 | |
Changes
Modified src/VERSION from [1e40103605] to [fd953d9ef4].
|
| | | 1 | 1.1.14 |
Modified src/templates/admin/_head.tpl from [d5bd8a7f03] to [3d9c037f14].
︙ | ︙ | |||
36 37 38 39 40 41 42 | <body{if isset($transparent)} class="transparent"{/if}> {if !array_key_exists('_dialog', $_GET) && !isset($transparent)} <header class="header"> <nav class="menu"> <ul> | | < < < < < < < | 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 | <body{if isset($transparent)} class="transparent"{/if}> {if !array_key_exists('_dialog', $_GET) && !isset($transparent)} <header class="header"> <nav class="menu"> <ul> {if $is_logged} <?php $current_parent = substr($current, 0, strpos($current, '/')); ?> <li class="home{if $current == 'home'} current{elseif $current_parent == 'home'} current_parent{/if}"> <a href="{$admin_url}"><b class="icn">⌂</b><i> Accueil</i></a> {if !empty($plugins_menu)} <ul> |
︙ | ︙ | |||
110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | <li{if $current == 'me/services'} class="current"{/if}><a href="{$admin_url}me/services.php">Mes activités & cotisations</a></li> </ul> </li> {if !defined('Garradin\LOCAL_LOGIN') || !LOCAL_LOGIN} <li class="logout"><a href="{$admin_url}logout.php"><b class="icn">⤝</b><i> Déconnexion</i></a></li> {/if} {/if} </ul> </nav> <h1>{$title}</h1> </header> {/if} <main> | > > > > > > > | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 | <li{if $current == 'me/services'} class="current"{/if}><a href="{$admin_url}me/services.php">Mes activités & cotisations</a></li> </ul> </li> {if !defined('Garradin\LOCAL_LOGIN') || !LOCAL_LOGIN} <li class="logout"><a href="{$admin_url}logout.php"><b class="icn">⤝</b><i> Déconnexion</i></a></li> {/if} {elseif !defined('Garradin\INSTALL_PROCESS')} <li><a href="{if $config.site_asso}{$config.site_asso}{else}{$www_url}{/if}">← Retour au site</a></li> <li><a href="{$admin_url}">Connexion</a> <ul> <li><a href="{$admin_url}password.php">Mot de passe perdu</a> </ul> </li> {/if} </ul> </nav> <h1>{$title}</h1> </header> {/if} <main> |