Commit Graph

6008 Commits

Author SHA1 Message Date
markjcrane cee8e6cd01 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-16 13:05:48 -07:00
markjcrane acce2040ab Company directory allow only setting the first or last name. 2016-02-16 13:05:25 -07:00
FusionPBX eec24d6341 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 1d2a612030 Fix. Clear memcache after edit ACL. 2016-02-16 14:02:00 +03:00
FusionPBX 612dd5d466 Merge pull request #1440 from blackc2004/master
fix if_permission
2016-02-15 20:37:18 -07:00
blackc2004 be018be1f2 fix if_permission 2016-02-15 11:19:18 -08:00
blackc2004 1054a0fbdc Merge pull request #17 from fusionpbx/master
14
2016-02-15 10:41:46 -08:00
markjcrane fe6a73a3d8 Add ability to the acl.conf.xml to read a description attribute. 2016-02-14 03:09:55 -07:00
markjcrane a7084e4b0b Fix a spelling problem in the demo_ivr.xml. 2016-02-11 13:35:12 -07:00
markjcrane 13861172a9 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 b489074e0c Fax add a way to change the inbound fax file name. 2016-02-10 21:44:03 -07:00
markjcrane 9b1cb7c43e Fix the check to see if domain_name is not set. 2016-02-10 17:15:31 -07:00
markjcrane 2e5e2aa3b3 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 bbd05a9c2d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-10 13:49:46 -07:00
markjcrane d61c7815f9 Prevent nil from crashing the lua script. 2016-02-10 13:49:31 -07:00
FusionPBX 51263a5c23 Merge pull request #1436 from bdstephenson/master
Update W52P Provisioning Template
2016-02-10 09:54:30 -07:00
bdstephenson 17b89a8fc8 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 f39708bee7 Merge pull request #1435 from skyeblueiscool/patch-1
Update follow_me.php
2016-02-06 23:06:01 -07:00
FusionPBX 8d6b910c60 Merge pull request #1432 from moteus/ivr_menu
IVR menu
2016-02-06 15:42:56 -07:00
FusionPBX 2064b451b2 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 aa9717518f Change the category to provision for provision ntp_server_primary, and ntp_server_secondary. 2016-02-06 14:53:31 -07:00
skyeblueiscool dcc64101be Update follow_me.php 2016-02-05 16:47:36 -08:00
blackc2004 e7c80adf2e Merge pull request #16 from fusionpbx/master
14
2016-02-05 09:37:07 -08:00
mafoo 27dfc364df 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 c31047470d Fix. Declare vars in correct scope. 2016-02-05 10:20:09 +03:00
markjcrane fa1d97a6ca Fix a minor mistake. 2016-02-04 23:39:08 -07:00
markjcrane 658f2ab678 Hide memcache on the system status page if FreeSWITCH is not installed. 2016-02-04 23:28:23 -07:00
markjcrane e8bed6f611 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-04 23:19:23 -07:00
markjcrane 5e44128f70 Switch settings are not always needed so removing the "throw new Exception" 2016-02-04 23:18:48 -07:00
FusionPBX 3ce7924c02 Merge pull request #1431 from mafoo/BugFix-ivr_menu_edit
BigFix-ivr_menu_edit
2016-02-04 12:36:52 -07:00
Alexey Melnichuk 1bafdba135 Update log. 2016-02-04 20:00:12 +03:00
Alexey Melnichuk 9a70297909 Fix. Infinity loop. IVR ignores `max_failures`. 2016-02-04 19:42:42 +03:00
mafoo 416a704c12 made it possible to find phrases
fixed string replace not taking out spaces aswell
2016-02-04 16:19:27 +00:00
Alexey Melnichuk 5512276370 Fix. Allow multiple actions in IVR 2016-02-04 19:05:24 +03:00
blackc2004 f32ca0bf14 Merge pull request #15 from fusionpbx/master
13
2016-02-04 07:53:47 -08:00
FusionPBX 7cdd8a31c6 Merge pull request #1430 from mafoo/BugFix-Phrases-app_config
fix for incorrect destinations
2016-02-04 08:51:58 -07:00
mafoo 010963aa2f fix for incorrect destinations 2016-02-04 15:49:03 +00:00
FusionPBX 45dda55c7f Merge pull request #1429 from mafoo/BugFix-Normalize_htaccess
BugFix-Normalize .htaccess
2016-02-04 08:07:40 -07:00
FusionPBX 28c9a9cc91 Merge pull request #1428 from mafoo/Enhance-core/upgrade
Enhance-core/upgrade
2016-02-04 08:02:34 -07:00
Alexey Melnichuk 3327ecae91 Use logger class. 2016-02-04 16:05:35 +03:00
mafoo 057acf09bf 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 ca4e1b8a67 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 883b73f6ac Simplify code 2016-02-04 13:20:30 +03:00
Alexey Melnichuk 2ad2448346 Merge remote-tracking branch 'upstream/master' into ivr_menu 2016-02-04 12:14:27 +03:00
FusionPBX 6e3792bf05 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 ced645ff60 Update for provisioning. Add a new phone the Yealink t49g. 2016-02-03 20:02:59 -07:00
markjcrane f525d2bbda Remove trailing whitespaces. 2016-02-03 19:03:16 -07:00
markjcrane b77b9c75f8 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-02-03 19:02:30 -07:00
markjcrane c2adbaa023 In vars.xml switch from hostname to the switchname. 2016-02-03 19:02:10 -07:00
FusionPBX 64ebccbd70 Merge pull request #1426 from mafoo/BugFix-Phrases-Selected
Corrected selected statements
2016-02-03 10:46:35 -07:00