blackc2004
|
387157b689
|
Update y000000000036.cfg
|
2016-01-05 11:20:33 -08:00 |
|
blackc2004
|
ef8ba8b92b
|
Update y000000000029.cfg
|
2016-01-05 11:19:08 -08:00 |
FusionPBX
|
d03573fa6e
|
Merge pull request #1365 from blackc2004/patch-26
Update y000000000005.cfg
|
2016-01-05 11:40:50 -07:00 |
|
FusionPBX
|
e14d876acb
|
Merge pull request #1366 from blackc2004/patch-25
Update y000000000035.cfg
|
2016-01-05 11:40:40 -07:00 |
|
FusionPBX
|
4765830dd6
|
Merge pull request #1367 from blackc2004/patch-28
Update y000000000029.cfg
|
2016-01-05 11:40:07 -07:00 |
|
FusionPBX
|
799e02d090
|
Merge pull request #1364 from blackc2004/patch-27
Update y000000000046.cfg
|
2016-01-05 11:39:58 -07:00 |
|
FusionPBX
|
64298527b7
|
Merge pull request #1368 from blackc2004/patch-29
Update y000000000035.cfg
|
2016-01-05 11:39:29 -07:00 |
|
FusionPBX
|
411c18477a
|
Merge pull request #1369 from blackc2004/patch-30
Update xml_cdr_search.php
|
2016-01-05 11:39:07 -07:00 |
|
FusionPBX
|
610d45c355
|
Merge pull request #1370 from blackc2004/patch-31
Update xml_cdr.php
|
2016-01-05 11:38:48 -07:00 |
|
FusionPBX
|
9f2ef55808
|
Merge pull request #1372 from blackc2004/patch-32
Update app_config.php
|
2016-01-05 11:38:08 -07:00 |
|
FusionPBX
|
78a27368d7
|
Merge pull request #1371 from blackc2004/patch-34
Update emails.php
|
2016-01-05 11:37:56 -07:00 |
|
blackc2004
|
0c7b49ed29
|
Update emails.php
|
2016-01-05 10:21:55 -08:00 |
|
blackc2004
|
d4e3035880
|
Update app_config.php
|
2016-01-05 10:20:12 -08:00 |
|
blackc2004
|
8a293a1c21
|
Update xml_cdr.php
|
2016-01-05 10:13:54 -08:00 |
|
blackc2004
|
68d260921c
|
Update xml_cdr_search.php
|
2016-01-05 10:12:39 -08:00 |
|
blackc2004
|
37379daf38
|
Update y000000000035.cfg
|
2016-01-05 09:58:00 -08:00 |
|
blackc2004
|
e6fa94fbf7
|
Update y000000000029.cfg
|
2016-01-05 09:54:38 -08:00 |
|
blackc2004
|
5b61d29749
|
Update y000000000046.cfg
|
2016-01-05 09:53:43 -08:00 |
|
blackc2004
|
95f0ca4207
|
Update y000000000005.cfg
|
2016-01-05 09:51:58 -08:00 |
|
blackc2004
|
52b71faa5f
|
Update y000000000035.cfg
|
2016-01-05 09:50:10 -08:00 |
|
FusionPBX
|
c9a7278b53
|
Merge pull request #1362 from mafoo/Enhance-Dashboard
Updated ring_group_forward for user dashboard
|
2016-01-05 09:46:48 -07:00 |
Matthew Vale
|
6788adeae4
|
Updated ring_group_forward for user dashboard
this is so the user_dashboard consistently shows the ring group name (as
used elsewhere to refer to a ring group)
|
2016-01-05 15:17:20 +00:00 |
|
markjcrane
|
b9eae2a150
|
Another adjustment to the xml.
|
2016-01-04 19:33:02 -07:00 |
|
markjcrane
|
8ee96d3136
|
A few more xml adjustments for the IVR Menu and add a desription attribute for each IVR option.
|
2016-01-04 19:29:39 -07:00 |
|
markjcrane
|
23460f69c5
|
Fix a small bug with the ivr.
|
2016-01-04 19:19:39 -07:00 |
|
markjcrane
|
7885323d37
|
Update the ivr menu to use memcache with the uuid as part of the key.
|
2016-01-04 19:09:29 -07:00 |
|
markjcrane
|
499c3c8928
|
Continue work to make IVR menu work from XML handler.
|
2016-01-04 19:05:31 -07:00 |
|
markjcrane
|
8d604061f5
|
Rename ivr.lua to ivr.conf.lua.
|
2016-01-04 19:03:28 -07:00 |
|
markjcrane
|
85e28ae838
|
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
|
2016-01-04 17:16:27 -07:00 |
|
markjcrane
|
aac6d4ff96
|
Using phrase uuid instead of the phrase name reason is this prevents the phrase from breaking when the phrase name is changed.
|
2016-01-04 17:16:14 -07:00 |
|
FusionPBX
|
c9396f93ea
|
Merge pull request #1360 from fusionpbx/revert-1355-Merge-4.0_BugFixes
Revert "cherry picked changes from 4.0 branch"
|
2016-01-04 13:14:04 -07:00 |
|
FusionPBX
|
f208e06a9d
|
Revert "cherry picked changes from 4.0 branch"
|
2016-01-04 13:13:48 -07:00 |
|
markjcrane
|
9054881d5a
|
FusionPBX source coding standard uses tabs instead of spaces for indentation.
|
2016-01-04 13:04:51 -07:00 |
|
markjcrane
|
e823b991d1
|
Update destination.lua some preparation to extend it further.
|
2016-01-04 12:56:50 -07:00 |
|
FusionPBX
|
f83c7a0032
|
Merge pull request #1358 from moteus/ring_group_dest_uuid
Fix. Definition of `uuid` function in destination.lua.
|
2016-01-04 12:46:15 -07:00 |
Alexey Melnichuk
|
f50a535e02
|
Fix. Definition of `uuid` function in destination.lua.
|
2016-01-04 09:56:06 +03:00 |
|
markjcrane
|
8c52b1167f
|
Change lang_path to phrases_dir in languages.lua.
|
2016-01-03 00:42:40 -07:00 |
|
markjcrane
|
16ca1ebb99
|
Rename ring_member.lua to destination.lua.
|
2016-01-02 16:38:59 -07:00 |
|
markjcrane
|
4be9932c45
|
Remove the + from the format_phone function.
|
2016-01-02 16:22:19 -07:00 |
|
markjcrane
|
5f3cc182fe
|
Move ring_member.lua to ring_groups/resources/scripts/ring_member.lua.
|
2016-01-02 13:21:34 -07:00 |
|
markjcrane
|
98355e8084
|
Improve ring_member.lua with consistent indentation, notes, and more if session:ready to prevent errors.
|
2016-01-02 13:09:28 -07:00 |
|
FusionPBX
|
4cbd95368f
|
Merge pull request #1354 from mafoo/BugFix-Dashboard_Redirect
BugFix-Dashboard_Redirect
|
2016-01-01 18:54:12 -07:00 |
|
FusionPBX
|
c14c5ad900
|
Merge pull request #1355 from mafoo/Merge-4.0_BugFixes
cherry picked changes from 4.0 branch
|
2015-12-31 09:40:45 -07:00 |
|
FusionPBX
|
e7cebd1be5
|
Merge pull request #1357 from mafoo/BugFix-Install-2
Bugfix install 2
|
2015-12-31 09:40:06 -07:00 |
|
Matthew Vale
|
1fd3443ee6
|
removed redundant code
|
2015-12-31 16:33:19 +00:00 |
|
Matthew Vale
|
d5e1de163c
|
fixed missing on new Exception
|
2015-12-31 16:32:51 +00:00 |
|
Matthew Vale
|
4fdb6e9916
|
cherry picked changes from 4.0 branch
|
2015-12-31 10:11:31 +00:00 |
|
Matthew Vale
|
408f76e178
|
added missing / in path and set redirect correctly
|
2015-12-31 09:40:59 +00:00 |
|
FusionPBX
|
afbd7a93af
|
Merge pull request #1352 from mafoo/BugFix-Install
added correct bits detection
|
2015-12-30 10:46:50 -07:00 |
|
Matthew Vale
|
ff2e2bd396
|
correction for button name
|
2015-12-30 16:58:39 +00:00 |