Commit Graph

3242 Commits

Author SHA1 Message Date
Alexey Melnichuk
7545a52013 Fix. Path to records in music on hold. 2016-01-28 13:17:30 +03:00
markjcrane
e5169e2432 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-27 15:56:42 -07:00
markjcrane
217e3b562c Add a new permission extension_user_record to control who is able to see extension record. By default superadmin has this permission. 2016-01-27 15:56:22 -07:00
FusionPBX
78c1bb01c4 Merge pull request #1413 from mafoo/BugFix-Phrases
phrases should be written out as there uuid
2016-01-26 10:38:43 -07:00
mafoo
671315a361 phrases should be written out as there uuid
not the name.domain_uuid format
2016-01-26 17:34:44 +00:00
markjcrane
4261c58c14 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-25 21:27:37 -07:00
markjcrane
9546782a68 Add Cisco and Linksys to the format_mac list. 2016-01-25 21:27:21 -07:00
FusionPBX
45a088a409 Merge pull request #1406 from moteus/modules_no_esl
Fix. Display modules form if FS does not start.
2016-01-25 21:18:22 -07:00
markjcrane
c49e47e61f More work on user assigned contacts. 2016-01-25 20:38:45 -07:00
markjcrane
8cd347bede Disable default settings -> call center path by default. 2016-01-25 10:24:09 -07:00
markjcrane
febf47d61e Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-22 11:11:23 -07:00
markjcrane
f9bd8e0998 Change Mitel Line 1-8 to Line only. 2016-01-22 11:02:25 -07:00
mafoo
87a2b0de47 fix for when the element is not in the document yet 2016-01-22 11:51:58 +00:00
Alexey Melnichuk
75195d5153 Fix. Display modules form if FS does not start. 2016-01-22 13:05:13 +03:00
markjcrane
5a20dce9ab Move the php tag. 2016-01-21 23:33:03 -07:00
markjcrane
2e0e499e93 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-21 23:29:29 -07:00
markjcrane
3ea6eac9cf Start the Mitel functions list. 2016-01-21 23:29:13 -07:00
Alexey Melnichuk
fec4df23a0 Fix. Copy dialplan extension with correct add_uuid for outbound route. 2016-01-21 17:29:14 +03:00
markjcrane
3984218fb5 Fix the provisioning class. 2016-01-20 12:26:01 -07:00
markjcrane
9ca689236a Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-20 11:58:33 -07:00
markjcrane
c6b39cc0a5 Add device profile copy button. 2016-01-20 11:58:10 -07:00
FusionPBX
9cd2cd4789 Merge pull request #1397 from mafoo/Enhance-root.php
Enhance root.php
2016-01-20 11:06:18 -07:00
mafoo
9ce00a03cf values were being assigned rather than compared 2016-01-20 13:44:36 +00:00
Mafoo
ad324f4744 changed throw Exception to die
nothing ever eval runs the root.php so changed to die to cause a immediate report of error and stop code processing.
2016-01-20 11:30:31 +00:00
markjcrane
882333a1b0 Add personal directory array for provisioning. 2016-01-19 22:14:02 -07:00
markjcrane
c068d9dab6 Add a few more permission checks to conference_room_edit.php 2016-01-18 22:06:45 -07:00
markjcrane
30d5177b0a Work on the permissions for contacts. 2016-01-18 21:46:49 -07:00
markjcrane
33d8597a5f Allow call forward and follow me to be setup when the extension is disabled. 2016-01-18 21:33:03 -07:00
markjcrane
8fcc999bd2 Remvove the shared option and update the contact description. 2016-01-18 18:30:22 -07:00
markjcrane
bad658ac68 Move the contact user data to the correct table. 2016-01-18 17:51:32 -07:00
markjcrane
38af18d127 Simply deleting contact users and groups. 2016-01-18 17:42:32 -07:00
markjcrane
9e8cd7d348 Add a missing bracket. 2016-01-18 16:55:26 -07:00
markjcrane
1474b51779 Update permissions on contact_edit and add ability to delete a user that is assigned to the contact. 2016-01-18 16:53:19 -07:00
markjcrane
08625735e9 Update the sql query that lists the assigned users to specific contacts. 2016-01-18 15:02:34 -07:00
markjcrane
69de2cacac Fix the contact page layout. 2016-01-18 14:44:05 -07:00
markjcrane
35c8198160 Add the translations for Users, and add the new permissions. 2016-01-18 14:35:44 -07:00
markjcrane
b60f55525e Add contact user list to contact_edit.php. 2016-01-18 14:17:59 -07:00
markjcrane
468e86e937 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-01-18 14:15:36 -07:00
markjcrane
e960c847d6 Move the sql queries from the content in conference_room_edit.php 2016-01-18 14:15:21 -07:00
FusionPBX
1e9343aa46 Merge pull request #1396 from mafoo/Enhance-BugFix
Enhance root.php
2016-01-18 11:22:41 -07:00
Mafoo
2669f6f1a9 Added check for if .project.ROOT is missing
If a installation is missing the .project.ROOT previously it would just use the last search path as the project root (wrong) this will cause a Exception should it be unable to find it
2016-01-18 09:38:16 +00:00
markjcrane
e9d8605c0d Assign the user that created the contact to the user that created it. When deleting a contact delete the user assigned to it. 2016-01-17 16:16:51 -07:00
markjcrane
1c59453952 Add a new table v_contact_users. 2016-01-17 14:17:12 -07:00
markjcrane
23b4b7c9bf Change $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH to $_SERVER["PROJECT_ROOT"]. 2016-01-17 00:01:13 -07:00
markjcrane
3eda2664fd Set the mac address to lower case in a different location. 2016-01-16 12:02:32 -07:00
markjcrane
afd92882c9 Set the mac address to lower case. 2016-01-16 11:58:22 -07:00
markjcrane
b67f9dee45 This doesn't appear to be completed. The developer that created should talk to me about what its purpose is as this seems to duplicate domain settings. 2016-01-16 10:33:46 -07:00
FusionPBX
76b1ea734e Merge pull request #1331 from mafoo/BugFix-root.php_logic
Rollout new root.php
2016-01-16 10:09:44 -07:00
markjcrane
74ca9eb980 Consolidate the SQL Queries for better performance. 2016-01-16 09:54:01 -07:00
markjcrane
285cad06da Fix a problem with the provision url path which was caused by a pull request in the last 12 hours. 2016-01-16 09:44:15 -07:00