Alexey Melnichuk
69717e31d5
Revert "Revert "Change. Use `require "resources.functions.config"` to load co…"
2015-08-11 05:06:33 +03:00
FusionPBX
d1f3b05cf6
Revert "Change. Use `require "resources.functions.config"` to load config file."
2015-08-10 11:50:29 -06:00
FusionPBX
8d9430352b
Merge pull request #1053 from moteus/require_config
...
Change. Use `require "resources.functions.config"` to load config file.
2015-08-10 11:31:35 -06:00
FusionPBX
75aaf20cfa
Merge pull request #1017 from moteus/no_default_domain
...
Change. Does not use `default` dialplan/directory.
2015-08-10 11:27:19 -06:00
markjcrane
9b885b807d
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-08-10 11:22:11 -06:00
markjcrane
51b398f984
Ring group external destinations use the | as the delimiter for fail-over.
2015-08-10 11:21:48 -06:00
FusionPBX
0bff93f3a4
Merge pull request #1079 from moteus/temp_dir
...
Fix. Use `temp_dir` variable instead of hard coded `/tmp`
2015-08-10 10:25:22 -06:00
FusionPBX
e78d4dc370
Merge pull request #1084 from moteus/page_active_conf
...
Fix. Allow monitoring page conferences via `Active Conferences` app.
2015-08-10 10:23:03 -06:00
FusionPBX
5f000d1906
Merge pull request #1083 from daniel-lucio/master
...
Use os.time instead of mysql native function
2015-08-10 10:22:22 -06:00
markjcrane
144e22094e
Add translations for check_voicemail, company_directory and record.
2015-08-10 10:09:37 -06:00
Alexey Melnichuk
c27e9cef9a
Fix. add functions/count.lua to preview commit.
2015-08-10 13:01:49 +04:00
Alexey Melnichuk
a8142f527a
Change. Use only `require` to load function.
...
Fix. Remove multiple definition of same function.
2015-08-10 12:43:06 +04:00
Alexey Melnichuk
c5432630f3
Fix. Allow monitoring page conferences via `Active Conferences` app.
2015-08-10 11:43:32 +04:00
Luis Daniel Lucio Quiroz
780b69a253
Use os.time instead of mysql native function
...
Odd, but on some deployments LUA wont accept unixtime stamp functions (regardless it works on CLI). So, to workaround this, lets use os.time() which it returns the same value expected.
2015-08-09 21:56:28 -06:00
markjcrane
ade62be0f1
Change $name to ${name}
2015-08-09 12:14:47 -06:00
markjcrane
5c11a3f103
Change array from ['result']['field'] to ['field'].
2015-08-09 12:00:42 -06:00
markjcrane
078cef0a78
Add Other options to the list of destinations.
2015-08-09 11:20:08 -06:00
markjcrane
c0a0cb308b
If there is no item in the group of destinations then don't the group name.
2015-08-07 19:50:06 -05:00
markjcrane
d2147cb133
Remove switch_select_destination function from the remaining features that used it and replace with the destination php class.
2015-08-07 15:06:07 -05:00
Alexey Melnichuk
59c1fbe2ef
Fix. Always use `/` separator on FS command.
...
Fix. Override `temp_dir` from `config.lua` file.
2015-08-07 12:11:27 +04:00
Alexey Melnichuk
73e0e7a3a8
Fix. Use `temp_dir` variable instead of hard coded `/tmp`
2015-08-07 11:52:18 +04:00
markjcrane
2ceb8ce4c3
Add an empty select option and finish moving to $this->destinations array.
2015-08-06 15:30:43 -05:00
markjcrane
8cc1d98598
Move the destinations array generation into the constructor and add selected support.
2015-08-06 12:11:26 -05:00
markjcrane
e413e61a3b
Use the same array consistently.
2015-08-06 00:25:38 -05:00
markjcrane
944216a372
Change domain_name to domain_uuid.
2015-08-06 00:13:57 -05:00
markjcrane
9110c877e7
Remove the round brackets.
2015-08-05 17:30:18 -05:00
markjcrane
3caaf665b3
Add the database connection.
2015-08-05 17:24:37 -05:00
markjcrane
70b96ad053
A few minor adjustments to the new class.
2015-08-05 17:02:34 -05:00
markjcrane
cab4d65600
Initial commit a new php destinations class. Builds a list of destinations dynamically. Typically this contains extensions, ivr menus, ring groups, voicemail and more.
2015-08-05 16:43:22 -05:00
Rich Breton
e0bc3f51cb
T46g-template-dhcp-fix
2015-08-03 17:03:07 -06:00
markjcrane
6c549b0517
Remove the insert to v_settings as this is being done in app_defaults.php.
2015-08-03 09:32:48 -06:00
markjcrane
2a4621daaf
Fix a problem with custom public context and XMl handler.
2015-07-31 21:03:22 -06:00
markjcrane
aaf6f1f145
When writing the call center conf file use the .noload template file.
2015-07-31 10:05:04 -06:00
markjcrane
c4639445d9
Fix fax_retry.lua for domain_name and domain_uuid. Add [FAX] to the logging to the console.
2015-07-30 19:32:18 -06:00
markjcrane
edda2df18c
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2015-07-30 17:18:53 -06:00
reliberate
14f2705cb3
Menu: Updated code to create menu HTML from array, instead of database directly.
2015-07-30 11:49:51 -06:00
markjcrane
4f9143758c
Remove get user defined variables from advanced -> variables should use default or domains settings instead.
2015-07-28 11:30:28 -06:00
markjcrane
4e6d1515b1
Adjust the vertical line spacing to make it more consistent with the rest of the project.
2015-07-28 11:18:20 -06:00
markjcrane
1ed020ceda
The email_validate is a generic function so moving it to resources/functions.php.
2015-07-28 11:17:33 -06:00
markjcrane
73b9f61290
Remove code that is no longer being used.
2015-07-28 11:12:42 -06:00
markjcrane
594ab6fa00
Change the indentation. Add a conditional include.
2015-07-28 10:42:07 -06:00
Alexey Melnichuk
7e481f20b6
Fix. Correct path when user on `group_confirm_file`
2015-07-28 15:59:04 +04:00
markjcrane
68d2578eb8
Simplify adding items to the domains array.
2015-07-25 17:44:56 -06:00
markjcrane
4243764010
Remove trailing tabs.
2015-07-23 17:50:16 -06:00
markjcrane
b1087f5a43
Remove one trip to the database.
2015-07-23 14:03:24 -06:00
markjcrane
5ff664246b
Prevent nil errors in settings.lua.
2015-07-22 09:42:35 -06:00
Alexey Melnichuk
2234b42c07
Change. Use `require "resources.functions.config"` to load config file.
...
Change. Move `script_dir` definition into config file.
2015-07-22 13:20:51 +04:00
Alexey Melnichuk
18491ea2c0
Merge branch 'master' into no_default_domain
...
Conflicts:
app/hot_desking/extension_edit.php
2015-07-21 11:24:59 +04:00
FusionPBX
7cf424003c
Merge pull request #1047 from moteus/page_concat_conf_name
...
Fix. Concat conf name in page.lua
2015-07-20 16:52:23 -06:00
markjcrane
5dfbc2e183
Improve code to update the scripts directory.
2015-07-20 15:32:52 -06:00