nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-09 10:08:23 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,110 Commits 4 Branches 11 Tags
ee0df44e0d5331cbbf45a187c4618e95bf948ae5
Commit Graph

6110 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
FusionPBX
ee0df44e0d Merge pull request #1461 from mafoo/BugFix-ring_groups 
corrected function definition
 2016-03-11 13:25:20 -07:00
FusionPBX
17d433f12e Merge pull request #1460 from mafoo/Enhance-Add_mod_translate 
added mod_translate to the modules list
 2016-03-11 13:24:43 -07:00
FusionPBX
ab3aaf51cb Merge pull request #1462 from mafoo/BugFix-Translation-True_False 
BugFix-Translation-True_False
 2016-03-11 13:24:13 -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
9a136d3b8f Merge pull request #1470 from mafoo/WhitespaceClean-core/install 
WhitespaceClean-core/install
 2016-03-11 13:22:30 -07:00
FusionPBX
d312084d21 Merge pull request #1465 from mafoo/WhitespaceClean-app/dialplan 
WhitespaceClean-app/dialplan
 2016-03-11 13:22:02 -07:00
FusionPBX
f92cbd235f Merge pull request #1463 from mafoo/WhitespaceClean-root 
WhitespaceClean-root
 2016-03-11 13:21:22 -07:00
FusionPBX
c1dfbae3ce Merge pull request #1464 from mafoo/WhitespaceClean-app/access_controls 
WhitespaceClean-app/access_controls
 2016-03-11 13:21:00 -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
FusionPBX
3297375271 Merge pull request #1485 from mafoo/WhitespaceClean-others 
WhitespaceClean-others
 2016-03-11 13:12:41 -07:00
markjcrane
961e527abb Change device_provision_enable to device_enabled to make it consistent with the rest of the fields that are used for to enable and disable something. 2016-03-11 11:46:02 -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
2119c7ee8d WhitespaceClean-others 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 13:58:35 +00: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
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
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
mafoo
f803f03496 WhitespaceClean-core/install 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 12:03:29 +00:00
mafoo
dda30766ec WhitespaceClean-app/dialplan 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 11:49:17 +00:00
mafoo
27438d8919 WhitespaceClean-app/access_controls 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 11:47:28 +00:00
mafoo
3d328cfd63 WhitespaceClean-root 
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
 2016-03-11 11:44:58 +00:00
mafoo
77c72c8d7c BugFix-Translation-True_False 
fixed various uses of ucwords() to render true/false to use
$text[label-*] instead
 2016-03-11 11:34:52 +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
reliberate
788c7bfcb8 User Dashboard: Temporarily disable click-to-call till properly fixed. 2016-03-10 17:03:24 -07:00
reliberate
1b885beea5 Dashboard: Removed testing code on click-to-call function. 2016-03-10 16:49:26 -07:00
reliberate
904a18d997 CDR: Add missing icon image files. 2016-03-10 16:42:01 -07:00
reliberate
49bb6c1ded User Dashboard: Add blocks with additional customizable information (voicemail count, missed calls, recent calls, system counts, domain limits, and system status). 
CDR: Adjust icon status and missed call filter to be more accurate, simplify User's view of CDR, add additional call result filter.
 2016-03-10 16:29:47 -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
markjcrane
d4f8e98fc4 Move flags to a more standard directory. If they get used by another feature then the flags should be moved to the main fusionpbx/resources/images directory. 2016-03-09 11:12:47 -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
mafoo
8612897a03 added mod_translate to the modules list 2016-03-09 17:46:20 +00:00
markjcrane
8dd72afbd7 Add new default settings for http_auth_type, contact_extensions, contact_groups, and contact_users. 2016-03-07 21:35:38 -07:00
markjcrane
a30b4662b4 Add http digest authentication and make it the default with an option to use basic if required. 2016-03-07 21:31:37 -07:00
markjcrane
e137068d23 Remove the limit on the setting value of 255 as it blocks the length fax footer. 2016-03-07 12:04:07 -07: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
cc3c8f3c34 Add the contacts array to provisioning template to be used for the phone directory. 2016-03-04 18:37:01 -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
7763ece535 Fix indentation on the editor. 2016-03-04 13:18:30 -07:00
markjcrane
093235cca5 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-04 12:36:19 -07:00