fe1c30c182
Remvove the shared option and update the contact description.
2016-01-18 18:30:22 -07:00
6e22de05e4
Move the contact user data to the correct table.
2016-01-18 17:51:32 -07:00
5a440891a9
Simply deleting contact users and groups.
2016-01-18 17:42:32 -07:00
3c626179f3
Add a missing bracket.
2016-01-18 16:55:26 -07:00
316274a258
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
22d94764d3
Update the sql query that lists the assigned users to specific contacts.
2016-01-18 15:02:34 -07:00
37ed0f962c
Fix the contact page layout.
2016-01-18 14:44:05 -07:00
fbabf6706c
Add the translations for Users, and add the new permissions.
2016-01-18 14:35:44 -07:00
2548a5d5e7
Add contact user list to contact_edit.php.
2016-01-18 14:17:59 -07:00
c5d40cb305
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-01-18 14:15:36 -07:00
6eeaa99ccb
Move the sql queries from the content in conference_room_edit.php
2016-01-18 14:15:21 -07:00
9de5d3d21f
Merge pull request #1396 from mafoo/Enhance-BugFix
...
Enhance root.php
2016-01-18 11:22:41 -07:00
87dbd6b428
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
505c1e6276
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
e9ff3523ec
Add a new table v_contact_users.
2016-01-17 14:17:12 -07:00
fa081456b1
Change $_SERVER['DOCUMENT_ROOT'].PROJECT_PATH to $_SERVER["PROJECT_ROOT"].
2016-01-17 00:01:13 -07:00
4a1c02973d
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-01-16 21:42:40 -07:00
87b0a2344f
Rename the cisco provision files for consistency.
2016-01-16 21:42:13 -07:00
74fd3f6495
Merge pull request #1394 from blackc2004/master
...
change file name
2016-01-16 13:56:54 -07:00
e842e06f53
change file name
2016-01-16 11:30:49 -08:00
4641dd520b
Merge pull request #12 from fusionpbx/master
...
11
2016-01-16 11:16:19 -08:00
7d2b10357f
Set the mac address to lower case in a different location.
2016-01-16 12:02:32 -07:00
6388cdc538
Set the mac address to lower case.
2016-01-16 11:58:22 -07:00
74ba8f038e
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
d298dad5cc
Merge pull request #1331 from mafoo/BugFix-root.php_logic
...
Rollout new root.php
2016-01-16 10:09:44 -07:00
912e9dab28
Consolidate the SQL Queries for better performance.
2016-01-16 09:54:01 -07:00
eb5842b74a
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
6e2cc41caf
Merge pull request #1139 from joernott/master
...
Allow provisioning with internal addressbook and update snom320 tpl
2016-01-15 22:45:32 -07:00
40d6c3f601
Merge pull request #1385 from blackc2004/master
...
yealink remote phone book
2016-01-15 22:40:55 -07:00
5db328d527
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
697ddb08c9
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
eb77a26998
Merge pull request #1387 from mafoo/BugFix-Languages
...
BugFixes in languages.lua
2016-01-15 21:42:48 -07:00
960de5f65a
Merge pull request #1388 from mafoo/BugFix-Devices
...
BugFix to app/devices
2016-01-15 21:42:01 -07:00
438121fb42
Merge pull request #1391 from blackc2004/patch-35
...
Update cidlookup.conf.xml
2016-01-15 21:37:19 -07:00
ec4a97fe2c
Merge pull request #1392 from blackc2004/patch-36
...
Update 980_cidlookup.xml
2016-01-15 21:36:46 -07:00
937bd501cf
Update 980_cidlookup.xml
2016-01-15 20:16:21 -08:00
6dc1f9b631
Update cidlookup.conf.xml
2016-01-15 20:11:38 -08:00
1a896d3cd2
Fix the domain name in MN_Generic.cfg.
2016-01-15 17:54:06 -07:00
7d5312520a
Make the domain in MN_Generic.cfg dynamic.
2016-01-15 17:35:00 -07:00
4c5d644757
Mitel provisioning add MN_Generic.cfg and update the 5324 and 5340 templates.
2016-01-15 17:09:16 -07:00
492653b1e0
Add a line feed to the mitel/5324/MN_{$mac}.cfg template.
2016-01-15 14:27:53 -07:00
9d61033b87
Default mitel tftp_config to 2.
2016-01-15 14:15:53 -07:00
dd7f473f8d
Fix the domain_name syntax.
2016-01-15 13:45:32 -07:00
3da1d0b521
A few more adjustments for the Cisco 79xx directories.
2016-01-15 13:43:40 -07:00
725fc133ea
Fix the syntax in the 7940 and 7960 directory-personal.xml configuration.
2016-01-15 13:36:46 -07:00
b78c6420d4
fix for when running in root and no leading /
2016-01-15 16:48:37 +00:00
93256a60ab
changed protocol to match request
2016-01-15 13:43:10 +00:00
b0e4f19993
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
6999198492
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
b7e350b845
changed text.php to use $_SERVER["PROJECT_ROOT"]
2016-01-14 16:15:41 +00:00
markjcrane
Mafoo
blackc2004
blackc2004