dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,118 Commits 3 Branches 10 Tags 224 MiB
Commit Graph

1779 Commits

Author SHA1 Message Date
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 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
Alexey Melnichuk bd4fa2a537 Fix. LuaSQL db backend breaks loop only on positive numbers. 2016-02-26 13:57:32 +03:00
Alexey Melnichuk b797775720 Fix. ODBC db backend should breaks loop only when callback returns number ~= 0 
```Lua
dbh:query(sql, function(row)
  -- return 0     -- should not break loop
  -- return true  -- should not break loop
  return 1 -- should break loop
end)
```
 2016-02-26 13:52:27 +03:00
reliberate c469e12226 Languages: Corrected capitalization on 'false'. 2016-02-25 11:13:18 -07:00
FusionPBX bb13ec5063 Merge pull request #1443 from moteus/database_backend 
Database backend
 2016-02-25 08:39:07 -07:00
reliberate baf579c03e Edit: Added Find/Replace and Go To (Line) features in toolbar, rename Ace application folder. 2016-02-24 14:44:32 -07:00
reliberate e736538654 Edit: Addition of Ace editor application files in /resources 2016-02-24 12:32:41 -07:00
markjcrane cda89cd03c Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-24 10:43:16 -07:00
markjcrane 3d61355494 Update the wallpaper variable yealink_t29g_wallpaper. 2016-02-24 10:42:50 -07:00
Alexey Melnichuk 7c225b404a Fix. Add `#` to caller ID name when call from IVR 2016-02-24 16:28:38 +03:00
Alexey Melnichuk 466f85a0be Move scripts to separate dirs. 2016-02-24 14:44:50 +03:00
markjcrane fddef99e40 Update PHPMailer 5.2.2 to 5.2.14. 2016-02-22 15:00:57 -07:00
markjcrane af18c963c0 Rename .project.ROOT to project_root.php this conforms better with current file naming standards. 2016-02-22 14:01:18 -07:00
markjcrane 976fc1bc8f Increase the HTTPS security. 2016-02-22 13:18:37 -07:00
markjcrane 33192164ad Fix a spelling mistake in the log message in dialplan.lua. 2016-02-22 13:17:04 -07:00
markjcrane 724ea56dd5 Set max rotate on the FreeSWITCH logs to 10. 2016-02-22 13:15:55 -07:00
Alexey Melnichuk 4735d9f41c Fix. `unpack` moved to `table` in Lua 5.2 2016-02-20 15:22:28 +03:00
Alexey Melnichuk 6035d4033c Fix. `connected` method on LuaSQL backend. 2016-02-20 15:20:38 +03:00