nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2025-12-30 09:03:49 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,243 Commits 4 Branches 11 Tags
13e3aa4fa82e6fd7fa422c693b60eed05809ae92
Commit Graph

6243 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
reliberate
13e3aa4fa8 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
5906618ff3 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
423e0ab503 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
c5e804cb3c Update acl.conf.lua 
Change expire acl.conf to acl_conf
 2016-03-25 01:00:43 -06:00
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
e19d0ccd74 Merge pull request #1509 from fusionpbx/revert-1508-revert-1507-revert-1497-master 
Revert "Revert "Revert "search selects"""
 2016-03-24 22:26:18 -06:00
FusionPBX
eb81998165 Revert "Revert "Revert "search selects""" 2016-03-24 22:25:18 -06:00
FusionPBX
1bec4aba89 Merge pull request #1508 from fusionpbx/revert-1507-revert-1497-master 
Revert "Revert "search selects""
 2016-03-24 22:03:56 -06:00
FusionPBX
90242c0c60 Revert "Revert "search selects"" 2016-03-24 22:03:37 -06:00
FusionPBX
1a576b0d6a Merge pull request #1507 from fusionpbx/revert-1497-master 
Revert "search selects"
 2016-03-24 22:02:59 -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
1eb5b54119 Merge pull request #1491 from dis45927/master 
Fix bug preventing mysql database creation
 2016-03-24 21:47:11 -06:00
FusionPBX
a0e736fb34 Merge pull request #1500 from moteus/provision_contact_sql 
Fix. SQL text to query user contact in provision class
 2016-03-24 21:44:32 -06:00
markjcrane
459a5931fa Fix some of the elements in the contacts array. 2016-03-24 21:43:03 -06:00
FusionPBX
1807b37872 Merge pull request #1502 from moteus/provision_contact_category 
Fix. Export `contact_category` for provisioning template
 2016-03-24 21:38:50 -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
0e3ea02f72 Change sytnax from database["name"] to database.name in the config.lua. 2016-03-24 20:15:09 -06:00
markjcrane
e1b6087e04 Use regex with is_local. 2016-03-24 18:43:51 -06:00
markjcrane
b940749eb5 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-24 15:02:30 -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
Alexey Melnichuk
62c4618259 Fix. SQL in group contacts 2016-03-24 17:59:01 +03:00
Alexey Melnichuk
2ab96611ef Fix. Export contact_category for provisioning template 
Add. Export `contact_type` and `phone_label` for provisioning template
 2016-03-24 17:54:31 +03:00
Alexey Melnichuk
4bb595f797 Fix. SQL text to query user contact in provision class 2016-03-24 15:54:29 +03:00
FusionPBX
53d609624b Merge pull request #1499 from moteus/fax_active_gateway_name 
Fix. Display correct gateway name in URI on `Fax Active` page
 2016-03-23 21:34:45 -06: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
Alexey Melnichuk
facbd6a62d Fix. Display correct gateway name in URI on Fax Active page 2016-03-23 14:02:33 +03:00
markjcrane
bb379b997e Show both LAN and WAN IP in the registrations. 2016-03-23 00:14:30 -06:00
markjcrane
85263b3a00 Replace the external ip with the internal nat ip address. 2016-03-23 00:07:50 -06:00
markjcrane
f5002bec99 Re-add the time condition dialplan button label. 2016-03-22 23:52:37 -06:00
markjcrane
c4332db765 Time condition hide the group label as it uses too much vertical space and the group number is provided by default. 2016-03-22 23:39:23 -06:00
blackc2004
128026f3e8 search selects 2016-03-22 15:42:46 -07:00
markjcrane
fe320d40da Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-21 23:45:36 -06:00
markjcrane
cb320f3734 SPA122 - Set message waiting light to No when provisioning the device. 2016-03-21 23:45:05 -06:00
reliberate
bab6f047f9 User Settings: Select query fix, case adjustment on Domain Template select option labels. 2016-03-21 16:54:59 -06:00
reliberate
74006543ef Editor: Fix Clip Library folder nesting, misc adjustments to Clip and File lists. 2016-03-21 16:01:44 -06:00
markjcrane
f3114cdf05 Add support for destination_number name to be customized on inbound routes. 2016-03-21 11:13:47 -06:00
reliberate
fddd3d98ea Dashboard: Fix Memory & Disk Usage stats. 2016-03-21 10:45:03 -06:00
markjcrane
468f4f859c Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-20 13:52:00 -06:00
markjcrane
ab4fb51355 Fix the install title. 2016-03-20 13:51:17 -06:00