Matthew Vale
|
665824b949
|
Merge branch 'fusionpbx/master' into Enhance-Languages
Conflicts:
app/extensions/app_languages.php
|
2015-12-11 08:45:26 +00:00 |
FusionPBX
|
6c51090fbd
|
Merge pull request #1321 from blackc2004/master
CDR Stats changes
|
2015-12-10 17:24:24 -08:00 |
|
FusionPBX
|
3f20d52f43
|
Merge pull request #1316 from mafoo/Bugfix-app/system
Updated switch version detection
|
2015-12-10 17:21:25 -08:00 |
blackc2004
|
e69bc4da6b
|
extension download
|
2015-12-10 15:07:46 -08:00 |
|
blackc2004
|
904de0b267
|
remove print
|
2015-12-10 11:10:32 -08:00 |
|
blackc2004
|
f15a1c7a9c
|
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
|
c1ff104eed
|
Merge pull request #2 from fusionpbx/master
test2
|
2015-12-10 08:17:05 -08:00 |
|
Matthew Vale
|
4776ceb030
|
added switch git_info where available
|
2015-12-10 11:58:09 +00:00 |
|
Matthew Vale
|
cb440de264
|
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
|
b76a1a4b4f
|
First pass on app/*
|
2015-12-10 10:12:41 +00:00 |
|
Matthew Vale
|
bb1a708444
|
Remvoed tab for consistency
|
2015-12-10 10:11:45 +00:00 |
|
Matthew Vale
|
f8684de1cf
|
First pass on core/*
|
2015-12-10 10:09:07 +00:00 |
|
Matthew Vale
|
3d16581959
|
Initial consolidation of common terms
|
2015-12-10 10:06:48 +00:00 |
|
Matthew Vale
|
b5a2fa0f29
|
Added initial version of app/languages
for analyzing missing or overlapping with global text
|
2015-12-10 10:04:35 +00:00 |
|
Matthew Vale
|
45dfcabd3d
|
Add Fallback language support to en-us
|
2015-12-10 09:57:54 +00:00 |
|
Matthew Vale
|
e4c711e8f7
|
Migrate app_languages.php from core to resources
|
2015-12-10 09:57:08 +00:00 |
|
FusionPBX
|
3df36af619
|
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
|
f3f1cf655e
|
Merge pull request #1295 from moteus/fax_queue_greet_combobox
Add. Allows select greeting.
|
2015-12-09 16:26:43 -08:00 |
|
FusionPBX
|
91adf12550
|
Merge pull request #1296 from moteus/fax_queue
Fax queue web monitor
|
2015-12-09 16:25:29 -08:00 |
|
FusionPBX
|
60928c5b3d
|
Merge pull request #1303 from blackc2004/patch-19
Update directory.lua
|
2015-12-09 15:02:48 -08:00 |
|
FusionPBX
|
41cb6d4407
|
Merge pull request #1304 from blackc2004/patch-18
Update devices.php
|
2015-12-09 15:01:08 -08:00 |
|
FusionPBX
|
a1ed12aefa
|
Merge pull request #1305 from blackc2004/patch-17
Update call_edit.php
|
2015-12-09 15:00:17 -08:00 |
|
FusionPBX
|
1e609b6f96
|
Merge pull request #1306 from blackc2004/patch-16
Update app_languages.php
|
2015-12-09 14:57:42 -08:00 |
|
FusionPBX
|
c5306533ad
|
Merge pull request #1307 from blackc2004/patch-15
Update app_config.php
|
2015-12-09 14:57:06 -08:00 |
|
FusionPBX
|
9a8a37378f
|
Merge pull request #1308 from blackc2004/patch-14
Update 010_user_exists.xml
|
2015-12-09 14:55:43 -08:00 |
|
FusionPBX
|
5e3ee88677
|
Merge pull request #1309 from blackc2004/patch-20
Update extension.php
|
2015-12-09 14:55:13 -08:00 |
|
FusionPBX
|
0e850c16b0
|
Merge pull request #1310 from blackc2004/patch-21
Update index.lua
|
2015-12-09 14:54:30 -08:00 |
|
FusionPBX
|
00b5dc622e
|
Merge pull request #1311 from blackc2004/patch-22
Update app_languages.php
|
2015-12-09 14:53:51 -08:00 |
|
FusionPBX
|
406e7ed127
|
Merge pull request #1312 from blackc2004/patch-23
Update xml_cdr_inc.php
|
2015-12-09 14:53:25 -08:00 |
|
FusionPBX
|
8eb2787ff8
|
Merge pull request #1313 from blackc2004/patch-24
Update xml_cdr_search.php
|
2015-12-09 14:52:45 -08:00 |
|
blackc2004
|
de1ab15095
|
test
|
2015-12-09 14:44:22 -08:00 |
|
blackc2004
|
3984600ebe
|
Merge pull request #1 from fusionpbx/master
test
|
2015-12-09 14:31:37 -08:00 |
|
blackc2004
|
b77560d27f
|
Update xml_cdr_search.php
|
2015-12-09 14:09:12 -08:00 |
|
blackc2004
|
73da7ffaf3
|
Update xml_cdr_inc.php
|
2015-12-09 14:08:33 -08:00 |
|
blackc2004
|
284aa93458
|
Update app_languages.php
|
2015-12-09 14:07:58 -08:00 |
|
blackc2004
|
0778fd2d2e
|
Update index.lua
|
2015-12-09 14:04:59 -08:00 |
|
blackc2004
|
d0a6a57ddc
|
Update extension.php
|
2015-12-09 14:04:26 -08:00 |
|
blackc2004
|
b64a94fdc6
|
Update directory.lua
|
2015-12-09 14:03:17 -08:00 |
|
blackc2004
|
85eda7c097
|
Update devices.php
|
2015-12-09 14:01:35 -08:00 |
|
blackc2004
|
e253f9304f
|
Update call_edit.php
|
2015-12-09 14:00:44 -08:00 |
|
blackc2004
|
2711d8a6c1
|
Update app_languages.php
|
2015-12-09 14:00:13 -08:00 |
|
blackc2004
|
f7a44633b1
|
Update app_config.php
|
2015-12-09 13:59:43 -08:00 |
|
blackc2004
|
e8f471974b
|
Update 010_user_exists.xml
|
2015-12-09 13:59:15 -08:00 |
|
markjcrane
|
15232aea60
|
Add the ${ and } to user_exists so that it works with the condition.
|
2015-12-09 12:10:31 -07:00 |
|
markjcrane
|
c6980b9fe6
|
Remove the self closing tag on the local_extension condition.
|
2015-12-09 12:05:20 -07:00 |
Alexey Melnichuk
|
9e001af711
|
Fix. Use task db connection to build template.
|
2015-12-09 14:56:02 +03:00 |
|
Alexey Melnichuk
|
c0ec50e46c
|
Fix. forgotten images.
|
2015-12-09 13:51:25 +03:00 |
|
Alexey Melnichuk
|
742a782183
|
Fix. Use `Test` interface to translate UI.
|
2015-12-09 13:37:32 +03:00 |
|
Alexey Melnichuk
|
199b7e0def
|
Add. Allows select greeting.
|
2015-12-09 13:21:37 +03:00 |
|
Alexey Melnichuk
|
5cb8aa1d2a
|
Change. `Send` button redirect to `Active` page.
|
2015-12-09 13:00:42 +03:00 |