Commit Graph

1831 Commits

Author SHA1 Message Date
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
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
markjcrane 9cd30165d4 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 d1d041dc62 Update default settings add daylight_savings_start_month and date for the polycom templates. 2016-03-15 13:51:01 -06:00
markjcrane 36529ae05a 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 56350a8468 Update the Cisco 79xx templates to work with the new contacts array. 2016-03-14 18:56:00 -06:00
markjcrane 27829859b9 Add a missing semi-colon. 2016-03-12 22:16:22 -07:00
markjcrane f924453e1c 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 61987425af Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-11 14:21:28 -07:00
markjcrane c11459fae8 Get the domain_name from the array. 2016-03-11 14:21:08 -07:00
FusionPBX 8a8629404a Merge pull request #1475 from mafoo/WhitespaceClean-resources/provision/polycom
WhitespaceClean-resources/provision/polycom
2016-03-11 13:34:49 -07:00
FusionPBX 3c85bc5999 Merge pull request #1476 from mafoo/WhitespaceClean-resources/provision/yealink
WhitespaceClean-resources/provision/yealink
2016-03-11 13:34:22 -07:00
FusionPBX 55993a1db7 Merge pull request #1474 from mafoo/WhitespaceClean-resources/provision/grandstream
WhitespaceClean-resources/provision/grandstream
2016-03-11 13:32:31 -07:00
FusionPBX bd6efe903c Merge pull request #1477 from mafoo/WhitespaceClean-resources/provision/mitel
WhitespaceClean-resources/provision/mitel
2016-03-11 13:32:01 -07:00
FusionPBX 489f1ef95f Merge pull request #1478 from mafoo/WhitespaceClean-resources/provision/others
WhitespaceClean-resources/provision/others
2016-03-11 13:31:33 -07:00
FusionPBX a22660bbff Merge pull request #1481 from mafoo/WhitespaceClean-resources/jquery
WhitespaceClean-resources/jquery
2016-03-11 13:27:02 -07:00