markjcrane
|
ab7bd4a3d3
|
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
|
2016-03-24 23:08:45 -06:00 |
|
markjcrane
|
66e01ef9dc
|
Change to the new context require renaming two variables to be consistent and to prevent a problem.
|
2016-03-24 23:08:23 -06:00 |
|
FusionPBX
|
eb81998165
|
Revert "Revert "Revert "search selects"""
|
2016-03-24 22:25:18 -06:00 |
|
FusionPBX
|
90242c0c60
|
Revert "Revert "search selects""
|
2016-03-24 22:03:37 -06:00 |
|
FusionPBX
|
68e728b0b6
|
Revert "search selects"
|
2016-03-24 22:02:41 -06:00 |
|
FusionPBX
|
7217d29d8b
|
Merge pull request #1497 from blackc2004/master
search selects
|
2016-03-24 21:56:20 -06:00 |
|
FusionPBX
|
eeae7f0cc8
|
Merge pull request #1503 from blackc2004/patch-37
Update directory_extensions.xml
|
2016-03-24 21:37:06 -06:00 |
|
FusionPBX
|
4f068c1d7f
|
Merge pull request #1504 from blackc2004/patch-38
Update directory_extensions.xml
|
2016-03-24 21:28:46 -06:00 |
|
FusionPBX
|
f180be3792
|
Merge pull request #1505 from blackc2004/patch-39
Update directory_extensions.xml
|
2016-03-24 21:28:26 -06:00 |
|
FusionPBX
|
29777ef631
|
Merge pull request #1506 from blackc2004/patch-40
Update directory_extensions.xml
|
2016-03-24 21:28:01 -06:00 |
|
markjcrane
|
e1b6087e04
|
Use regex with is_local.
|
2016-03-24 18:43:51 -06:00 |
|
markjcrane
|
83edd6a7fd
|
On windows force to / instead of the backslash \ as path. This fixes a problem where recording c:\pathtofusionpbx\recordings fails because the \r gets understood as a carriage return in the session:record in FreeSWITCH.
|
2016-03-24 15:02:04 -06:00 |
|
blackc2004
|
310863f21f
|
Update directory_extensions.xml
|
2016-03-24 08:38:53 -07:00 |
|
blackc2004
|
e73f2bf963
|
Update directory_extensions.xml
|
2016-03-24 08:38:39 -07:00 |
|
blackc2004
|
659d2b084e
|
Update directory_extensions.xml
|
2016-03-24 08:38:25 -07:00 |
|
blackc2004
|
c7ce82c3a9
|
Update directory_extensions.xml
|
2016-03-24 08:38:07 -07:00 |
|
blackc2004
|
6b4f552f6d
|
fix directory_extension for new contacts variable
|
2016-03-23 12:23:41 -07:00 |
|
markjcrane
|
785071cde6
|
In the IVR Menu make sure direct dial checks if the destination is an extension before sending the call to it.
|
2016-03-23 12:49:32 -06:00 |
|
markjcrane
|
db3c649aaf
|
Update the disa.lua to prevent errors when caller hangs up before the destination is called.
|
2016-03-23 11:42:20 -06:00 |
|
blackc2004
|
128026f3e8
|
search selects
|
2016-03-22 15:42:46 -07:00 |
|
markjcrane
|
cb320f3734
|
SPA122 - Set message waiting light to No when provisioning the device.
|
2016-03-21 23:45:05 -06:00 |
|
markjcrane
|
8a0331925a
|
Fix a spelling mistake in xml handler ivr.conf.lua.
|
2016-03-20 00:49:21 -06:00 |
|
markjcrane
|
57e212ff42
|
Fix direct dial for IVR using the xml handler.
|
2016-03-19 18:13:49 -06:00 |
|
markjcrane
|
db8fa2e5f5
|
Add destination number regex and string_to_regex function.
|
2016-03-17 13:22:03 -06:00 |
|
markjcrane
|
36d8c7815d
|
Change daylight_savings_start_date to daylight_savings_start_day as it is more accurate for representing the data. Add daylight_savings_start_time and daylight_savings_stop_time
|
2016-03-15 16:15:32 -06:00 |
|
markjcrane
|
6e4be852ad
|
Update default settings add daylight_savings_start_month and date for the polycom templates.
|
2016-03-15 13:51:01 -06:00 |
|
markjcrane
|
0deda1db2e
|
Rolling back PHPMailer from version 5.2.14 to 5.2.2. The latest version had a problem with smtp authentication set to false it still tried to authenticate.
|
2016-03-15 02:58:23 -06:00 |
|
markjcrane
|
d8aeecad35
|
Update the Cisco 79xx templates to work with the new contacts array.
|
2016-03-14 18:56:00 -06:00 |
|
markjcrane
|
1c9ee3a8ff
|
Add a missing semi-colon.
|
2016-03-12 22:16:22 -07:00 |
|
markjcrane
|
afe19e8a40
|
Change $language_name to $text['language-name'] this will follow current naming standards in app_languages.php and reduces code needed in the text class.
|
2016-03-12 22:06:57 -07:00 |
|
markjcrane
|
ed2898aa33
|
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
|
2016-03-11 14:21:28 -07:00 |
|
markjcrane
|
8588a4caea
|
Get the domain_name from the array.
|
2016-03-11 14:21:08 -07:00 |
|
FusionPBX
|
c529dcdac1
|
Merge pull request #1475 from mafoo/WhitespaceClean-resources/provision/polycom
WhitespaceClean-resources/provision/polycom
|
2016-03-11 13:34:49 -07:00 |
|
FusionPBX
|
9e1564b967
|
Merge pull request #1476 from mafoo/WhitespaceClean-resources/provision/yealink
WhitespaceClean-resources/provision/yealink
|
2016-03-11 13:34:22 -07:00 |
|
FusionPBX
|
275ebe290a
|
Merge pull request #1474 from mafoo/WhitespaceClean-resources/provision/grandstream
WhitespaceClean-resources/provision/grandstream
|
2016-03-11 13:32:31 -07:00 |
|
FusionPBX
|
c0a43d3cd3
|
Merge pull request #1477 from mafoo/WhitespaceClean-resources/provision/mitel
WhitespaceClean-resources/provision/mitel
|
2016-03-11 13:32:01 -07:00 |
|
FusionPBX
|
534b6d9384
|
Merge pull request #1478 from mafoo/WhitespaceClean-resources/provision/others
WhitespaceClean-resources/provision/others
|
2016-03-11 13:31:33 -07:00 |
|
FusionPBX
|
6011bb3b0f
|
Merge pull request #1481 from mafoo/WhitespaceClean-resources/jquery
WhitespaceClean-resources/jquery
|
2016-03-11 13:27:02 -07:00 |
|
FusionPBX
|
93c4c56da2
|
Merge pull request #1461 from mafoo/BugFix-ring_groups
corrected function definition
|
2016-03-11 13:25:20 -07:00 |
|
FusionPBX
|
9987681740
|
Merge pull request #1472 from mafoo/WhitespaceClean-resources/classes
WhitespaceClean-resources/classes
|
2016-03-11 13:22:57 -07:00 |
|
FusionPBX
|
c6a68388a1
|
Merge pull request #1479 from mafoo/WhitespaceClean-resources/install/scripts
WhitespaceClean-resources/install/scripts
|
2016-03-11 13:20:17 -07:00 |
|
FusionPBX
|
4219954db5
|
Merge pull request #1473 from mafoo/WhitespaceClean-resources/provision/cisco
WhitespaceClean-resources/provision/cisco
|
2016-03-11 13:19:13 -07:00 |
|
FusionPBX
|
db41938a54
|
Merge pull request #1480 from mafoo/WhitespaceClean-resources/templates/conf
WhitespaceClean-resources/templates/conf
|
2016-03-11 13:18:21 -07:00 |
|
FusionPBX
|
0784e64bcb
|
Merge pull request #1482 from mafoo/WhitespaceClean-resources/edit_area
WhitespaceClean-resources/edit_area
|
2016-03-11 13:16:31 -07:00 |
|
FusionPBX
|
c147c958bc
|
Merge pull request #1483 from mafoo/WhitespaceClean-resources/templates/engine/smarty
WhitespaceClean-resources/templates/smarty
|
2016-03-11 13:16:14 -07:00 |
|
FusionPBX
|
353843a64f
|
Merge pull request #1484 from mafoo/WhitespaceClean-resources/others
WhitespaceClean-resources/others
|
2016-03-11 13:15:09 -07:00 |
|
markjcrane
|
3898a18f42
|
Prevent custom sip port from breaking provision.lua and add prevent nil concatenation errors.
|
2016-03-11 10:31:11 -07:00 |
|
mafoo
|
2b39287bdc
|
WhitespaceClean-resources/others
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
|
2016-03-11 13:57:01 +00:00 |
|
mafoo
|
5de8363e78
|
WhitespaceClean-resources/templates/smarty
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
|
2016-03-11 13:45:32 +00:00 |
|
mafoo
|
ee948572a0
|
WhitespaceClean-resources/edit_area
whitespace pass over files
for reference regex that was used s/[ \t]+(\r?\n)/\1/
|
2016-03-11 13:29:29 +00:00 |
|