d6ecfa1ca2
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-27 00:33:38 -06:00
4fa0649eba
Only call the scripts class if its installed.
2016-03-27 00:33:19 -06:00
77cff78bf2
Theme adjustments and fixes.
...
Flesh out Theme Default Settings descriptions.
2016-03-27 00:32:19 -06:00
2107b2a1b5
Fix v_settings update sql command in app/settings/app_defaults.php.
2016-03-26 23:59:28 -06:00
4c1a5d6579
Remove agent_admin from call_centers/app_menu.php as it doesn't exist by default and causes an error.
2016-03-26 23:36:13 -06:00
db9ba1f533
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-26 22:59:19 -06:00
fa2b753e62
Add the menu_default method to app_defaults.php.
2016-03-26 22:59:00 -06:00
9894a34004
Default Template: Removed body_opacity setting - superseded by body_color rgba ability
2016-03-26 21:42:55 -06:00
c0b93e849c
Change the method name to menu_default.
2016-03-26 21:22:52 -06:00
d5b3fffda8
Add methoed 'default' to the menu class.
2016-03-26 21:18:02 -06:00
f15645f2a1
Minor adjustment to the checkbox.
2016-03-26 19:51:44 -06:00
a836d7985b
Remove the include to the resources/menu.php file that is no longer in use.
2016-03-26 19:37:42 -06:00
a3f87106ee
Fix two of the button labels.
2016-03-26 19:35:24 -06:00
3d7b9fef13
Fix a the name of a few of the install buttons.
2016-03-26 19:29:04 -06:00
d71f1323c3
Update the install.php.
2016-03-26 19:17:33 -06:00
e3175814bd
Fix the reference to the prepared statement.
2016-03-26 14:03:44 -06:00
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
7f64cca1fa
Remove the conflict install language is set with the radio buttons.
2016-03-26 13:14:57 -06:00
2e5f4ab596
Remove the fieldset and label as the alignment is not working with bootstrap.
2016-03-26 13:09:22 -06:00
3e5c9f3be4
Adjust the width of the language section of the install.
2016-03-26 12:35:40 -06:00
ba095f3852
Additional work to improve the install, template and the menu.
2016-03-26 12:22:15 -06:00
0e649f9020
Don't error if the menu is not available for the install.php.
2016-03-26 11:45:57 -06:00
5468042d8d
Fix the install.php.
2016-03-26 09:18:36 -06:00
6991199fac
Fix a spelling mistake.
2016-03-25 20:17:34 -06:00
45ff056ce6
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-25 20:14:59 -06:00
6aededb90a
Remove two deprecated default settings and a missing one.
2016-03-25 20:14:39 -06:00
943fb2c2b2
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-25 19:51:18 -06:00
ba9f5c7b72
Fixed: Default Theme - Adjust top body margin when menu position is bottom.
2016-03-25 19:49:52 -06:00
4048814fb6
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-25 19:46:00 -06:00
f0b47a62ab
Make the code more efficient adding the theme default settings.
2016-03-25 19:45:39 -06:00
44e77b0eef
Enhance: Default Theme - enable menu style and positioning options.
2016-03-25 19:38:57 -06:00
4c026f74d6
Remove the extra $x++;
2016-03-25 19:27:43 -06:00
e7efd80308
Remove the enhanced theme.
2016-03-25 19:24:45 -06:00
031986d814
Add default settings to control the new theme.
2016-03-25 19:22:26 -06:00
f104dbdc71
Move the app_defaults.php from theme/enhanced to themes/default.
2016-03-25 17:26:28 -06:00
87f598d6e7
Added (Really!): Moment.js - used by jQuery DateTimePicker plugin.
2016-03-25 16:52:07 -06:00
31ff4e69a8
Added: Moment.js - used by jQuery DateTimePicker plugin.
2016-03-25 16:39:19 -06:00
ef4f7bcd95
Fixed: Control icon paths for Default theme.
2016-03-25 16:38:20 -06:00
c37520cb6f
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-25 16:33:54 -06:00
0f11beead9
Added: Moment.js framework (used by jQuery DateTimePicker plugin)
2016-03-25 16:33:05 -06:00
8c33f72ed5
Set the default theme as the default.
2016-03-25 16:30:35 -06:00
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
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
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
4ce2bb5c8f
Update acl.conf.lua
...
Change expire acl.conf to acl_conf
2016-03-25 01:00:43 -06:00
bb4113e210
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-24 23:08:45 -06:00
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
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
ddcb4cab28
Revert "Revert "Revert "search selects"""
2016-03-24 22:25:18 -06:00
740a49e0c2
Merge pull request #1508 from fusionpbx/revert-1507-revert-1497-master
...
Revert "Revert "search selects""
2016-03-24 22:03:56 -06:00
markjcrane
reliberate
Alexey Melnichuk