Commit Graph

1796 Commits

Author SHA1 Message Date
markjcrane 08b4e3138c Add destination number regex and string_to_regex function. 2016-03-17 13:22:03 -06:00
markjcrane 9cd30165d4 Change daylight_savings_start_date to daylight_savings_start_day as it is more accurate for representing the data. Add daylight_savings_start_time and daylight_savings_stop_time 2016-03-15 16:15:32 -06:00
markjcrane d1d041dc62 Update default settings add daylight_savings_start_month and date for the polycom templates. 2016-03-15 13:51:01 -06:00
markjcrane 36529ae05a Rolling back PHPMailer from version 5.2.14 to 5.2.2. The latest version had a problem with smtp authentication set to false it still tried to authenticate. 2016-03-15 02:58:23 -06:00
markjcrane 56350a8468 Update the Cisco 79xx templates to work with the new contacts array. 2016-03-14 18:56:00 -06:00
markjcrane 27829859b9 Add a missing semi-colon. 2016-03-12 22:16:22 -07:00
markjcrane f924453e1c Change $language_name to $text['language-name'] this will follow current naming standards in app_languages.php and reduces code needed in the text class. 2016-03-12 22:06:57 -07:00
markjcrane 61987425af Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-11 14:21:28 -07:00
markjcrane c11459fae8 Get the domain_name from the array. 2016-03-11 14:21:08 -07:00
FusionPBX 8a8629404a Merge pull request #1475 from mafoo/WhitespaceClean-resources/provision/polycom
WhitespaceClean-resources/provision/polycom
2016-03-11 13:34:49 -07:00
FusionPBX 3c85bc5999 Merge pull request #1476 from mafoo/WhitespaceClean-resources/provision/yealink
WhitespaceClean-resources/provision/yealink
2016-03-11 13:34:22 -07:00
FusionPBX 55993a1db7 Merge pull request #1474 from mafoo/WhitespaceClean-resources/provision/grandstream
WhitespaceClean-resources/provision/grandstream
2016-03-11 13:32:31 -07:00
FusionPBX bd6efe903c Merge pull request #1477 from mafoo/WhitespaceClean-resources/provision/mitel
WhitespaceClean-resources/provision/mitel
2016-03-11 13:32:01 -07:00
FusionPBX 489f1ef95f Merge pull request #1478 from mafoo/WhitespaceClean-resources/provision/others
WhitespaceClean-resources/provision/others
2016-03-11 13:31:33 -07:00
FusionPBX a22660bbff Merge pull request #1481 from mafoo/WhitespaceClean-resources/jquery
WhitespaceClean-resources/jquery
2016-03-11 13:27:02 -07:00
FusionPBX ee0df44e0d Merge pull request #1461 from mafoo/BugFix-ring_groups
corrected function definition
2016-03-11 13:25:20 -07:00
FusionPBX 54c1dcfdf1 Merge pull request #1472 from mafoo/WhitespaceClean-resources/classes
WhitespaceClean-resources/classes
2016-03-11 13:22:57 -07:00
FusionPBX 260bf24100 Merge pull request #1479 from mafoo/WhitespaceClean-resources/install/scripts
WhitespaceClean-resources/install/scripts
2016-03-11 13:20:17 -07:00
FusionPBX 55a8bb2686 Merge pull request #1473 from mafoo/WhitespaceClean-resources/provision/cisco
WhitespaceClean-resources/provision/cisco
2016-03-11 13:19:13 -07:00
FusionPBX 919eacb2a7 Merge pull request #1480 from mafoo/WhitespaceClean-resources/templates/conf
WhitespaceClean-resources/templates/conf
2016-03-11 13:18:21 -07:00
FusionPBX 88fe82308f Merge pull request #1482 from mafoo/WhitespaceClean-resources/edit_area
WhitespaceClean-resources/edit_area
2016-03-11 13:16:31 -07:00
FusionPBX 41dfdcef23 Merge pull request #1483 from mafoo/WhitespaceClean-resources/templates/engine/smarty
WhitespaceClean-resources/templates/smarty
2016-03-11 13:16:14 -07:00
FusionPBX 2be9c13080 Merge pull request #1484 from mafoo/WhitespaceClean-resources/others
WhitespaceClean-resources/others
2016-03-11 13:15:09 -07:00
markjcrane f5c2222f97 Prevent custom sip port from breaking provision.lua and add prevent nil concatenation errors. 2016-03-11 10:31:11 -07:00
mafoo 5e97c0df2c WhitespaceClean-resources/others
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:57:01 +00:00
mafoo 3f5d003c71 WhitespaceClean-resources/templates/smarty
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:45:32 +00:00
mafoo aca80b09c0 WhitespaceClean-resources/edit_area
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:29:29 +00:00
mafoo b0f383479a WhitespaceClean-resources/jquery
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:26:36 +00:00
mafoo 893216a2d2 WhitespaceClean-resources/templates/conf
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:24:27 +00:00
mafoo 0eb7d5ddac WhitespaceClean-resources/install/scripts
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 13:21:52 +00:00
mafoo d68833f588 WhitespaceClean-resources/provision/others
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:22:24 +00:00
mafoo 5cae1fef28 WhitespaceClean-resources/provision/mitel
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:20:37 +00:00
mafoo d018f74ed3 WhitespaceClean-resources/provision/yealink
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:18:50 +00:00
mafoo 1f8f01cabb WhitespaceClean-resources/provision/polycom
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:16:24 +00:00
mafoo 713b29998b WhitespaceClean-resources/provision/grandstream
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:12:47 +00:00
mafoo 9a6cf80f06 WhitespaceClean-resources/provision/cisco
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:10:46 +00:00
mafoo 1726744f4e WhitespaceClean-resources/classes
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
2016-03-11 12:08:26 +00:00
markjcrane 66ba2802bd The last two changes to xml handler dialplan.lua did not work well with global dialplans. Removed some of the changes to fix the regression. 2016-03-11 00:58:52 -07:00
markjcrane 7b5d8f08c5 Add missing call_direction for ring group destinations. 2016-03-10 18:10:49 -07:00
markjcrane 833860e067 Use a more efficient way to get the domain name for xml handler - dialplan. 2016-03-10 08:18:46 -07:00
markjcrane d14d4aeb8a Increase efficiency xml handler section dialplan. 2016-03-09 13:09:25 -07:00
mafoo 8ceec465ac corrected function definition
fixed bug introduced on 2/1/2016 in destination.lua
fixed bug introduced on 2/1/2016 in ring_member.lua
2016-03-09 17:54:44 +00:00
markjcrane 6804772e06 Fix the phrases_dir if statement. If the phrases_dir is not null then need to include xml from the file system. 2016-03-07 10:30:29 -07:00
markjcrane 90a9e55b77 Handle the phrases_dir nil in a more flexible way. 2016-03-04 15:51:10 -07:00
markjcrane 9ffcf3d872 Ensure the phrases_dir is not nil. 2016-03-04 15:08:58 -07:00
markjcrane 093235cca5 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-04 12:36:19 -07:00
markjcrane ac0f620302 Prevent a nil error for xml handler languages. 2016-03-04 12:35:37 -07:00
reliberate 39a31432ba User Dashboard: Minor layout optimizations.
Follow Me: Added search and minimized paging controls.
Extensions: Added minimized paging controls.
2016-03-03 19:01:58 -07:00
markjcrane cb8aaac1f7 Add ring_member.lua to app/ring_groups/resources/scripts/ring_member.lua. 2016-02-29 18:52:04 -07:00
Alexey Melnichuk f2c43cb441 Fix. FreeSWITCH also breaks loop if return string value which contain number.
```Lua
dbh:query(sql, function()
  return "1" -- breaks loop
end)
2016-02-26 14:17:28 +03:00