Commit Graph

5301 Commits

Author SHA1 Message Date
FusionPBX 176523c1e2 Merge pull request #1224 from mafoo/Enhance-Time_Conditions
Enhance time conditions
2015-11-03 14:29:33 -07:00
Matthew Vale fbc9488c05 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 f70266d669 bugfix when retrieving region 2015-11-03 14:34:29 +00:00
Matthew Vale 81a5fc0db1 initial rewrite of time_conditions 2015-11-03 14:23:52 +00:00
FusionPBX dd12f60d45 Merge pull request #1223 from mafoo/bugfix_languages.lua
fix to use phrases_dir
2015-11-03 04:40:12 -07:00
Matthew Vale b9e8b3ef03 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 fd397f53c1 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 d937f29813 Merge pull request #1186 from moteus/cache_emit_event
Add. `cache` class emit MEMCACHE events.
2015-11-03 03:19:36 -07:00
FusionPBX 63a9865c5f 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 4a73bf880f 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 08f251d07c Merge pull request #1219 from mafoo/bugfix_voicemail
Bugfix voicemail
2015-11-02 20:18:58 -07:00
FusionPBX 778acc93ff 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 c1b5895219 reverted so branch is consistent for patch 2015-11-02 17:32:43 +00:00
Matthew Vale c47908f4e4 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 3a9f2b0f24 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 35d5215c90 Merge pull request #1216 from mafoo/bugfix_languages.lua
Bugfix languages.lua
2015-10-30 16:53:37 -06:00
Matthew Vale 63bf36ac81 Fix. use settings for the phrases path rather than assuming 2015-10-30 16:16:56 +00:00
Mafoo 482b7c43f3 Merge pull request #1 from fusionpbx/master
Merge from master
2015-10-30 16:04:26 +00:00
FusionPBX ee8166d918 Merge pull request #1210 from blackc2004/patch-8
Update extension_edit.php
2015-10-30 09:37:23 -06:00
FusionPBX b829588746 Merge pull request #1211 from blackc2004/patch-7
Update app_languages.php
2015-10-30 09:36:55 -06:00
FusionPBX e8d95a94e3 Merge pull request #1212 from blackc2004/patch-6
Update app_config.php
2015-10-30 09:36:30 -06:00
FusionPBX 0965c3e929 Merge pull request #1213 from blackc2004/patch-9
Update extension.php
2015-10-30 09:31:53 -06:00
FusionPBX 8770332b5f Merge pull request #1214 from blackc2004/patch-10
Update directory.lua
2015-10-30 09:31:06 -06:00
FusionPBX 3fe644c474 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 82d22322df Fix. Get DTMF in IVR when using phrases. 2015-10-30 17:33:26 +03:00
markjcrane e701b5a1b3 MWI only turn on the light for new messages. 2015-10-29 17:34:39 -06:00
blackc2004 3fbec7c0f1 Update directory.lua 2015-10-29 12:26:06 -07:00
blackc2004 cdb016277d Update extension.php 2015-10-29 12:24:55 -07:00
blackc2004 292b754cb1 Update extension_edit.php 2015-10-29 12:24:24 -07:00
blackc2004 e2c3717556 Update app_languages.php 2015-10-29 12:23:49 -07:00
blackc2004 3c4a7744e4 Update app_config.php 2015-10-29 12:22:40 -07:00
markjcrane 76994ded8a Update translation for de-at. 2015-10-29 09:43:57 -06:00
markjcrane 78d6b30e53 Enable the directory for speed dial and enterprise categories. 2015-10-28 22:07:43 -06:00
markjcrane 8db9682002 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 1a9bf9920d Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-27 16:32:33 -06:00
markjcrane d066049d48 Remove user group from call block until there is per extension call block. 2015-10-27 16:32:20 -06:00
FusionPBX c04bbde2d1 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 1a1a05bc61 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 b9c7b13e21 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 fb0aea39df Update comment. 2015-10-26 12:27:14 +03:00
Alexey Melnichuk e3a324a302 Use database class 2015-10-25 10:05:44 +03:00
Alexey Melnichuk 8b931e7751 Merge branch 'master' into show_channels 2015-10-25 10:00:05 +03:00
Alexey Melnichuk 54aca55836 Use local variables. 2015-10-25 09:57:20 +03:00
Alexey Melnichuk 55318897f6 Merge branch 'master' into intercept_load_balance
# Conflicts:
#	resources/install/scripts/resources/functions/database.lua
2015-10-25 09:34:19 +03:00
markjcrane 51087791e6 Play the message number first then the caller id number. 2015-10-24 21:12:43 -06:00
markjcrane cdd4cb5ccd Add vm_say_caller_id_number option for true or false. 2015-10-24 21:00:22 -06:00
markjcrane 448b681b91 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-10-24 20:09:54 -06:00
markjcrane 09e645ac2b Add voicemail caller id number announce as iterated. 2015-10-24 20:09:36 -06:00
FusionPBX 494afd97ca Merge pull request #1152 from moteus/database_class
Add. database class
2015-10-24 19:50:43 -06:00
markjcrane 5eb280423c Move the time condition group to a location to make better use of the vertical space. 2015-10-24 18:55:24 -06:00