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

6486 Commits

Author SHA1 Message Date
markjcrane 4048814fb6 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-25 19:46:00 -06:00
markjcrane f0b47a62ab Make the code more efficient adding the theme default settings. 2016-03-25 19:45:39 -06:00
reliberate 44e77b0eef Enhance: Default Theme - enable menu style and positioning options. 2016-03-25 19:38:57 -06:00
markjcrane 4c026f74d6 Remove the extra $x++; 2016-03-25 19:27:43 -06:00
markjcrane e7efd80308 Remove the enhanced theme. 2016-03-25 19:24:45 -06:00
markjcrane 031986d814 Add default settings to control the new theme. 2016-03-25 19:22:26 -06:00
markjcrane f104dbdc71 Move the app_defaults.php from theme/enhanced to themes/default. 2016-03-25 17:26:28 -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 ef4f7bcd95 Fixed: Control icon paths for Default theme. 2016-03-25 16:38:20 -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 0e8b0aedad 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 ddcb4cab28 Revert "Revert "Revert "search selects""" 2016-03-24 22:25:18 -06:00
FusionPBX 740a49e0c2 Merge pull request #1508 from fusionpbx/revert-1507-revert-1497-master 
Revert "Revert "search selects""
 2016-03-24 22:03:56 -06:00
FusionPBX d7b95e462b Revert "Revert "search selects"" 2016-03-24 22:03:37 -06:00
FusionPBX 593428717d Merge pull request #1507 from fusionpbx/revert-1497-master 
Revert "search selects"
 2016-03-24 22:02:59 -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 5da0279a24 Merge pull request #1491 from dis45927/master 
Fix bug preventing mysql database creation
 2016-03-24 21:47:11 -06:00
FusionPBX 26bc871c46 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 a93902cfcc Fix some of the elements in the contacts array. 2016-03-24 21:43:03 -06:00
FusionPBX 51a1f88d94 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 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 b11b98da52 Change sytnax from database["name"] to database.name in the config.lua. 2016-03-24 20:15:09 -06:00
markjcrane 0047f48f45 Use regex with is_local. 2016-03-24 18:43:51 -06:00
markjcrane 7a4d698f1a Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-24 15:02:30 -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
Alexey Melnichuk f59bc03c9d Fix. SQL in group contacts 2016-03-24 17:59:01 +03:00
Alexey Melnichuk 011d9a8322 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 f04ccb925a Fix. SQL text to query user contact in provision class 2016-03-24 15:54:29 +03:00
FusionPBX fcdf4fb6ce 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 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