Commit Graph

6486 Commits

Author SHA1 Message Date
FusionPBX 1f5cecf048 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 725876a0e8 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 98f0389947 Another adjustment to the xml. 2016-01-04 19:33:02 -07:00
markjcrane 31a395ab45 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 aa384869cc Fix a small bug with the ivr. 2016-01-04 19:19:39 -07:00
markjcrane 752a5acf8b Update the ivr menu to use memcache with the uuid as part of the key. 2016-01-04 19:09:29 -07:00
markjcrane 451b106c1e Continue work to make IVR menu work from XML handler. 2016-01-04 19:05:31 -07:00
markjcrane 2c22aea566 Rename ivr.lua to ivr.conf.lua. 2016-01-04 19:03:28 -07:00
markjcrane 1a4dc2a658 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-04 17:16:27 -07:00
markjcrane 5daf58be72 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 e766f8a20b 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 f062ddf289 Revert "cherry picked changes from 4.0 branch" 2016-01-04 13:13:48 -07:00
markjcrane 724afd7c17 FusionPBX source coding standard uses tabs instead of spaces for indentation. 2016-01-04 13:04:51 -07:00
markjcrane 72c1e23d56 Update destination.lua some preparation to extend it further. 2016-01-04 12:56:50 -07:00
FusionPBX 394bdfdaef 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 bc9ffa431f Fix. Definition of `uuid` function in destination.lua. 2016-01-04 09:56:06 +03:00
markjcrane ccc44825e8 Change lang_path to phrases_dir in languages.lua. 2016-01-03 00:42:40 -07:00
markjcrane e83b727b7b Rename ring_member.lua to destination.lua. 2016-01-02 16:38:59 -07:00
markjcrane 122f0bb0a2 Remove the + from the format_phone function. 2016-01-02 16:22:19 -07:00
markjcrane 2c4101e8d0 Move ring_member.lua to ring_groups/resources/scripts/ring_member.lua. 2016-01-02 13:21:34 -07:00
markjcrane 89b2da603f 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 8512ba0182 Merge pull request #1354 from mafoo/BugFix-Dashboard_Redirect
BugFix-Dashboard_Redirect
2016-01-01 18:54:12 -07:00
FusionPBX 3135b42b90 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 90907dd68b Merge pull request #1357 from mafoo/BugFix-Install-2
Bugfix install 2
2015-12-31 09:40:06 -07:00
Matthew Vale a5bb20c774 removed redundant code 2015-12-31 16:33:19 +00:00
Matthew Vale 8137300bb5 fixed missing on new Exception 2015-12-31 16:32:51 +00:00
Matthew Vale 7c74d5cf48 cherry picked changes from 4.0 branch 2015-12-31 10:11:31 +00:00
Matthew Vale 1f2222d0a4 added missing / in path and set redirect correctly 2015-12-31 09:40:59 +00:00
FusionPBX 1b3e475b0f Merge pull request #1352 from mafoo/BugFix-Install
added correct bits detection
2015-12-30 10:46:50 -07:00
Matthew Vale 7bf32cd637 correction for button name 2015-12-30 16:58:39 +00:00
Matthew Vale a12e3f12b0 added correct bits detection 2015-12-30 16:54:36 +00:00
markjcrane 73b5c22b65 Add odbc-dsn to fifo.conf.xml 2015-12-29 23:47:20 -07:00
markjcrane 7d92c4e4a4 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-29 14:54:09 -07:00
markjcrane fe99226aa2 Trim the default codecs slightly. 2015-12-29 14:53:53 -07:00
FusionPBX 8abe2465d3 Merge pull request #1345 from moteus/gitignore
Add. `.gitignore` file.
2015-12-28 12:09:39 -07:00
FusionPBX 76213507f2 Merge pull request #1348 from moteus/operator_panel_cast_dialed_number
Fix. Do not cast dialed number to int in `Operator Panel` app.
2015-12-28 12:09:11 -07:00
Alexey Melnichuk e51b97fdf2 Fix. Do not cast dialed number to int in `Operator Panel` app.
This make problems with numbers starting with `0` e.g. (001)
Also this makes problem with too long numbers which does not fit to int type.
2015-12-28 15:48:18 +03:00
FusionPBX 2897ab7fdd Merge pull request #1343 from moteus/cache_reuse_esl
Change. Reuse same esl connection to send cache event and command.
2015-12-25 09:51:53 -07:00
FusionPBX 63a9a830d2 Merge pull request #1346 from moteus/fax_files_lang
Fix. Use `text` class in fax_files.php
2015-12-25 09:47:37 -07:00
Alexey Melnichuk 47871b1aa6 Fix. Use `text` class in fax_files.php 2015-12-25 11:48:17 +03:00
Alexey Melnichuk ad5002c57a Add. `.gitignore` file. 2015-12-25 10:33:41 +03:00
FusionPBX 1e08a48138 Merge pull request #1342 from moteus/active_calls_app_data
Change. Reduce too long app data in active calls app.
2015-12-24 22:31:42 -07:00
Alexey Melnichuk 8ac7d708d3 Change. Reuse same esl connection to send cache event and command.
Fix. Implicitly close esl connection after do cache command.
2015-12-24 13:19:53 +03:00
Alexey Melnichuk 8d8d8deceb Change. Reduce too long app data in active calls app.
Problem that when you have large app data (>7k in my case)
it takes over 2 pages to display only single channel.
2015-12-24 12:48:25 +03:00
markjcrane 3e09e32390 Change the .wav to ${record_ext} in the internal sip profiles. 2015-12-23 13:23:54 -07:00
markjcrane 6788b15184 Add record_ext to the recordings.lua. 2015-12-23 12:02:14 -07:00
markjcrane 6dea6e653c Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-22 21:30:55 -07:00
markjcrane 18e0ea3376 AND r.enabled = 'true' shows up on two lines change one to m.enabled and then add m.enabled to the second query. 2015-12-22 21:30:36 -07:00
FusionPBX e9f082deb5 Merge pull request #1340 from mafoo/Enhance-Intercept-Polycom
Intercept mode for Polycom
2015-12-22 21:14:38 -07:00
FusionPBX c9a9182e72 Merge pull request #1341 from moteus/directory_acl_directory
Fix. Generate XML for mod_directory.
2015-12-22 20:54:25 -07:00