dbxe
/
fusionpbx
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
6,261 Commits 3 Branches 10 Tags 224 MiB
Commit Graph

6261 Commits

Author SHA1 Message Date
markjcrane 6b657b0ef1 Fix a spelling mistake. 2016-03-25 20:17:34 -06:00
markjcrane d7dbe2d51f Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-25 20:14:59 -06:00
markjcrane da6297918e Remove two deprecated default settings and a missing one. 2016-03-25 20:14:39 -06:00
reliberate 88ac4fb2ee Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-25 19:51:18 -06:00
reliberate 00c7ea8016 Fixed: Default Theme - Adjust top body margin when menu position is bottom. 2016-03-25 19:49:52 -06:00
markjcrane 92a57a73ce Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-25 19:46:00 -06:00
markjcrane 8053c07a02 Make the code more efficient adding the theme default settings. 2016-03-25 19:45:39 -06:00
reliberate 7a2fc74481 Enhance: Default Theme - enable menu style and positioning options. 2016-03-25 19:38:57 -06:00
markjcrane f5a1802282 Remove the extra $x++; 2016-03-25 19:27:43 -06:00
markjcrane c2d3a61a66 Remove the enhanced theme. 2016-03-25 19:24:45 -06:00
markjcrane 181e26144e Add default settings to control the new theme. 2016-03-25 19:22:26 -06:00
markjcrane 8cdadc0ea4 Move the app_defaults.php from theme/enhanced to themes/default. 2016-03-25 17:26:28 -06:00
reliberate 7fa8226f8d Added (Really!): Moment.js - used by jQuery DateTimePicker plugin. 2016-03-25 16:52:07 -06:00
reliberate e3fb32e1a2 Added: Moment.js - used by jQuery DateTimePicker plugin. 2016-03-25 16:39:19 -06:00
reliberate a49337129d Fixed: Control icon paths for Default theme. 2016-03-25 16:38:20 -06:00
reliberate 5b58196c16 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-25 16:33:54 -06:00
reliberate 9aae7bdd79 Added: Moment.js framework (used by jQuery DateTimePicker plugin) 2016-03-25 16:33:05 -06:00
markjcrane 6631061d70 Set the default theme as the default. 2016-03-25 16:30:35 -06:00
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