Commit Graph

6764 Commits

Author SHA1 Message Date
markjcrane 45fddd1bef Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-06-13 17:52:52 -06:00
markjcrane b6aaebb7b3 Add the missing curly brackets. 2016-06-13 17:52:35 -06:00
Mafoo 54b0b3fb9a BugFix-default moh for source mode (#1657)
populate the default moh for switch source installs
set comment indents as preferred
2016-06-13 17:48:36 -06:00
markjcrane 91562a9e41 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-06-13 17:45:01 -06:00
markjcrane 70ab3e62f8 Update app_defaults for muisc on hold so it reads local_stream.conf.xml and loads the information in the database. Remove music_on_hold_category. 2016-06-13 17:44:15 -06:00
reliberate 01964bb5ab Command: Remove blank option from handler select element. 2016-06-13 16:58:52 -06:00
reliberate b992addd0b Voicemail Greetings: Fix style effecting radio button padding. 2016-06-13 15:27:57 -06:00
reliberate b0e77d1295 MOH: Fix style issue during playback. 2016-06-13 14:53:17 -06:00
reliberate 931b30db24 Call Flows: Restore missing quote in app_languages.php. 2016-06-13 13:05:55 -06:00
FreeMe d8ffd18af4 Update app_languages.php (#1656)
Corrected 'uk' field to Ukraine not english.
2016-06-13 10:58:23 -06:00
FreeMe 4824aee451 Update app_languages.php (#1655)
Filled in Romanian and UK fields
2016-06-13 07:36:55 -06:00
Len 91c3c0d521 updated README.md (#1653)
* Update README.md

* Update README.md
2016-06-13 07:34:38 -06:00
FusionPBX a3d8270e30 Update call_flows.php
Update call_flows.php rename anti to alternate.
2016-06-12 14:24:35 -06:00
FusionPBX 3ad7fe027c Update call_flow.lua
Call flow feature code update to play the right audio file.
2016-06-12 14:14:52 -06:00
FusionPBX a66324a242 Update call_flow.lua
Inside call_flow.lua rename anti to alternate.
2016-06-12 14:02:57 -06:00
FusionPBX 1003e70dd3 Update index.php
Disable the auto login if the default setting-> adminer -> auto_login is not set.
2016-06-12 00:15:43 -06:00
FusionPBX 11efb35712 Update xml_cdr.php
In the xml_cdr class change method xml_array from $row to $key. Key is more descriptive and should prevent bugs in the future.
2016-06-11 16:17:35 -06:00
FreeMe 0b2506dad1 Update app_languages.php (#1651)
Multilingual support for new features
2016-06-11 15:57:01 -06:00
FreeMe 9888b60334 Update {$mac}.xml (#1647)
Full configuration Linksys 942 - also disabled CF settings so that it dials *72 to mange from server rather than the phone directly
2016-06-11 15:24:32 -06:00
FreeMe b046094042 Update call_flow_edit.php (#1652)
Allows the page to become multilingual
2016-06-11 15:23:49 -06:00
FusionPBX 665273d0c7 Update app_languages.php 2016-06-11 11:08:21 -06:00
FusionPBX fad5fcd239 Update app_languages.php
Set temporary transltations for label-sound and label-alternate_sound
2016-06-11 10:19:16 -06:00
FusionPBX dcb9a655cd Update call_flow.lua
Rename the variables in call_flow.lua to match. New variables call_flow_sound and call_flow_alternate_sound.
2016-06-11 10:02:31 -06:00
FusionPBX 84ee791aea Update call_flow_edit.php
Fix the call flow alternate sounds so it saves to the database and its value is displayed when loading the form.
2016-06-11 09:49:22 -06:00
FusionPBX 5b9a1aadf2 Update call_flow_edit.php
Correct the SQL insert and updates and put the call flow sound and alternate sound into the order that matches the web interface.
2016-06-11 09:29:56 -06:00
FusionPBX 21538da340 Update app_languages.php
Change the labels to sound and alternate_sound.
2016-06-11 09:14:30 -06:00
FusionPBX cb96cb3362 Update call_flow_edit.php
Rename the call flows using anti to alternate.
2016-06-11 09:06:12 -06:00
FusionPBX b7a8e372ae Update app_config.php
Change call_flow_sound_on to call_flow_sound. Call flow anti to alternate and call_flow_sound_off to call_flow_alternate_sound.
This changes make it more consistent with the front end. For the few developers that have the call_flow_sound_on and call_flow_sound off I offer the these alter table statements.
ALTER TABLE v_call_flows RENAME COLUMN call_flow_sound_on to call_flow_sound;
ALTER TABLE v_call_flows RENAME COLUMN call_flow_sound_off to call_flow_alternate_sound;
2016-06-11 09:04:42 -06:00
Alexey Melnichuk 6095609c5a Add. Support sound prompts on call flow. (#1645)
This file uses new way to load recordings from DB.
2016-06-11 07:33:16 -06:00
FusionPBX c6b15a6537 Update xml_cdr_inc.php
Only check the select count if there is a default setting that instructs it to do so as it is slow on a large number of records.
2016-06-11 07:15:11 -06:00
FreeMe 5c7fcd1d9e Update {$mac}.xml (#1650)
Fix did not {$,,,}  the adminpassword field, changed and confirmed working
2016-06-10 23:03:49 -06:00
FreeMeUK 3a99301d65 Create {$mac}.xml (#1649)
A Linksys spa941 will accept the linksys942 file
2016-06-10 18:55:34 -06:00
Chris Black 96e1ad2cf4 Add ability for directory to use mod_flite or mod_cepstral (#1644) 2016-06-10 16:07:11 -06:00
FusionPBX e75a09d01d Update device_dashboard.php
Fix device key dashboard edit only.
2016-06-10 12:23:01 -06:00
markjcrane c30efdaa21 Change the permission name from device_username to device_user. 2016-06-10 11:02:17 -06:00
reliberate bf03b763ea Adminer: Fix and simplify previous auto-login feature (controlled by Default Setting). 2016-06-09 14:13:10 -06:00
markjcrane 227e7900ab Time to start using jsonb in the xml cdr table. 2016-06-08 19:25:51 -06:00
FusionPBX dd61071ddf Update index.php
Comment out the adminer auto login.
2016-06-08 19:14:43 -06:00
markjcrane 210d3d2d4a Update adminer.php. 2016-06-08 18:52:06 -06:00
FusionPBX feef9337e0 Update adminer.php
More work on adminer.
2016-06-08 18:41:32 -06:00
FusionPBX 4e2266a328 Update adminer.php
Update adminer.php
2016-06-08 18:38:27 -06:00
FusionPBX 13b8d524a3 Update adminer.php
Update Adminer to 4.2.5
2016-06-08 18:32:06 -06:00
FusionPBX 80c75554db Update template.php
Remove a character that accidently made it in a commit.
2016-06-08 17:32:08 -06:00
FusionPBX 3668f9584b Update template.php
Change the default logo.
2016-06-08 17:28:01 -06:00
Mafoo fb4ccbc6c7 BugFix Convert call_center to ringback class (#1637) 2016-06-08 15:40:24 -06:00
Mafoo 26a04ae0ab BugFix-Double default moh (#1639)
because app_defaults now deals with detecting the default music we don't
need to forcefully put it on the list
if default is detected name it using the $text['opt-default']
2016-06-08 15:40:05 -06:00
Mafoo 209f2d227c BugFix-remove-legacy-warning (#1638)
changed switch_music_on_hold->select to be more inline of usage
changed extension_edit to use new format
changed call_center_queue_edit to use new format while
https://github.com/fusionpbx/fusionpbx/pull/1637 is in testing
2016-06-08 15:15:36 -06:00
Mafoo c2850c7b58 BugFix-bad ref to $db in switch_recordings (#1636) 2016-06-08 13:43:10 -06:00
Mafoo d0882476a3 BugFix-moh class bad ref (#1635)
fixed incorrect referenced to the switch_recordings class
2016-06-08 13:27:23 -06:00
Mafoo 1118fd438b BugFix-problem with detect_switch (#1633) 2016-06-08 08:28:44 -06:00