Commit Graph

5123 Commits

Author SHA1 Message Date
markjcrane 7cc4aa21e0 Change title-time-conditions to title-time_conditions. 2015-08-03 15:53:48 -06:00
markjcrane c2375def12 Change title_phrases to title-phrases. 2015-08-03 15:52:39 -06:00
markjcrane cbbe4c2da7 Change the label 'title' to 'title-ring_groups' 2015-08-03 15:46:44 -06:00
markjcrane 193137ffa6 Make the title-<app name> more consistent. Use underscore in the label name instead of a dash. Dash is used between label type and the label name. 2015-08-03 15:17:05 -06:00
markjcrane 4ed7adeebc Move the email settings into default settings app_defaults.php. 2015-08-03 10:11:41 -06:00
markjcrane 7aa6574c0e To be more consistent with naming convention rename app/ivr_menu to app/ivr_menus. 2015-08-03 09:43:15 -06:00
markjcrane c873ca11da Remove smtp settings entirely from app/settings. 2015-08-03 09:41:58 -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 dd1d7a9ffd Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-08-02 23:43:53 +00:00
root 22c146f7f4 Add latest translations 2015-08-02 23:42:11 +00:00
markjcrane 2a4621daaf Fix a problem with custom public context and XMl handler. 2015-07-31 21:03:22 -06:00
markjcrane 6f6a2fc8d0 Change extension_context to extension_user_context in one location that was missed. 2015-07-31 10:58:38 -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 a7a472c86a Add a new permission extension_user_context. 2015-07-31 09:37:53 -06:00
markjcrane 2353b9622a Change else if to elseif on extension_edit.php 2015-07-31 09:18:27 -06:00
markjcrane bcb4558f8b Allow 0 to be set for numbers for Call Center Queues. 2015-07-31 09:02:26 -06:00
markjcrane f4c47f176f Simplify the code for the call center dialplan. 2015-07-30 21:06:30 -06:00
FusionPBX ffbb65fcad Merge pull request #1063 from moteus/call_center_dialplan_uuid
Fix. Override dialplan_uuid.
2015-07-30 20:56:20 -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 7284afffb3 Add accountcode, domain_name and domain_uuid for fax forward. 2015-07-30 19:07:16 -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
Alexey Melnichuk 3be5ebf29f Add. Option to ignore busy from destination in follow me dial-string. 2015-07-30 16:21:50 +04:00
Alexey Melnichuk 162640f754 Fix. Can not enable follow me via `*21` if it was disabled via web.
Problem is that php code clear `dial_string` field in DB.
And Lua code on enable try use it.
2015-07-30 11:48:01 +04: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 9f02d81e11 Remove the old default and even older classic themes. 2015-07-28 11:19:22 -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 2ea4148f99 Change from if_group to if_permission which is preferred in most cases. 2015-07-27 14:57:37 -06:00
markjcrane 994bd984dd Add a permission check to core/domain_settings/domain_edit.php. 2015-07-25 22:52:57 -06:00
markjcrane 68d2578eb8 Simplify adding items to the domains array. 2015-07-25 17:44:56 -06:00
markjcrane 6548179a50 Organize the device profiles according to the key vendor. 2015-07-25 07:57:07 -06:00
markjcrane 6392bff01a Domain name edit only perform the actions if the features are installed. 2015-07-24 14:05:02 -06:00
markjcrane 8c5b7c318d Only include if the domain_setting_edit permission has been assigned to the current user. 2015-07-24 08:59:13 -06:00
Alexey Melnichuk eaae5d3ad7 Fix. Override dialplan_uuid. 2015-07-24 14:46:31 +04:00
Alexey Melnichuk c9870f840e Add. Support windows services. 2015-07-24 11:26:11 +04:00
markjcrane b8a4162d21 Remove setting the domain array again as its redundant. 2015-07-23 17:51:39 -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 c0b7596fe5 Fix a problem with groups not showing up on PHP 5.5.9. 2015-07-22 16:02:06 -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
markjcrane c4517b15c2 Move the 'show application' completely out of the content. Then save the result in a session variable $_SESSION['switch']['applications']. 2015-07-21 09:47:23 -06:00
FusionPBX f35d5bc891 Merge pull request #1048 from moteus/dialplan_edit_without_fs
Fix. Edit dialplan without running FS may load too long.
2015-07-21 09:33:39 -06:00
Alexey Melnichuk 55d01cffd4 Fix. Edit dialplan without running FS may load too long. 2015-07-21 11:44:13 +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
Alexey Melnichuk b4d968cf09 Fix. remove hot_desking app. 2015-07-21 11:22:16 +04:00