Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/MathieuNls/tw into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
MathieuNls committed Jan 31, 2016
2 parents 5993064 + 2b75d1f commit 6cdfc41
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 4 deletions.
2 changes: 1 addition & 1 deletion application/libraries/Auto_email.php
Original file line number Diff line number Diff line change
Expand Up @@ -295,7 +295,7 @@ private function sendAtString($scheduleTime) {
$scheduleTime = $scheduleTime - $this->timeOffset;

$returnValue = date('Y-', $scheduleTime).date('m-', $scheduleTime)
.(date('d', $scheduleTime)).' '.(date('H', $scheduleTime)-1).':'
.(date('d', $scheduleTime)).' '.(date('H', $scheduleTime)).':'
.(date('i', $scheduleTime)).date(':s', $scheduleTime);

return $returnValue;
Expand Down
8 changes: 5 additions & 3 deletions application/views/footer.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,11 @@
<?php if(!$this->agent->is_mobile()){ ?>
<div id="publication_footer" class="publication">

<a href="http://www.fratellowatches.com/toolwatch-just-got-better/"><img src="<?php echo img_url('fratello_logos_transparant.png');?>"></a>
<a href="http://wristreview.com/?p=16698"><img src="<?php echo img_url('wristreview.png');?>"></a>
<a href="http://www.producthunt.com/tech/toolwatch"><img src="<?php echo img_url('product-hunt-logo-horizontal-black.png');?>"></a>
<a target="_blank" href="http://www.fratellowatches.com/toolwatch-just-got-better/"><img src="<?php echo img_url('fratello_logos_transparant.png');?>"></a>
<a target="_blank" href="http://wristreview.com/?p=16698"><img src="<?php echo img_url('wristreview.png');?>"></a>
<a target="_blank" href="http://www.producthunt.com/tech/toolwatch"><img src="<?php echo img_url('product-hunt-logo-horizontal-orange.png');?>"></a>
<a target="_blank" href="http://www.hebdo.ch/hebdo/montres-passion/detail/precision-testez-votre-montre-en-ligne"><img src="<?php echo img_url('logo_hebdo_2014.png');?>"></a>
<a target="_blank" href="<?php echo base_url();?>assets/pdf/ToolwatchEuropastar.pdf"><img src="<?php echo img_url('Europa-star-logo-blanc.jpg');?>"></a>
</div>
<?php } ?>
<div class="container container-fluid">
Expand Down
Binary file added assets/img/Europa-star-logo-blanc.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/img/logo_hebdo_2014.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added assets/pdf/ToolwatchEuropastar.pdf
Binary file not shown.

0 comments on commit 6cdfc41

Please sign in to comment.