Merge branch 'master' into next
This commit is contained in:
commit
5b7abfcd76
7 changed files with 23 additions and 20 deletions
|
@ -14,8 +14,8 @@ Ici vous trouverez :
|
|||
|
||||
- Un [widget](/Scratch/files/YPassword-1.6.zip) ;
|
||||
- un [Applescript](/Scratch/files/forcePaste.app.zip) pour simuler la copie dans les champs textes protégés ;
|
||||
- une [application web](/Scratch/en/softwares/ypassword/web/) écrite avec [Cappuccino](http://cappuccino.org),
|
||||
- une [application web](/Scratch/en/softwares/ypassword/iphoneweb/) pour iPhone ;
|
||||
- une [application web](/Scratch/fr/softwares/ypassword/web/) écrite avec [Cappuccino](http://cappuccino.org),
|
||||
- une [application web](/Scratch/fr/softwares/ypassword/iphoneweb/) pour iPhone ;
|
||||
- un [script utilisable en ligne de commande](/Scratch/files/getpass).
|
||||
|
||||
Dans peu de temps je créerai une application iPhone pour YPassword.
|
||||
|
|
|
@ -23,8 +23,8 @@ en: - A [command line tool](/Scratch/files/getpass).
|
|||
|
||||
fr: - Un [widget](/Scratch/files/YPassword-1.6.zip) ;
|
||||
fr: - un [Applescript](/Scratch/files/forcePaste.app.zip) pour simuler la copie dans les champs textes protégés ;
|
||||
fr: - une [application web](/Scratch/en/softwares/ypassword/web/) écrite avec [Cappuccino](http://cappuccino.org),
|
||||
fr: - une [application web](/Scratch/en/softwares/ypassword/iphoneweb/) pour iPhone ;
|
||||
fr: - une [application web](/Scratch/fr/softwares/ypassword/web/) écrite avec [Cappuccino](http://cappuccino.org),
|
||||
fr: - une [application web](/Scratch/fr/softwares/ypassword/iphoneweb/) pour iPhone ;
|
||||
fr: - un [script utilisable en ligne de commande](/Scratch/files/getpass).
|
||||
|
||||
en: I'll soon release an iPhone application.
|
||||
|
|
|
@ -243,7 +243,7 @@ But you can easily translate from Ruby to Javascript.</p>
|
|||
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">18</span>
|
||||
<span class="day">19</span>
|
||||
<span class="month">Jun</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
@ -657,7 +657,7 @@ But you can easily translate from Ruby to Javascript.</p>
|
|||
</ul></div><div class="list" id="iPhone"><h4>iPhone <a href="#tagcloud">↑</a></h4><ul style="list-style-type: none; margin: 0;">
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">1</span>
|
||||
<span class="day">2</span>
|
||||
<span class="month">Sep</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
@ -702,7 +702,7 @@ But you can easily translate from Ruby to Javascript.</p>
|
|||
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">18</span>
|
||||
<span class="day">19</span>
|
||||
<span class="month">Jun</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
@ -765,7 +765,7 @@ But you can easily translate from Ruby to Javascript.</p>
|
|||
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">18</span>
|
||||
<span class="day">19</span>
|
||||
<span class="month">Jun</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
@ -963,7 +963,7 @@ But you can easily translate from Ruby to Javascript.</p>
|
|||
</ul></div><div class="list" id="Objective_C"><h4>Objective-C <a href="#tagcloud">↑</a></h4><ul style="list-style-type: none; margin: 0;">
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">1</span>
|
||||
<span class="day">2</span>
|
||||
<span class="month">Sep</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
@ -990,7 +990,7 @@ But you can easily translate from Ruby to Javascript.</p>
|
|||
</ul></div><div class="list" id="popup"><h4>popup <a href="#tagcloud">↑</a></h4><ul style="list-style-type: none; margin: 0;">
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">18</span>
|
||||
<span class="day">19</span>
|
||||
<span class="month">Jun</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
@ -1044,7 +1044,7 @@ But you can easily translate from Ruby to Javascript.</p>
|
|||
</ul></div><div class="list" id="Programming"><h4>Programming <a href="#tagcloud">↑</a></h4><ul style="list-style-type: none; margin: 0;">
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">1</span>
|
||||
<span class="day">2</span>
|
||||
<span class="month">Sep</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
@ -1458,7 +1458,7 @@ But you can easily translate from Ruby to Javascript.</p>
|
|||
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">18</span>
|
||||
<span class="day">19</span>
|
||||
<span class="month">Jun</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
|
|
@ -192,7 +192,7 @@ No need to use a <code>jQuery</code> plugin.</p>
|
|||
<a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">Copyright ©, Yann Esposito</a>
|
||||
</div>
|
||||
<div id="lastmod">
|
||||
Created: 06/18/2010
|
||||
Created: 06/19/2010
|
||||
Modified: 06/19/2010
|
||||
</div>
|
||||
<div>
|
||||
|
|
|
@ -340,7 +340,7 @@ Voici comment configurer un site statique sur heroku.</p>
|
|||
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">19</span>
|
||||
<span class="day">18</span>
|
||||
<span class="month">Jui</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
@ -592,7 +592,7 @@ Voici comment configurer un site statique sur heroku.</p>
|
|||
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">19</span>
|
||||
<span class="day">18</span>
|
||||
<span class="month">Jui</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
@ -655,7 +655,7 @@ Voici comment configurer un site statique sur heroku.</p>
|
|||
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">19</span>
|
||||
<span class="day">18</span>
|
||||
<span class="month">Jui</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
@ -1114,7 +1114,7 @@ Voici comment configurer un site statique sur heroku.</p>
|
|||
|
||||
<li style="line-height: 3em; margin: 0;">
|
||||
<span class="date">
|
||||
<span class="day">19</span>
|
||||
<span class="day">18</span>
|
||||
<span class="month">Jui</span>
|
||||
<span class="year">2010</span>
|
||||
</span>
|
||||
|
|
|
@ -70,8 +70,8 @@ Lisez mon <a href="/Scratch/fr/blog/ypassword.html">article</a> pour les détail
|
|||
<ul>
|
||||
<li>Un <a href="/Scratch/files/YPassword-1.6.zip">widget</a> ;</li>
|
||||
<li>un <a href="/Scratch/files/forcePaste.app.zip">Applescript</a> pour simuler la copie dans les champs textes protégés ;</li>
|
||||
<li>une <a href="/Scratch/en/softwares/ypassword/web/">application web</a> écrite avec <a href="http://cappuccino.org">Cappuccino</a>,</li>
|
||||
<li>une <a href="/Scratch/en/softwares/ypassword/iphoneweb/">application web</a> pour iPhone ;</li>
|
||||
<li>une <a href="/Scratch/fr/softwares/ypassword/web/">application web</a> écrite avec <a href="http://cappuccino.org">Cappuccino</a>,</li>
|
||||
<li>une <a href="/Scratch/fr/softwares/ypassword/iphoneweb/">application web</a> pour iPhone ;</li>
|
||||
<li>un <a href="/Scratch/files/getpass">script utilisable en ligne de commande</a>.</li>
|
||||
</ul>
|
||||
|
||||
|
|
|
@ -2,7 +2,10 @@
|
|||
|
||||
if [[ $HOST = "YiMac.local" ]]; then
|
||||
cd $HOME/Sites/webroot
|
||||
git pull
|
||||
git co master
|
||||
[[ ! $? ]] && { exit 1 }
|
||||
git pull
|
||||
[[ ! $? ]] && { exit 1 }
|
||||
./tasks/recompile
|
||||
if git status | grep 'nothing to commit'>/dev/null 2>&1; then
|
||||
else
|
||||
|
|
Loading…
Reference in a new issue