Commit Graph

4755 Commits

Author SHA1 Message Date
Alexey Melnichuk 243dffe949 Change. Use odbc connector if there exists odbc database
It needs because on windows FreeSWITCH builds without native support PostgreSQL.
2015-07-13 15:04:33 +04:00
FusionPBX 4f0a57ac7d Merge pull request #1016 from moteus/xml_cdr_escape
Fix. Escape `<>` in all fields in CDR xml.
2015-07-10 08:58:13 -03:00
FusionPBX a6d8f7068c Merge pull request #1012 from moteus/issues_1006
Use long string syntax to generate `config.lua` file.
2015-07-10 08:56:32 -03:00
markjcrane 63c6031da6 Change 'is null' to 'is not null'. 2015-07-10 08:00:08 -03:00
markjcrane f0d90fd1e0 Fix the call center dialplan so that it does not create duplicates using the new call center class. 2015-07-09 10:48:01 -03:00
markjcrane 55b04e9d4d Fix the dialplan_uuid for call center dialplan. 2015-07-09 01:01:12 -03:00
markjcrane b92448366d Fix the call center timeout action for the dialplan. 2015-07-09 00:54:27 -03:00
markjcrane c5a1139342 Change {#server_address_2} to {$server_address_2} for the GX42xx template. 2015-07-09 00:05:29 -03:00
markjcrane ec532e8d12 Play voicemail messages with the newest messages first. 2015-07-08 15:46:34 -03:00
markjcrane c0a6c121f2 Prevent nil from causing problems with functions/settings.lua. 2015-07-08 15:36:33 -03:00
markjcrane d140e264ef This Hot desking has been moved to optional Apps directory. It is now considered to be deprecated and replaced by a better feature. 2015-07-08 12:10:17 -03:00
markjcrane db84e4d8ec Remove trailing spaces and adjust the vertical spacing. 2015-07-08 09:30:00 -03:00
markjcrane 62a11caa62 Don't override the device vendor type. 2015-07-08 01:43:52 -03:00
markjcrane 358ff5844b Add device key type column add the vendor name. 2015-07-08 01:41:24 -03:00
markjcrane ad3145ba19 Add several provision default settings. 2015-07-07 18:07:25 -03:00
markjcrane 2838d29a89 Change the table name from device lines to keys. 2015-07-07 14:44:14 -03:00
markjcrane 02664f02a7 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-07-07 14:31:08 -03:00
markjcrane f52f7999a0 Add device key vendor to assign a key to a vendor. 2015-07-07 14:25:00 -03:00
Rich Breton 60706b6278 Update README.md
Added some info to make it less confusing
2015-07-06 19:37:18 -06:00
markjcrane a46295a4f2 The extension_password permission is not needed on the field name as the password is auto-generated. Because of this its only needed on the update. 2015-07-06 12:15:03 -06:00
markjcrane 44245e760f Add AR eg translation. 2015-07-05 23:13:46 -06:00
markjcrane c4ded231f9 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-07-05 23:11:29 -06:00
markjcrane e522fbf8ae Adjustments to event_socket_request to make it faster. 2015-07-05 23:08:10 -06:00
Rich Breton 76f4a4e1ee Update README.md
Adding more clarification for contributions
2015-07-05 01:01:37 -06:00
FusionPBX 410cb1a268 Update confirm.lua
Add a domain_name nil check.
2015-07-04 04:16:44 -06:00
markjcrane 41f052901f Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-07-03 09:52:36 -06:00
markjcrane 8b3c4ca914 Use originate_delay_start to fix the enterprise ring group delay. 2015-07-03 09:51:02 -06:00
Rich Breton 00bc718f2b Update README.md
Added formatting to the Contributing section
2015-07-03 09:36:17 -06:00
Rich Breton e63ca5f0f5 Update README.md
Added contributing section to explain why we require a CLA
2015-07-03 09:35:30 -06:00
Rich Breton 8d7832768b Update README.md
Updating the readme to put in some more info to help people understand the project and get going
2015-07-03 08:54:10 -06:00
reliberate 4dfc24d1bd Upgrade: Undo test commit. 2015-07-02 22:17:02 -06:00
reliberate 948b9a73de Test: Commit change to test Advanced > Upgrade changes. 2015-07-02 21:47:59 -06:00
reliberate f4ef721edc Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-07-02 21:26:59 -06:00
reliberate 39ff3bee5a Upgrade: Better handle Git response. 2015-07-02 21:25:45 -06:00
reliberate 911036c6ae Upgrade: Remove invalid ampersands. 2015-07-02 21:15:43 -06:00
reliberate 73f2c21674 Upgrade: Converted Advanced > Upgrade to use Git instead of SVN (untested).
Misc: Added provisions elsewhere to account for .git/* files, as currently done with .svn/* files.
2015-07-02 17:25:41 -06:00
Rich Breton e7051129ac initial commit of README for GitHub 2015-07-02 16:29:20 -06:00
reliberate 0f9f7850ee Undo: Commit test. 2015-07-02 16:24:01 -06:00
reliberate 902f8f9019 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
Conflicts:
	root.php
2015-07-02 16:23:11 -06:00
reliberate dddefb7b42 Undo: Test commit. 2015-07-02 16:16:33 -06:00
reliberate 0cff228558 Test commit. 2015-07-02 15:42:09 -06:00
Alexey Melnichuk 130394ff01 Use non greedy match. 2015-07-02 19:12:12 +04:00
Alexey Melnichuk 90d91c8b5a Fix. Escape `<>` in all fields in CDR xml.
When using redirect cdr also can contain e.g. `sip_redirect_contact_0` / `sip_redirected_to`.
I use `preg_replace_callback` to proceed all fields.
May be it more correct use urlencode because if we get xml with non UTF8 char we lost CDR.
```php
$xml_string = preg_replace_callback("/<([^><]+)>(.*?)<\/\g1>/",
	function ($matches) {
		// var_dump($matches);
		return '<' . $matches[1] . '>' .
			urlencode($matches[2]).
		'</' . $matches[1] . '>';
	},
	$xml_string
);
```
2015-07-02 19:08:48 +04:00
Alexey Melnichuk a7eb1f12d0 Use long string syntax to generate `config.lua` file.
Close #1006
2015-07-02 11:39:48 +04:00
FusionPBX c4f1221015 Update app_menu.php
Correct the ordinal value of login and logout menu array.
2015-07-02 00:17:15 -06:00
Mark Crane cafc371c88 Fix a problem where the inbound context has public in the name with public@ as a prefix and .public as a suffix. 2015-06-30 18:42:52 +00:00
Mark Crane f994329edb FAX sure domain_uuid is set at the right time. 2015-06-30 18:01:30 +00:00
Mark Crane 21f02c4042 Add translations for Logout that I had access to. 2015-06-30 17:21:11 +00:00
Mark Crane 2788d69ded Move the Login and Logout items in the menu to a location that is accessible to the translation server. 2015-06-30 17:11:39 +00:00
Mark Crane b6c93351eb Add latest translations 2015-06-30 16:30:02 +00:00