dbxe/fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
5,814 Commits 3 Branches 10 Tags
ab17ff48f4e560708e00df6bf9e66950474efcef
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
markjcrane ab17ff48f4 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-13 16:27:28 -07:00
markjcrane 73b3afe506 Add an option for toll allow and call group select list. 2016-01-13 16:26:55 -07:00
FusionPBX 978f2fbd89 Merge pull request #1383 from moteus/move_fax_scripts 
Change. Move `fax_queue_*` scripts to `app/fax/resources/scripts`
 2016-01-13 00:23:04 -07:00
markjcrane d513ddf1ea Complete adding application hangup. 2016-01-12 23:16:45 -07:00
markjcrane b422117500 Add hangup to the destination select list. 2016-01-12 21:07:49 -07:00
markjcrane 89dd11cf3e Comment out the languages not in use until they are needed. 2016-01-12 21:04:39 -07:00
markjcrane 605498c114 Remove the round brackets as they are not needed with this dialplan. 2016-01-12 20:54:48 -07:00
markjcrane 37051d8c1d Remove the rss feed from the Mitel template. 2016-01-12 20:50:48 -07:00
markjcrane c1266f3e00 Remove the line after ?> 2016-01-12 20:48:22 -07:00
markjcrane 06932b85f7 Show when we are clearing the cache for *78 or *79. 2016-01-12 19:34:57 -07:00
markjcrane fe9c46c0d0 Change array extensins to contact_extensions and add a new extension array. Remove trailing spaces. And add a new cisco 79xx directory called Our Phones. 2016-01-12 02:42:59 -07:00
markjcrane 2a04a88b69 Add dsn_callcenter and improve the indentation. 2016-01-12 01:48:11 -07:00
markjcrane 8ac40de88f Set the mac address variable. 2016-01-11 07:58:57 -07:00
markjcrane a35d442dfa Change the vendor ID hex number to lower case and re-use prov object that already exists. 2016-01-09 11:50:49 -07:00
markjcrane ba67594456 Method get_vendor add vendor mitel and put them in alphabetical order. 2016-01-09 11:37:40 -07:00
markjcrane c076becb21 Use the format_mac method in the provision class. 2016-01-09 11:22:10 -07:00
markjcrane 7c9c6acc82 Continued work on formatting the mac address for upper or lower case. 2016-01-09 11:10:37 -07:00
markjcrane 40b665fefa Device File download format the mac address file name according to the requirements of the vendor. 2016-01-09 09:52:27 -07:00
markjcrane 3fddd940ec Add a missing keyword function. 2016-01-09 09:46:43 -07:00
markjcrane 97ab1c9c87 Add a new method call format_mac to make the code more reusable. 2016-01-09 09:43:14 -07:00
markjcrane 878571c927 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-09 09:29:53 -07:00
markjcrane 01edbb30b8 Set the mitel mac address to upper case. 2016-01-09 09:29:39 -07:00
FusionPBX f2444744fb Merge pull request #1380 from daniel-lucio/patch-1 
Bill the incoming call
 2016-01-08 22:54:33 -07:00
markjcrane ac09089f17 Fix the PostgreSQL query in cidlookup.conf.xml. 2016-01-08 18:15:45 -07:00
markjcrane e0e28180bc Update the name of the dialplan. 2016-01-08 14:13:00 -07:00
markjcrane 8a76b00d88 Add a dialplan for mod_cidlookup. 2016-01-08 14:05:59 -07:00
markjcrane 41325c0c7a Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-06 11:10:37 -07:00
FusionPBX 5d15710d37 Merge pull request #1375 from blackc2004/master 
fix another directory setting url
 2016-01-06 10:55:16 -07:00
FusionPBX 218c0ca186 Merge pull request #1373 from blackc2004/master 
fix directory setting url typo
 2016-01-05 13:24:54 -07:00
markjcrane 371368a608 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-05 13:19:18 -07:00
markjcrane 1a49780757 Fix the FAX retry email. 2016-01-05 13:19:02 -07: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
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
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
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
FusionPBX afbd7a93af Merge pull request #1352 from mafoo/BugFix-Install 
added correct bits detection
 2015-12-30 10:46:50 -07:00
markjcrane 036eb31031 Add odbc-dsn to fifo.conf.xml 2015-12-29 23:47:20 -07:00
markjcrane d839b78bc0 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-29 14:54:09 -07:00
markjcrane 60cfbf3fe0 Trim the default codecs slightly. 2015-12-29 14:53:53 -07:00
FusionPBX 26102d2537 Merge pull request #1345 from moteus/gitignore 
Add. `.gitignore` file.
 2015-12-28 12:09:39 -07:00
FusionPBX 4e5113b832 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
FusionPBX 02ecbe14cc 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 cb410c005a 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
FusionPBX 4a18b554e3 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
markjcrane ac87b19b4f Change the .wav to ${record_ext} in the internal sip profiles. 2015-12-23 13:23:54 -07:00
markjcrane 7cc88761aa Add record_ext to the recordings.lua. 2015-12-23 12:02:14 -07:00
markjcrane 91a0f1370e Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-22 21:30:55 -07:00
markjcrane d8ca3245c5 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 99124df423 Merge pull request #1340 from mafoo/Enhance-Intercept-Polycom 
Intercept mode for Polycom
 2015-12-22 21:14:38 -07:00
FusionPBX e060e53783 Merge pull request #1341 from moteus/directory_acl_directory 
Fix. Generate XML for mod_directory.
 2015-12-22 20:54:25 -07:00
markjcrane 56499a6cc3 Fix the ring back on the XML handler -> callcenter.conf.lua. 2015-12-21 23:31:46 -07:00
markjcrane b721572c56 Add session cookie httponly and set it to true. 2015-12-21 20:52:54 -07:00
markjcrane d6c03f19e9 Remove this->write_debug from the recursive functions. 2015-12-21 04:31:44 -07:00
markjcrane cf7fc6954d Remove 'protected' from the function. 2015-12-21 04:28:23 -07:00
FusionPBX f156805c8c Merge pull request #1339 from mafoo/Enhance-resouce/functions.php 
migrated install_switch's recursive_* routines
 2015-12-21 04:25:29 -07:00
markjcrane 9b5a389eeb Shorten the Sofia User Agent to reduce SIP header size. User Agent by default includes version and git version number. 2015-12-21 03:41:37 -07:00
markjcrane f960275be8 Reduce the size of the SIP header by removing the sip_h_X-Tag if its needed the administrator can add it. 2015-12-21 03:02:52 -07:00
markjcrane 0deecbe701 Move the access controls to the new resources/classes/text translation class. 2015-12-21 00:52:40 -07:00
markjcrane 2689f518d2 Comment out the translation procedural code for access_control_node_edit.php. 2015-12-21 00:48:42 -07:00
markjcrane 16e29df2c7 Fix a problem with xml_cdr/app_languages.php. 2015-12-21 00:02:50 -07:00
markjcrane 8fa89b23e3 Remove a few more line from upgrade/index.php. 2015-12-20 23:04:12 -07:00
markjcrane 1d80b00ea1 Remove upgrade switch from advanced -> upgrade page. The work it did is handled by app/scripts/resources/classes/scripts.php and app_defaults.php calls it. So when running Advanced -> Upgrade -> App Defaults the scripts app_defaults.php will copy the scripts and rewrite the config.lua. 2015-12-20 23:01:28 -07:00
markjcrane 2c2d49a4d4 Set the $db as a global variable in the class. 2015-12-20 22:54:08 -07:00
markjcrane dd9e225fa5 Use the system function for recursive copy. 2015-12-20 22:52:40 -07:00
markjcrane 2817c536db Fix a problem caused with a search and replace on the correct_path method. 2015-12-20 22:50:33 -07:00
markjcrane 9287772a4b Add app/scripts to add a new scripts class and app_defaults to copy the lua scripts and write the config.lua. 2015-12-20 22:47:48 -07:00
markjcrane 4b7e7fce06 Minor adjustments. 2015-12-20 22:46:52 -07:00
markjcrane 93dd62c363 Test if email_validate function exists and fix change the indentation from spaces to tabs. 2015-12-20 22:36:34 -07:00
markjcrane fd761f7432 Add dialplan domain_uuid is null. 2015-12-20 01:46:30 -07:00
markjcrane 80d0a7bdc4 Add all domain users to XML handler.directory.domain. 2015-12-20 01:01:52 -07:00
markjcrane a2a98ee036 Fix the app/xml_cdr/app_languages.php and remove the include ot the import when viewing xml cdr. 2015-12-19 22:04:05 -07:00
markjcrane 6d700faaa1 Add one line between each function. 2015-12-19 15:00:10 -07:00
markjcrane b822c305c7 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-19 14:55:42 -07:00