markjcrane
13792ebd59
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-29 02:35:59 -06:00
markjcrane
ac853eebaa
Add http authentication option to all Cisco SPA phones.
2016-03-29 02:35:33 -06:00
reliberate
5974b686e9
Apps: Integrate ability to set paging via a Default/Domain/User Setting (domain > paging > numeric).
2016-03-28 23:02:11 -06:00
markjcrane
ec4f523caf
Rollback changes to is_local.lua determined that switching to regex would lower perfomance adding an 'or' with a search for prefix would perform better.
2016-03-27 20:44:14 -06:00
markjcrane
2cd979b30c
A global domain is optional. Using public context instead.
2016-03-27 04:46:01 -06:00
FusionPBX
71cdf97e5a
Merge pull request #1512 from schraegervogel/master
...
initialize call_context
2016-03-27 04:25:22 -06:00
markjcrane
4fa0649eba
Only call the scripts class if its installed.
2016-03-27 00:33:19 -06:00
markjcrane
fa2b753e62
Add the menu_default method to app_defaults.php.
2016-03-26 22:59:00 -06:00
markjcrane
c0b93e849c
Change the method name to menu_default.
2016-03-26 21:22:52 -06:00
markjcrane
d5b3fffda8
Add methoed 'default' to the menu class.
2016-03-26 21:18:02 -06:00
markjcrane
a836d7985b
Remove the include to the resources/menu.php file that is no longer in use.
2016-03-26 19:37:42 -06:00
markjcrane
d71f1323c3
Update the install.php.
2016-03-26 19:17:33 -06:00
markjcrane
e3175814bd
Fix the reference to the prepared statement.
2016-03-26 14:03:44 -06:00
markjcrane
c6f0759a5c
Change the code in the menu to return immediately if the database object is not ready in this case its not ready until the install.php is finished.
2016-03-26 13:36:00 -06:00
markjcrane
ba095f3852
Additional work to improve the install, template and the menu.
2016-03-26 12:22:15 -06:00
markjcrane
0e649f9020
Don't error if the menu is not available for the install.php.
2016-03-26 11:45:57 -06:00
reliberate
87f598d6e7
Added (Really!): Moment.js - used by jQuery DateTimePicker plugin.
2016-03-25 16:52:07 -06:00
reliberate
31ff4e69a8
Added: Moment.js - used by jQuery DateTimePicker plugin.
2016-03-25 16:39:19 -06:00
reliberate
c37520cb6f
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-25 16:33:54 -06:00
reliberate
0f11beead9
Added: Moment.js framework (used by jQuery DateTimePicker plugin)
2016-03-25 16:33:05 -06:00
markjcrane
8c33f72ed5
Set the default theme as the default.
2016-03-25 16:30:35 -06:00
reliberate
d5c60df4fc
Added: Bootstrap Framework - initial integration.
...
Added: Bootstrap Plugins - DateTimePicker, ColorPicker (in multiple apps)
Added: Default Theme - responsive
Removed: RightJS Framework - no longer needed.
Removed: Accessible Theme - superseded by Default theme.
Removed: Minimized Theme - superseded by Default theme.
Enhanced: Menu - responsiveness added.
Enhanced: Dashboard - responsiveness added.
Etc.
2016-03-25 16:29:20 -06:00
FusionPBX
0831a99dd0
Merge pull request #1510 from moteus/databas_role
...
Add. `role` to be able select database backend in constructor.
2016-03-25 15:52:47 -06:00
schraegervogel
919b383c6e
initialize call_context
...
If you use xml_locate dialplan from fs_cli, you get an error, to prevent this I intialized call_context with the "domain"-var
2016-03-25 17:28:10 +01:00
Alexey Melnichuk
93e50ff1df
Add. role to be able select database backend in constructor.
...
To configure use `database.backend` option
It can be a string value like `database.backend = 'native'`.
So it will always use same backend.
Or it can be a table value like
```Lua
database.backend = {
main = 'native';
base64 = '';
}
```
Role `database.backend.main` is predefined and it equal to `native` if not set.
If there no role when Database class creates or role unknown role `main` is used
```Lua
dbh = Database.new('system') -- uses role `main`
dbh = Database.new('system', 'main') -- same as previews
dbh = Database.new('system', 'base64') -- uses role `base64`
dbh = Database.new('system', 'test') -- uses role `main`
```
2016-03-25 10:04:48 +03:00
FusionPBX
4ce2bb5c8f
Update acl.conf.lua
...
Change expire acl.conf to acl_conf
2016-03-25 01:00:43 -06:00
markjcrane
bb4113e210
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-24 23:08:45 -06:00
markjcrane
4a31b2343e
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
ddcb4cab28
Revert "Revert "Revert "search selects"""
2016-03-24 22:25:18 -06:00
FusionPBX
d7b95e462b
Revert "Revert "search selects""
2016-03-24 22:03:37 -06:00
FusionPBX
f9096f9cf1
Revert "search selects"
2016-03-24 22:02:41 -06:00
FusionPBX
e9904a03da
Merge pull request #1497 from blackc2004/master
...
search selects
2016-03-24 21:56:20 -06:00
FusionPBX
b1a0e9026a
Merge pull request #1503 from blackc2004/patch-37
...
Update directory_extensions.xml
2016-03-24 21:37:06 -06:00
FusionPBX
3c423e7f40
Merge pull request #1504 from blackc2004/patch-38
...
Update directory_extensions.xml
2016-03-24 21:28:46 -06:00
FusionPBX
7b90f54a67
Merge pull request #1505 from blackc2004/patch-39
...
Update directory_extensions.xml
2016-03-24 21:28:26 -06:00
FusionPBX
e0d80a1c11
Merge pull request #1506 from blackc2004/patch-40
...
Update directory_extensions.xml
2016-03-24 21:28:01 -06:00
markjcrane
0047f48f45
Use regex with is_local.
2016-03-24 18:43:51 -06:00
markjcrane
9249e1db9a
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
b69a21947b
Update directory_extensions.xml
2016-03-24 08:38:53 -07:00
blackc2004
7479b73ff1
Update directory_extensions.xml
2016-03-24 08:38:39 -07:00
blackc2004
75829a94c9
Update directory_extensions.xml
2016-03-24 08:38:25 -07:00
blackc2004
2234dfae70
Update directory_extensions.xml
2016-03-24 08:38:07 -07:00
blackc2004
137d604e04
fix directory_extension for new contacts variable
2016-03-23 12:23:41 -07:00
markjcrane
08ea915070
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
33aed1c15d
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
c2e1755931
search selects
2016-03-22 15:42:46 -07:00
markjcrane
4a28244650
SPA122 - Set message waiting light to No when provisioning the device.
2016-03-21 23:45:05 -06:00
markjcrane
fafe273c18
Fix a spelling mistake in xml handler ivr.conf.lua.
2016-03-20 00:49:21 -06:00
markjcrane
2a280afea9
Fix direct dial for IVR using the xml handler.
2016-03-19 18:13:49 -06:00
markjcrane
08b4e3138c
Add destination number regex and string_to_regex function.
2016-03-17 13:22:03 -06:00