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
b95e134578
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-01-16 21:42:40 -07:00
markjcrane
4321704a33
Rename the cisco provision files for consistency.
2016-01-16 21:42:13 -07:00
FusionPBX
5ade255383
Merge pull request #1394 from blackc2004/master
...
change file name
2016-01-16 13:56:54 -07:00
blackc2004
2ec4abafbe
change file name
2016-01-16 11:30:49 -08:00
blackc2004
2796a4908f
Merge pull request #12 from fusionpbx/master
...
11
2016-01-16 11:16:19 -08: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
FusionPBX
88a10cbea8
Merge pull request #1139 from joernott/master
...
Allow provisioning with internal addressbook and update snom320 tpl
2016-01-15 22:45:32 -07:00
FusionPBX
e5aee41056
Merge pull request #1385 from blackc2004/master
...
yealink remote phone book
2016-01-15 22:40:55 -07:00
FusionPBX
238ffb5170
Merge pull request #1390 from mafoo/BugFix-htaccess
...
fix for when running in root and no leading /
2016-01-15 21:44:52 -07:00
FusionPBX
6a586abb16
Merge pull request #1384 from moteus/lua_conf_run_example
...
Add. Example of how run fax queue monitor.
2016-01-15 21:43:34 -07:00
FusionPBX
fad8343802
Merge pull request #1387 from mafoo/BugFix-Languages
...
BugFixes in languages.lua
2016-01-15 21:42:48 -07:00
FusionPBX
04813452a1
Merge pull request #1388 from mafoo/BugFix-Devices
...
BugFix to app/devices
2016-01-15 21:42:01 -07:00
FusionPBX
7fc284b9f0
Merge pull request #1391 from blackc2004/patch-35
...
Update cidlookup.conf.xml
2016-01-15 21:37:19 -07:00
FusionPBX
c841c8f867
Merge pull request #1392 from blackc2004/patch-36
...
Update 980_cidlookup.xml
2016-01-15 21:36:46 -07:00
blackc2004
1a6d6308c7
Update 980_cidlookup.xml
2016-01-15 20:16:21 -08:00
blackc2004
2829fefdd2
Update cidlookup.conf.xml
2016-01-15 20:11:38 -08:00
markjcrane
a016780684
Fix the domain name in MN_Generic.cfg.
2016-01-15 17:54:06 -07:00
markjcrane
62d1575202
Make the domain in MN_Generic.cfg dynamic.
2016-01-15 17:35:00 -07:00
markjcrane
c4eca6c330
Mitel provisioning add MN_Generic.cfg and update the 5324 and 5340 templates.
2016-01-15 17:09:16 -07:00
markjcrane
a312ff7415
Add a line feed to the mitel/5324/MN_{$mac}.cfg template.
2016-01-15 14:27:53 -07:00
markjcrane
97aadbc9c0
Default mitel tftp_config to 2.
2016-01-15 14:15:53 -07:00
markjcrane
8d5436e607
Fix the domain_name syntax.
2016-01-15 13:45:32 -07:00
markjcrane
49f156e6a2
A few more adjustments for the Cisco 79xx directories.
2016-01-15 13:43:40 -07:00
markjcrane
e72f244298
Fix the syntax in the 7940 and 7960 directory-personal.xml configuration.
2016-01-15 13:36:46 -07:00
Matthew Vale
8814c414a5
fix for when running in root and no leading /
2016-01-15 16:48:37 +00:00
Matthew Vale
1502cf15ff
changed protocol to match request
2016-01-15 13:43:10 +00:00
Matthew Vale
0111fff25b
BugFixes in languages.lua
...
removed extra ;'s
fix file_handle:close to be inside the if null check
2016-01-15 10:35:19 +00:00
Matthew Vale
b20a38f454
added logic in cli mode to chdir to the correct directory first
...
the webserver would normally do this for us, but we need to do it
2016-01-14 16:25:05 +00:00
Matthew Vale
355bec91a2
changed text.php to use $_SERVER["PROJECT_ROOT"]
2016-01-14 16:15:41 +00:00
markjcrane
b40415c53f
If the call group or toll allow have a value set set selected.
2016-01-13 17:57:25 -07:00
markjcrane
e186172b6f
Use call group singular instead of plural.
2016-01-13 16:40:26 -07:00
markjcrane
ab17ff48f4
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-01-13 16:27:28 -07:00
markjcrane
73b3afe506
Add an option for toll allow and call group select list.
2016-01-13 16:26:55 -07:00
blackc2004
28aec4f0a9
start of local extensions as remote phone book
2016-01-13 10:08:38 -08:00
