Matthew Vale
ea86150b33
Merge remote-tracking branch 'remotes/fusionpbx/master' into Install_Rewrite
...
Conflicts:
themes/enhanced/app_defaults.php
2015-11-20 10:50:27 +00:00
markjcrane
ae4a9d499f
Add style white-space: nowrap; to destination edit.
2015-11-19 22:42:33 -07:00
markjcrane
c4db1a48f0
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-11-19 22:32:52 -07:00
markjcrane
8db0341392
Time condition fix alignment of the arrow button by adding style nowrap and 3 pixel padding.
2015-11-19 22:32:34 -07:00
FusionPBX
899eaa797e
Merge pull request #1248 from blackc2004/master
...
vlan id's in yealink
2015-11-19 17:40:11 -08:00
markjcrane
8e048019d1
Add underscore between the words in the variables.
...
{$ldap_name_filter}
{$ldap_number_filter}
{$yealink_directory_setting_url}
2015-11-19 15:20:14 -07:00
FusionPBX
63a04ee4d5
Merge pull request #1250 from blackc2004/patch-12
...
Update y000000000028.cfg
2015-11-19 14:17:29 -08:00
blackc2004
958be5229e
Update y000000000036.cfg
2015-11-19 13:47:38 -08:00
blackc2004
27eb41972a
Update y000000000037.cfg
2015-11-19 13:47:17 -08:00
blackc2004
f8cdb08250
Update y000000000035.cfg
2015-11-19 13:47:05 -08:00
blackc2004
5d0bb6c6de
Update y000000000029.cfg
2015-11-19 13:46:37 -08:00
blackc2004
d5348db16d
Update y000000000028.cfg
2015-11-19 13:45:06 -08:00
FusionPBX
bb7d8f1718
Merge pull request #1244 from mafoo/BugFix_Provision
...
BugFix + Optional Enable extensions appear in directory
2015-11-19 09:40:27 -08:00
markjcrane
1d51571364
Change setting enable_background_images to background_image_enabled. This keeps the code consistent as 'enabled' is used throughout the code as a suffix. It also displays this setting next to the background_image setting.
2015-11-19 10:34:28 -07:00
FusionPBX
d6fc9d8701
Merge pull request #1243 from mafoo/Enhance-Theme
...
Optimized control of background images
2015-11-19 09:25:47 -08:00
FusionPBX
9069a229ce
Merge pull request #1245 from mafoo/Enhance-Sip_Profiles
...
Enhance sip profiles
2015-11-19 09:17:22 -08:00
FusionPBX
71c3b124b4
Merge pull request #1247 from mafoo/Enhance-Vars
...
Enhance vars
2015-11-19 09:15:44 -08:00
Matthew Vale
b4c6b7247d
Bugfix
2015-11-19 14:57:47 +00:00
Matthew Vale
d00f7a31e1
Added more ringer types
...
corrected reference to ssl dir to use $conf_dir
moved countries list out to its own file so it can be maintained easier
(and used by other apps)
2015-11-19 14:54:04 +00:00
Matthew Vale
6bc2186808
Added External IPv6 support
...
created the external IPv6 profile
2015-11-19 13:57:23 +00:00
Matthew Vale
26c749edb0
BugFix + Optional Enable extensions appear in directory
...
BugFix to respect http_domain_filter when auto creating
setting provision> directory_extensions populates $extensions as a
contacts array in provisioning
2015-11-19 13:17:01 +00:00
Matthew Vale
1e37ce5d3a
Optimized control of background images
...
It is now possible to have the default setting to enable background
images (via theme > enable_background_images) but have a domain turn it
off again as they want to use gradients or specific images.
Upgrading any installation that already has any background_image enabled
will cause enable_background_images to turn on to let it continue to
work.
Including support code that the new install system will utilize, should
not affect existing systems.
2015-11-19 11:33:07 +00:00
Matthew Vale
352f03198e
Resolved install issues, environment now in tact enough to run app_defaults
2015-11-18 17:30:43 +00:00
Matthew Vale
cc001acb4a
Merge remote-tracking branch 'remotes/fusionpbx/master' into Install_Rewrite
2015-11-18 17:08:37 +00:00
Matthew Vale
4a9b28505a
re-added file to file conflict
2015-11-18 17:05:10 +00:00
FusionPBX
ec3c9f125b
Merge pull request #1239 from mafoo/Enhance-Languages
...
Enhance languages
2015-11-18 08:51:03 -08:00
Matthew Vale
67b9706030
removed old installers
2015-11-17 17:02:39 +00:00
Matthew Vale
0f40a48c2b
Initial Rewrite
2015-11-17 17:02:38 +00:00
Mafoo
22d31bb5f5
Merge pull request #3 from fusionpbx/master
...
Merge from master
2015-11-17 16:59:50 +00:00
Matthew Vale
b8ead99a14
added support to name the languages
...
added remaining flags i have from the famfamfam set and renamed them to country names
2015-11-17 16:20:14 +00:00
markjcrane
44ec8d5942
Add voicemail record-silence-threshold variable and change the default threshold from 30 to 300.
2015-11-16 16:59:11 -07:00
Matthew Vale
900c1469b1
Enhancements to language support (for future use)
...
optimized the text.php to check the language code once, not every time
2015-11-16 09:41:34 +00:00
markjcrane
a0b5c5105f
Fix the call center dialplan creation when adding a call center queue.
2015-11-14 20:18:31 -07:00
markjcrane
608a826d13
Correct the consistency of the indentation.
2015-11-14 17:56:20 -07:00
markjcrane
b428f570de
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-11-14 17:18:58 -07:00
markjcrane
e52339fc8f
Fix call center queue delete.
2015-11-14 17:18:32 -07:00
FusionPBX
ebbf6fb259
Merge pull request #1235 from moteus/fax_send
...
Fix. multiple calls fax_send caused error.
2015-11-13 09:17:09 -07:00
markjcrane
d03db31518
Add the additional key types to the device key profile.
2015-11-12 19:27:29 -07:00
markjcrane
f58328fa39
Polycom key type capitalize the first letter of Automata and Normal.
2015-11-12 19:11:31 -07:00
markjcrane
e7530e2447
Correct polycom template logic and change the && (and) to || (or).
2015-11-12 18:51:44 -07:00
markjcrane
0406afbdb8
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-11-12 16:40:48 -07:00
markjcrane
88858a1c8b
Add additional Polycom key types.
2015-11-12 16:40:02 -07:00
FusionPBX
21a2a4fa5b
Merge pull request #1236 from mafoo/Enhance-Template
...
made button elements render the same as input.btn
2015-11-12 08:34:23 -07:00
FusionPBX
1f89195f70
Merge pull request #1237 from moteus/intercept_outbound
...
Fix. Call intercept - a scenario where an outgoing call can be intercepted
2015-11-12 08:31:55 -07:00
Alexey Melnichuk
3de12d6d1d
Fix. Call intercept - a scenario where an outgoing call can be intercepted
...
This is same changes as in #1209 .
2015-11-12 14:11:05 +03:00
Matthew Vale
9e637d2801
made button elements render the same as input.btn
2015-11-12 11:10:34 +00:00
Alexey Melnichuk
a10e508972
Fix. multiple calls fax_send caused error.
...
Fix. require EventSocket implicitly.
Fix. require `test` class.
2015-11-12 14:00:01 +03:00
FusionPBX
cd6a52b1af
Merge pull request #1229 from moteus/ivr_menu_exec_without_args
...
Fix. IVR menu option without arguments.
2015-11-10 18:12:03 -07:00
markjcrane
7bb50d03a0
New database class was implemented in call_forward.lua when using first_value must change select * from with the specific value desired.
2015-11-10 17:26:39 -07:00
markjcrane
71ea6a8328
Change the Database:query to make the fn optional which will make it more backwards compatible with current code. This fixes an issue with recent movement to the database class in call_forward.lua.
2015-11-10 17:04:42 -07:00