nsinnovations/fusionpbx
2
0
Fork 0
mirror of https://github.com/fusionpbx/fusionpbx.git synced 2026-01-06 11:43:50 +00:00
Code Issues Packages Projects Releases Wiki Activity
6,447 Commits 4 Branches 11 Tags
8731afb5e207ce2a995237bc301e7e8d02b463f5
Commit Graph

6447 Commits

This Branch
This Branch
All Branches
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
7f64cca1fa Remove the conflict install language is set with the radio buttons. 2016-03-26 13:14:57 -06:00
markjcrane
2e5f4ab596 Remove the fieldset and label as the alignment is not working with bootstrap. 2016-03-26 13:09:22 -06:00
markjcrane
3e5c9f3be4 Adjust the width of the language section of the install. 2016-03-26 12:35:40 -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
markjcrane
5468042d8d Fix the install.php. 2016-03-26 09:18:36 -06:00
markjcrane
6991199fac Fix a spelling mistake. 2016-03-25 20:17:34 -06:00
markjcrane
45ff056ce6 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-25 20:14:59 -06:00
markjcrane
6aededb90a Remove two deprecated default settings and a missing one. 2016-03-25 20:14:39 -06:00
reliberate
943fb2c2b2 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-25 19:51:18 -06:00
reliberate
ba9f5c7b72 Fixed: Default Theme - Adjust top body margin when menu position is bottom. 2016-03-25 19:49:52 -06:00
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