Commit Graph

5295 Commits

Author SHA1 Message Date
blackc2004 27eb41972a Update y000000000037.cfg 2015-11-19 13:47:17 -08:00
blackc2004 f8cdb08250 Update y000000000035.cfg 2015-11-19 13:47:05 -08:00
blackc2004 5d0bb6c6de Update y000000000029.cfg 2015-11-19 13:46:37 -08:00
blackc2004 dcdf04d1e0 Merge remote-tracking branch 'fusionpbx/master' 2015-11-09 08:03:02 -08:00
blackc2004 140691db6f Merge remote-tracking branch 'origin/patch-1' 2015-11-09 08:02:25 -08:00
FusionPBX 15c2d54778 Merge pull request #1226 from moteus/follow_me_lua
Update follow_me.lua/call_forward.lua
2015-11-09 08:00:57 -07:00
FusionPBX 20eff9739a Merge pull request #1228 from mafoo/Bugfix-destination_edit
Bugfix destination_edit.php
2015-11-09 07:53:35 -07:00
Alexey Melnichuk 0e5b10d265 Update. call_forward.lua script
Fix. Set outbound caller id
Remove. Nested if
Use. cache class
Use. database class
2015-11-09 16:55:35 +03:00
Alexey Melnichuk 4c6811ffb8 Merge branch 'master' into follow_me_lua 2015-11-09 16:45:57 +03:00
Matthew Vale b3133f1eb1 missed none when pasting new code 2015-11-09 11:49:09 +00:00
Matthew Vale 131954137a Bugfix for destinations_edit.php
the tr_fax_detecion segment is optional so causes the onchange_type javascript to stop when it can't find it.
2015-11-09 11:47:15 +00:00
markjcrane a01a61e02c Remove /scripts from the path as it is redundant. 2015-11-08 13:40:08 -07:00
markjcrane 4ef7b049b0 Change base_dir to script_dir in <param name="script-directory" value="$${script_dir}/scripts/?.lua"/> 2015-11-08 07:44:45 -07:00
markjcrane 7cda301460 Add the following to all yealink provisioning templates.
account.1.nat.udp_update_enable = 3
In order to setup keep alive with sip notify.
2015-11-08 07:30:29 -07:00
markjcrane cca5c118df Secure the device mac address when the user doesn't have permission to change it. 2015-11-05 12:25:30 -07:00
markjcrane d39d58e6f6 Show device copy when user has device_add permission. 2015-11-05 12:11:53 -07:00
markjcrane 2750163d6d Move the description inside the permission condition and adjust 2 of the permissions. 2015-11-05 12:05:49 -07:00
markjcrane ef5a1eb455 Add new device permissions for mac address, template, label, vendor, model, firmware, and description. 2015-11-05 11:56:50 -07:00
markjcrane 5f7fd707c2 Fix the syntax by adding a missing ). 2015-11-05 11:24:28 -07:00
markjcrane 78b65831ec Add new device permissions device_username_password, device_alternate, device_enable. 2015-11-05 11:19:22 -07:00
Alexey Melnichuk ddaae7eec5 Update follow_me.lua
1. Use `cache` class so now it generates memcache events.
2. Do not use nested if (simplify code)
3. Use local variables.
4. Remove redundant checks.
2015-11-05 18:02:08 +03:00
markjcrane f87195204c Add the provision.path.text to default settings. 2015-11-04 20:01:11 -07:00
markjcrane 503461fca1 Change switch.provision.dir to provision.path.text. This indicates where to save the provisioning files on the file system. 2015-11-04 19:59:27 -07:00
markjcrane d3d62295d6 This renables polycom line key value of 2 would use 2 keys or a value of 3 would be 3 keys. 2015-11-03 19:28:10 -07:00
markjcrane e7530d8bec Add the functions to the path for channel_utils. 2015-11-03 16:44:51 -07:00
markjcrane 758d6b9f53 Add functions to the config require 'resources.functions.config' 2015-11-03 16:41:59 -07:00
FusionPBX 8de13769f0 Merge pull request #1224 from mafoo/Enhance-Time_Conditions
Enhance time conditions
2015-11-03 14:29:33 -07:00
Matthew Vale b3937d9410 added England bank holidays
currently it is not possible to integrate floating days (Christmas falling on a Sunday causing Tuesday to become holiday)
or Easter, as it isn't a fixed rule for what day
2015-11-03 15:15:33 +00:00
Matthew Vale 8e9c961a18 bugfix when retrieving region 2015-11-03 14:34:29 +00:00
Matthew Vale f53cf0ec41 initial rewrite of time_conditions 2015-11-03 14:23:52 +00:00
FusionPBX 616e6c1cde Merge pull request #1223 from mafoo/bugfix_languages.lua
fix to use phrases_dir
2015-11-03 04:40:12 -07:00
Matthew Vale b073d792d5 fix to use phrases_dir
changed phrases_dir to be dealt with inside app_defaults.php so it is retrieved once like the other paths
2015-11-03 11:16:05 +00:00
FusionPBX 747722da5b Merge pull request #1179 from moteus/call_flow
Fix small bugs and clear code in call_flow.
2015-11-03 03:30:02 -07:00
FusionPBX e008fbd8c2 Merge pull request #1186 from moteus/cache_emit_event
Add. `cache` class emit MEMCACHE events.
2015-11-03 03:19:36 -07:00
FusionPBX 62fcbb925a Merge pull request #1176 from moteus/callcenter_config_clear_cache
Fix. Clear the cache when callcenter config changed.
2015-11-03 03:17:26 -07:00
FusionPBX 5ca779d08c Merge pull request #1202 from moteus/show_channels
Fix. Use `api show channels like` did not work on fusion with BDR.
2015-11-03 03:13:27 -07:00
FusionPBX 9c13a321b6 Merge pull request #1219 from mafoo/bugfix_voicemail
Bugfix voicemail
2015-11-02 20:18:58 -07:00
FusionPBX 9ea40a45d1 Merge pull request #1218 from mafoo/bugfix_languages.lua
changed phrases_dir to be dealt with inside app_defaults.php so it is retrieved once like the other paths
2015-11-02 11:15:28 -07:00
Matthew Vale 35762486e1 reverted so branch is consistent for patch 2015-11-02 17:32:43 +00:00
Matthew Vale 8337af0fd4 corrected references to voicemail_dir
changed from $_SESSION['switch']['storage']['dir'].'/voicemail/' to correctly use $_SESSION['switch']['voicemail']['dir']
added missing storage_type to app_defaults.php
2015-11-02 17:22:13 +00:00
Matthew Vale fee216cc13 changed phrases_dir to be dealt with inside app_defaults.php so it is retrieved once like the other paths 2015-11-02 09:53:42 +00:00
FusionPBX 6024364a40 Merge pull request #1216 from mafoo/bugfix_languages.lua
Bugfix languages.lua
2015-10-30 16:53:37 -06:00
Matthew Vale 8793159dad Fix. use settings for the phrases path rather than assuming 2015-10-30 16:16:56 +00:00
Mafoo 01a43f35fd Merge pull request #1 from fusionpbx/master
Merge from master
2015-10-30 16:04:26 +00:00
FusionPBX 82fcbbcbce Merge pull request #1210 from blackc2004/patch-8
Update extension_edit.php
2015-10-30 09:37:23 -06:00
FusionPBX 9c5fee3dc8 Merge pull request #1211 from blackc2004/patch-7
Update app_languages.php
2015-10-30 09:36:55 -06:00
FusionPBX b42f054e9e Merge pull request #1212 from blackc2004/patch-6
Update app_config.php
2015-10-30 09:36:30 -06:00
FusionPBX cd63a7910d Merge pull request #1213 from blackc2004/patch-9
Update extension.php
2015-10-30 09:31:53 -06:00
FusionPBX a555722874 Merge pull request #1214 from blackc2004/patch-10
Update directory.lua
2015-10-30 09:31:06 -06:00
FusionPBX 7f01982675 Merge pull request #1215 from moteus/phrase_ivr_menu
Fix. Get DTMF in IVR when using phrases.
2015-10-30 09:23:58 -06:00