Commit Graph

5372 Commits

Author SHA1 Message Date
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
Mafoo
85b01a6cab Merge pull request #2 from fusionpbx/master
Merge from master
2015-11-03 10:30:18 +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
Alexey Melnichuk
ec162d4238 Fix. Get DTMF in IVR when using phrases. 2015-10-30 17:33:26 +03:00
markjcrane
1c6f58ca03 MWI only turn on the light for new messages. 2015-10-29 17:34:39 -06:00
blackc2004
f8388cc8f4 Update directory.lua 2015-10-29 12:26:06 -07:00
blackc2004
5bc43a3fbd Update extension.php 2015-10-29 12:24:55 -07:00
blackc2004
9a47dc93fd Update extension_edit.php 2015-10-29 12:24:24 -07:00
blackc2004
89410fafa6 Update app_languages.php 2015-10-29 12:23:49 -07:00
blackc2004
080d136968 Update app_config.php 2015-10-29 12:22:40 -07:00
markjcrane
9429de42be Update translation for de-at. 2015-10-29 09:43:57 -06:00
markjcrane
3472707e96 Enable the directory for speed dial and enterprise categories. 2015-10-28 22:07:43 -06:00
markjcrane
3f2ccf8b23 Call forward presence ignore busy use a radio button to be uniform with the rest of the page. 2015-10-28 17:39:16 -06:00
markjcrane
b5fcb26e6d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-27 16:32:33 -06:00
markjcrane
aeeee2433e Remove user group from call block until there is per extension call block. 2015-10-27 16:32:20 -06:00
FusionPBX
e1e01dac90 Merge pull request #1206 from moteus/call_control_caller_id
Fix. Use same Outbound Caller info in extenstion and call control.
2015-10-26 12:05:04 -06:00
FusionPBX
4fc11ee492 Merge pull request #1209 from badcrc/master
Fix. Call intercept - a scenario where an outgoing call can be intercepted
2015-10-26 12:02:41 -06:00
koldoa
398fd08149 This fixed a scenario where an outgoing call can be picked up if the callee returns a 183 session progress with sdp 2015-10-26 17:17:02 +01:00
Alexey Melnichuk
7187766c11 Update comment. 2015-10-26 12:27:14 +03:00
Alexey Melnichuk
fdb6e818a9 Use database class 2015-10-25 10:05:44 +03:00
Alexey Melnichuk
fb3fb16002 Merge branch 'master' into show_channels 2015-10-25 10:00:05 +03:00
Alexey Melnichuk
8bbf8d6777 Use local variables. 2015-10-25 09:57:20 +03:00
Alexey Melnichuk
c55de4769c Merge branch 'master' into intercept_load_balance
# Conflicts:
#	resources/install/scripts/resources/functions/database.lua
2015-10-25 09:34:19 +03:00
markjcrane
bf3c374e13 Play the message number first then the caller id number. 2015-10-24 21:12:43 -06:00
markjcrane
8f67f2c4c1 Add vm_say_caller_id_number option for true or false. 2015-10-24 21:00:22 -06:00
markjcrane
99fb9dca10 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-24 20:09:54 -06:00
markjcrane
128bb6d857 Add voicemail caller id number announce as iterated. 2015-10-24 20:09:36 -06:00
FusionPBX
14f0eb66a8 Merge pull request #1152 from moteus/database_class
Add. database class
2015-10-24 19:50:43 -06:00
markjcrane
e393ea821a Move the time condition group to a location to make better use of the vertical space. 2015-10-24 18:55:24 -06:00
markjcrane
c89075cc44 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-24 16:39:37 -06:00