Commit Graph

9466 Commits

Author SHA1 Message Date
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
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
fc9a45d313 Added initial version of app/languages
for analyzing missing or overlapping with global text
2015-12-10 10:04:35 +00: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
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
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
blackc2004
1d986f1b85 test 2015-12-09 14:44:22 -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
52bd6a1029 Update extension.php 2015-12-09 14:04:26 -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
Alexey Melnichuk
ed781fc8c3 Fix. forgotten images. 2015-12-09 13:51:25 +03:00
Alexey Melnichuk
b638967f01 Fix. Use Test interface to translate UI. 2015-12-09 13:37:32 +03:00
Alexey Melnichuk
ace38f5a6a Add. Allows select greeting. 2015-12-09 13:21:37 +03:00
Alexey Melnichuk
df8da0f5ce Change. Send button redirect to Active page. 2015-12-09 13:00:42 +03:00
Alexey Melnichuk
0805ad4c18 Merge branch 'master' into fax_queue 2015-12-09 12:37:55 +03:00
markjcrane
4bf86da641 Remove the default context from one more location. 2015-12-08 22:32:11 -07:00
markjcrane
98777ef728 Remove code that was commented out a while ago. 2015-12-08 22:15:21 -07:00
markjcrane
532e01b5c0 Remove count($_SESSION["domains"]) > 1 from the as the domain name should always be part of the fax directory path. 2015-12-08 21:59:09 -07:00
markjcrane
fb1e3e29f1 Add tabbing to parse_attachments.php. 2015-12-08 21:57:18 -07:00
markjcrane
36e546adcb Remove the destination number condition and exchange the $1 for the destination_number variable. 2015-12-08 09:13:56 -07:00
Alexey Melnichuk
66d0f060ce Add. Ability to delete fax queue element 2015-12-08 16:42:13 +03:00
Alexey Melnichuk
7e715879f8 Add. Web UI to monitor for fax queue. 2015-12-08 16:16:54 +03:00
Alexey Melnichuk
d28ca0c7ae Merge branch 'master' into fax_queue 2015-12-08 16:11:58 +03:00
markjcrane
925feb06a1 Add user_exists condition to local_extension to compensate for the fact we allow dialing an extension based on a non numeric username. 2015-12-07 22:09:27 -07:00