Merge pull request #1469 from fabrixxm/changelog

Update codename and CHANGELOG

diff --combined boot.php
index bcbd312bc095df87c61bd061ae4d84b2169e52a1,f408c70cf7774983e7b7e12d88a798ceed7c43e1..6da885117a344c4133d3cf2e1b9127553b3b9ae8
--- 1/boot.php
--- 2/boot.php
+++ b/boot.php
@@@ -15,7 -15,7 +15,7 @@@ require_once('update.php')
  require_once('include/dbstructure.php');
  
  define ( 'FRIENDICA_PLATFORM',     'Friendica');
- define ( 'FRIENDICA_CODENAME',     'Ginger');
+ define ( 'FRIENDICA_CODENAME',     'Lily of the valley');
  define ( 'FRIENDICA_VERSION',      '3.4.0' );
  define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
  define ( 'DB_UPDATE_VERSION',      1182      );
@@@ -1830,10 -1830,10 +1830,10 @@@ if(! function_exists('get_events')) 
                $bd_short = t('F d');
  
                $r = q("SELECT `event`.* FROM `event`
 -                              WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
 +                              WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` >= '%s'
                                ORDER BY `start` ASC ",
                                intval(local_user()),
 -                              dbesc(datetime_convert('UTC','UTC','now + 6 days')),
 +                              dbesc(datetime_convert('UTC','UTC','now + 7 days')),
                                dbesc(datetime_convert('UTC','UTC','now - 1 days'))
                );
  
@@@ -1850,7 -1850,6 +1850,7 @@@
                        }
                        $classtoday = (($istoday) ? 'event-today' : '');
  
 +                      $skip = 0;
  
                        foreach($r as &$rr) {
                                if($rr['adjust'])
@@@ -1864,12 -1863,6 +1864,12 @@@
                                        $title = t('[No description]');
  
                                $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
 +
 +                              if(substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
 +                                      $skip++;
 +                                      continue;
 +                              }
 +
                                $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
  
                                $rr['link'] = $md;
@@@ -1884,7 -1877,7 +1884,7 @@@
                return replace_macros($tpl, array(
                        '$baseurl' => $a->get_baseurl(),
                        '$classtoday' => $classtoday,
 -                      '$count' => count($r),
 +                      '$count' => count($r) - $skip,
                        '$event_reminders' => t('Event Reminders'),
                        '$event_title' => t('Events this week:'),
                        '$events' => $r,