Commit Graph

6486 Commits

Author SHA1 Message Date
markjcrane acda022e25 Company directory allow only setting the first or last name. 2016-02-16 13:05:25 -07:00
FusionPBX ea07e944a7 Merge pull request #1442 from moteus/acl_flush_memcache
Fix. Clear memcache after edit ACL.
2016-02-16 08:53:29 -07:00
Alexey Melnichuk cf290cdd68 Fix. Clear memcache after edit ACL. 2016-02-16 14:02:00 +03:00
Alexey Melnichuk 270508bf95 Fix. set caller id name in `page` application 2016-02-16 13:36:14 +03:00
FusionPBX 872e8a3bb2 Merge pull request #1440 from blackc2004/master
fix if_permission
2016-02-15 20:37:18 -07:00
blackc2004 ddd1e35185 fix if_permission 2016-02-15 11:19:18 -08:00
blackc2004 27435d8be4 Merge pull request #17 from fusionpbx/master
14
2016-02-15 10:41:46 -08:00
markjcrane 4757d0e9d6 Add ability to the acl.conf.xml to read a description attribute. 2016-02-14 03:09:55 -07:00
markjcrane 9e029b27eb Fix a spelling problem in the demo_ivr.xml. 2016-02-11 13:35:12 -07:00
markjcrane fc255818c6 If the user is in the superadmin or admin group and user group it was preventing the fax_forward number from being updated. 2016-02-11 00:19:44 -07:00
markjcrane bc6d44a6c1 Fax add a way to change the inbound fax file name. 2016-02-10 21:44:03 -07:00
markjcrane 93d02e85af Fix the check to see if domain_name is not set. 2016-02-10 17:15:31 -07:00
markjcrane 7716a09f54 XML CDR - if the domain_uuid is not found then attempt to use sip_req_host to get the domain name. If domain_name and domain_uuid are still empty then add the CDR record with the domain_uuid as null so there is a record of the call. 2016-02-10 13:54:15 -07:00
markjcrane 4e0f3e7918 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-10 13:49:46 -07:00
markjcrane e18a556643 Prevent nil from crashing the lua script. 2016-02-10 13:49:31 -07:00
FusionPBX 1915a5887a Merge pull request #1436 from bdstephenson/master
Update W52P Provisioning Template
2016-02-10 09:54:30 -07:00
bdstephenson 3e5353b9aa Update W52P Provisioning Template
account.1.subscribe_mwi should be set to '1' as per Yealink documentation. Not setting this may cause MWI to not work on the W52P.
2016-02-08 08:48:37 -05:00
FusionPBX 6e95b9b363 Merge pull request #1435 from skyeblueiscool/patch-1
Update follow_me.php
2016-02-06 23:06:01 -07:00
FusionPBX cec8a039b7 Merge pull request #1432 from moteus/ivr_menu
IVR menu
2016-02-06 15:42:56 -07:00
FusionPBX 7cc0be12d2 Merge pull request #1433 from mafoo/BugFix-conference_center_rooms
Fix for when a conference room has no admins
2016-02-06 15:42:29 -07:00
markjcrane ec1b77853d Change the category to provision for provision ntp_server_primary, and ntp_server_secondary. 2016-02-06 14:53:31 -07:00
skyeblueiscool 1524775135 Update follow_me.php 2016-02-05 16:47:36 -08:00
blackc2004 3c6335e50d Merge pull request #16 from fusionpbx/master
14
2016-02-05 09:37:07 -08:00
mafoo 5c1da9533e Fix for when a conference room has no admins
If a conference room had no admins it would become impossible to see it in the GUI
This fix makes it possible for a admin or super admin to view rooms in this state.
this uses a new permission "conference_room_view_all"
2016-02-05 09:47:42 +00:00
Alexey Melnichuk b616736a29 Fix. Declare vars in correct scope. 2016-02-05 10:20:09 +03:00
markjcrane 7bcb324e58 Fix a minor mistake. 2016-02-04 23:39:08 -07:00
markjcrane b4f9a1308e Hide memcache on the system status page if FreeSWITCH is not installed. 2016-02-04 23:28:23 -07:00
markjcrane 4385d0edde Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-04 23:19:23 -07:00
markjcrane 71a0fa12fa Switch settings are not always needed so removing the "throw new Exception" 2016-02-04 23:18:48 -07:00
FusionPBX 1fbbc211bc Merge pull request #1431 from mafoo/BugFix-ivr_menu_edit
BigFix-ivr_menu_edit
2016-02-04 12:36:52 -07:00
Alexey Melnichuk b3764e21f9 Update log. 2016-02-04 20:00:12 +03:00
Alexey Melnichuk 9f818dfbbf Fix. Infinity loop. IVR ignores `max_failures`. 2016-02-04 19:42:42 +03:00
mafoo b231e0ff84 made it possible to find phrases
fixed string replace not taking out spaces aswell
2016-02-04 16:19:27 +00:00
Alexey Melnichuk a9e4f5a3e6 Fix. Allow multiple actions in IVR 2016-02-04 19:05:24 +03:00
blackc2004 7999ae927b Merge pull request #15 from fusionpbx/master
13
2016-02-04 07:53:47 -08:00
FusionPBX 27f9359bb2 Merge pull request #1430 from mafoo/BugFix-Phrases-app_config
fix for incorrect destinations
2016-02-04 08:51:58 -07:00
mafoo 92894bb157 fix for incorrect destinations 2016-02-04 15:49:03 +00:00
FusionPBX 96bf210488 Merge pull request #1429 from mafoo/BugFix-Normalize_htaccess
BugFix-Normalize .htaccess
2016-02-04 08:07:40 -07:00
FusionPBX 1f5ad3352e Merge pull request #1428 from mafoo/Enhance-core/upgrade
Enhance-core/upgrade
2016-02-04 08:02:34 -07:00
Alexey Melnichuk 1f9fbc6b7b Use logger class. 2016-02-04 16:05:35 +03:00
mafoo 478a61b18e Normalized and fixed htaccess
added comments explaining each rule
normalized tabbing
converted captures where not needed (note use of ?: means don't capture)
updated Yealink comment as it also covers Polycom
added missing $mac-directory.xml for Polycom
removed ^(?:.*/) as it is technically not needed, the test that showed
it was needed turned out to be invalid
2016-02-04 12:17:38 +00:00
mafoo 9066858701 only offer the source upgrade if it is writeable
this check will prevent the source upgrade rendering if the .git folder
is not writeable
2016-02-04 11:14:26 +00:00
Alexey Melnichuk 2fe1337494 Simplify code 2016-02-04 13:20:30 +03:00
Alexey Melnichuk 834c0bce86 Merge remote-tracking branch 'upstream/master' into ivr_menu 2016-02-04 12:14:27 +03:00
FusionPBX 254ecafad3 Merge pull request #1420 from moteus/fix_partial_dialplan
Fix. Do not build context if there error.
2016-02-03 21:32:15 -07:00
markjcrane 5f5b70891c Update for provisioning. Add a new phone the Yealink t49g. 2016-02-03 20:02:59 -07:00
markjcrane 58bbf9ae7b Remove trailing whitespaces. 2016-02-03 19:03:16 -07:00
markjcrane 6b74d077dc Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-03 19:02:30 -07:00
markjcrane aa020308d4 In vars.xml switch from hostname to the switchname. 2016-02-03 19:02:10 -07:00
FusionPBX bfec5d3757 Merge pull request #1426 from mafoo/BugFix-Phrases-Selected
Corrected selected statements
2016-02-03 10:46:35 -07:00