Show
Ignore:
Timestamp:
08/29/11 18:34:11 (2 years ago)
Author:
p_lindheimer
Message:

Merged revisions 12185,12190,12192,12194,12214-12215,12218,12256,12294,12305,12383-12384,12424,12434,12455 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.9

................

r12185 | mickecarlsson | 2011-05-21 15:00:11 -0700 (Sat, 21 May 2011) | 1 line


Closes #5161 fixes bad validation code

................

r12190 | p_lindheimer | 2011-05-24 20:12:30 -0700 (Tue, 24 May 2011) | 1 line


fixes #5175 and fixes #5176 initialize state of feature code and allow enable/disable from within the gui, some sanity testing would be helpful before I publish this widely

................

r12192 | p_lindheimer | 2011-05-25 10:52:02 -0700 (Wed, 25 May 2011) | 1 line


display default code outside of tooltip re #5175 and re #5176

................

r12194 | GameGamer?43 | 2011-05-25 21:53:13 -0700 (Wed, 25 May 2011) | 1 line


closes #5182 - misspelling in tooltip

................

r12214 | mbrevda | 2011-06-06 07:42:06 -0700 (Mon, 06 Jun 2011) | 1 line


merge to 2.9 for #5127, #5054, #5049, #5140

................

r12215 | mbrevda | 2011-06-06 07:56:21 -0700 (Mon, 06 Jun 2011) | 1 line


merge to 2.9 re #5127, #5054, #5049, #5140, #5142

................

r12218 | mbrevda | 2011-06-06 08:16:19 -0700 (Mon, 06 Jun 2011) | 1 line


unervert the unrevert re #5127, #5054, #5049, #5140, #5142

................

r12256 | mbrevda | 2011-06-13 11:33:13 -0700 (Mon, 13 Jun 2011) | 1 line


revert 12255

................

r12294 | p_lindheimer | 2011-07-07 12:29:11 -0700 (Thu, 07 Jul 2011) | 1 line


fixes #5159 don't set to empty quotes, thanks spermega and Lantizia

................

r12305 | mbrevda | 2011-07-17 04:32:10 -0700 (Sun, 17 Jul 2011) | 1 line


re #5262 should resolve

................

r12383 | p_lindheimer | 2011-08-09 12:10:52 -0700 (Tue, 09 Aug 2011) | 9 lines


Merged revisions 12382 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.8


........

r12382 | p_lindheimer | 2011-08-09 12:07:06 -0700 (Tue, 09 Aug 2011) | 1 line


fixes #5312 don't include in from-internal

........

................

r12384 | p_lindheimer | 2011-08-09 12:17:04 -0700 (Tue, 09 Aug 2011) | 1 line


fixes #5313 delete the record

................

r12424 | mbrevda | 2011-08-19 06:17:52 -0700 (Fri, 19 Aug 2011) | 1 line


closes #5320, call eval on mixmon_dir

................

r12434 | mickecarlsson | 2011-08-21 21:45:22 -0700 (Sun, 21 Aug 2011) | 1 line


Close #5187, add check for offline endpoints in macro-dial-one

................

r12455 | p_lindheimer | 2011-08-29 14:28:53 -0700 (Mon, 29 Aug 2011) | 9 lines


Merged revisions 11567-11569,11572,11754,11896-11897,11899,12018-12019,12233-12234,12382,12385,12387,12452,12454 via svnmerge from
http://www.freepbx.org/v2/svn/modules/branches/2.8


........

r12387 | p_lindheimer | 2011-08-09 15:12:07 -0700 (Tue, 09 Aug 2011) | 1 line


should fix custom trunk destination re #5314 pls test and provide feedback then will put in and merge up

........

................

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/branches/2.10/languages/functions.inc.php

    r11676 r12460  
    4444  switch ($engine) { 
    4545    case 'asterisk': 
    46       $ext->addInclude('from-internal-additional', 'app-languages'); 
    4746      foreach (languages_list() as $row) { 
    4847          $ext->add('app-languages',$row['language_id'], '', new ext_noop('Changing Channel to language: '.$row['lang_code'].' ('.$row['description'].')')); 
     
    299298  global $db; 
    300299  $sql='DELETE FROM language_incoming WHERE extension = ? AND cidnum = ?'; 
     300  $db->query($sql,array($extension,$cidnum)); 
    301301} 
    302302 
  • modules/branches/2.10/languages/module.xml

    r12445 r12460  
    33  <repo>extended</repo> 
    44  <name>Languages</name> 
    5   <version>2.9.0.2</version> 
     5  <version>2.9.0.3</version> 
    66  <publisher>FreePBX</publisher> 
    77  <license>GPLv2+</license> 
     
    1414  </menuitems> 
    1515  <changelog> 
     16    *2.9.0.3* #5312, #5313 
    1617    *2.9.0.2* #4914 
    1718    *2.9.0.1* set repository