Commit Graph

6486 Commits

Author SHA1 Message Date
Alexey Melnichuk 7d5c5f1161 Fix. Play voicemail.
Copy from recordings.php
2015-12-11 16:40:49 +03:00
Alexey Melnichuk f53e8c80f3 Fix. Play/Download recordings 2015-12-11 15:53:05 +03:00
Matthew Vale 81b85c3caf Merge branch 'fusionpbx/master' into Enhance-Languages
Conflicts:
	app/extensions/app_languages.php
2015-12-11 08:45:26 +00:00
Alexey Melnichuk d260964e8d Fix. Display recording in CDR 2015-12-11 10:46:51 +03:00
FusionPBX 5a0d25ff06 Merge pull request #1321 from blackc2004/master
CDR Stats changes
2015-12-10 17:24:24 -08:00
FusionPBX 1f32c4941f Merge pull request #1316 from mafoo/Bugfix-app/system
Updated switch version detection
2015-12-10 17:21:25 -08:00
blackc2004 d107530cf2 extension download 2015-12-10 15:07:46 -08:00
blackc2004 034d6b05c9 remove print 2015-12-10 11:10:32 -08:00
blackc2004 0a08484546 CDR Stats Add ADV Search options request 1173
CDR Stats Add ADV Search options request 1173
2015-12-10 11:06:42 -08:00
blackc2004 2c2eabe3fe Merge pull request #2 from fusionpbx/master
test2
2015-12-10 08:17:05 -08:00
Matthew Vale cd8f1e6660 added switch git_info where available 2015-12-10 11:58:09 +00:00
Matthew Vale 45d9c2039d updated switch version detection
will now work with both git and packaged version numbers
added bits to detect_switch
2015-12-10 10:51:38 +00:00
Matthew Vale f5bfeffe18 First pass on app/* 2015-12-10 10:12:41 +00:00
Matthew Vale 81dafabc47 Remvoed tab for consistency 2015-12-10 10:11:45 +00:00
Matthew Vale 742db50120 First pass on core/* 2015-12-10 10:09:07 +00:00
Matthew Vale fe949cf048 Initial consolidation of common terms 2015-12-10 10:06:48 +00:00
Matthew Vale fc9a45d313 Added initial version of app/languages
for analyzing missing or overlapping with global text
2015-12-10 10:04:35 +00:00
Matthew Vale e2cc65874d Add Fallback language support to en-us 2015-12-10 09:57:54 +00:00
Matthew Vale e3f1e919da Migrate app_languages.php from core to resources 2015-12-10 09:57:08 +00:00
FusionPBX daa0f9bb70 Merge pull request #1294 from moteus/fax_queue_mail_template
Add. mail templates for fax server responses.
2015-12-09 16:28:35 -08:00
FusionPBX 031f0a6abd Merge pull request #1295 from moteus/fax_queue_greet_combobox
Add. Allows select greeting.
2015-12-09 16:26:43 -08:00
FusionPBX 18b922e505 Merge pull request #1296 from moteus/fax_queue
Fax queue web monitor
2015-12-09 16:25:29 -08:00
markjcrane db12c8ebe5 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2015-12-09 17:19:26 -07:00
markjcrane 1cd3ca4891 Get the MAC address from the Panasonic User Agent string. 2015-12-09 17:19:05 -07:00
FusionPBX 0547e9fce7 Merge pull request #1303 from blackc2004/patch-19
Update directory.lua
2015-12-09 15:02:48 -08:00
FusionPBX cf0eb2cb33 Merge pull request #1304 from blackc2004/patch-18
Update devices.php
2015-12-09 15:01:08 -08:00
FusionPBX 7ee1c8c192 Merge pull request #1305 from blackc2004/patch-17
Update call_edit.php
2015-12-09 15:00:17 -08:00
FusionPBX 1a49281ac5 Merge pull request #1306 from blackc2004/patch-16
Update app_languages.php
2015-12-09 14:57:42 -08:00
FusionPBX cab006a151 Merge pull request #1307 from blackc2004/patch-15
Update app_config.php
2015-12-09 14:57:06 -08:00
FusionPBX 979e22d896 Merge pull request #1308 from blackc2004/patch-14
Update 010_user_exists.xml
2015-12-09 14:55:43 -08:00
FusionPBX ccbe891b5d Merge pull request #1309 from blackc2004/patch-20
Update extension.php
2015-12-09 14:55:13 -08:00
FusionPBX 26f3a34947 Merge pull request #1310 from blackc2004/patch-21
Update index.lua
2015-12-09 14:54:30 -08:00
FusionPBX 3c9d39db1b Merge pull request #1311 from blackc2004/patch-22
Update app_languages.php
2015-12-09 14:53:51 -08:00
FusionPBX d52c6bd34e Merge pull request #1312 from blackc2004/patch-23
Update xml_cdr_inc.php
2015-12-09 14:53:25 -08:00
FusionPBX b8fb6a2029 Merge pull request #1313 from blackc2004/patch-24
Update xml_cdr_search.php
2015-12-09 14:52:45 -08:00
blackc2004 1d986f1b85 test 2015-12-09 14:44:22 -08:00
blackc2004 1e6f7fc090 Merge pull request #1 from fusionpbx/master
test
2015-12-09 14:31:37 -08:00
blackc2004 4072e8bbfe Update xml_cdr_search.php 2015-12-09 14:09:12 -08:00
blackc2004 9d437340b6 Update xml_cdr_inc.php 2015-12-09 14:08:33 -08:00
blackc2004 de8d05bad4 Update app_languages.php 2015-12-09 14:07:58 -08:00
blackc2004 8d072ae13f Update index.lua 2015-12-09 14:04:59 -08:00
blackc2004 52bd6a1029 Update extension.php 2015-12-09 14:04:26 -08:00
blackc2004 dca392fcc5 Update directory.lua 2015-12-09 14:03:17 -08:00
blackc2004 492ea21445 Update devices.php 2015-12-09 14:01:35 -08:00
blackc2004 0f718c8d08 Update call_edit.php 2015-12-09 14:00:44 -08:00
blackc2004 203d868429 Update app_languages.php 2015-12-09 14:00:13 -08:00
blackc2004 9a1d650532 Update app_config.php 2015-12-09 13:59:43 -08:00
blackc2004 c092ebacd2 Update 010_user_exists.xml 2015-12-09 13:59:15 -08:00
markjcrane c9fee6c080 Add the ${ and } to user_exists so that it works with the condition. 2015-12-09 12:10:31 -07:00
markjcrane 8f3f2040a7 Remove the self closing tag on the local_extension condition. 2015-12-09 12:05:20 -07:00