ac4aef20b0
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
883a0ecdeb
Remove the conflict install language is set with the radio buttons.
2016-03-26 13:14:57 -06:00
9c49a0ce54
Remove the fieldset and label as the alignment is not working with bootstrap.
2016-03-26 13:09:22 -06:00
ae125390c3
Adjust the width of the language section of the install.
2016-03-26 12:35:40 -06:00
5eef464cf3
Additional work to improve the install, template and the menu.
2016-03-26 12:22:15 -06:00
aa89c4fe26
Don't error if the menu is not available for the install.php.
2016-03-26 11:45:57 -06:00
90f30c53d7
Fix the install.php.
2016-03-26 09:18:36 -06:00
6b657b0ef1
Fix a spelling mistake.
2016-03-25 20:17:34 -06:00
d7dbe2d51f
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-25 20:14:59 -06:00
da6297918e
Remove two deprecated default settings and a missing one.
2016-03-25 20:14:39 -06:00
88ac4fb2ee
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-25 19:51:18 -06:00
00c7ea8016
Fixed: Default Theme - Adjust top body margin when menu position is bottom.
2016-03-25 19:49:52 -06:00
92a57a73ce
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-25 19:46:00 -06:00
8053c07a02
Make the code more efficient adding the theme default settings.
2016-03-25 19:45:39 -06:00
7a2fc74481
Enhance: Default Theme - enable menu style and positioning options.
2016-03-25 19:38:57 -06:00
f5a1802282
Remove the extra $x++;
2016-03-25 19:27:43 -06:00
c2d3a61a66
Remove the enhanced theme.
2016-03-25 19:24:45 -06:00
181e26144e
Add default settings to control the new theme.
2016-03-25 19:22:26 -06:00
8cdadc0ea4
Move the app_defaults.php from theme/enhanced to themes/default.
2016-03-25 17:26:28 -06:00
7fa8226f8d
Added (Really!): Moment.js - used by jQuery DateTimePicker plugin.
2016-03-25 16:52:07 -06:00
e3fb32e1a2
Added: Moment.js - used by jQuery DateTimePicker plugin.
2016-03-25 16:39:19 -06:00
a49337129d
Fixed: Control icon paths for Default theme.
2016-03-25 16:38:20 -06:00
5b58196c16
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-25 16:33:54 -06:00
9aae7bdd79
Added: Moment.js framework (used by jQuery DateTimePicker plugin)
2016-03-25 16:33:05 -06:00
6631061d70
Set the default theme as the default.
2016-03-25 16:30:35 -06:00
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
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
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
c5e804cb3c
Update acl.conf.lua
...
Change expire acl.conf to acl_conf
2016-03-25 01:00:43 -06:00
ab7bd4a3d3
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-24 23:08:45 -06:00
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
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
eb81998165
Revert "Revert "Revert "search selects"""
2016-03-24 22:25:18 -06:00
1bec4aba89
Merge pull request #1508 from fusionpbx/revert-1507-revert-1497-master
...
Revert "Revert "search selects""
2016-03-24 22:03:56 -06:00
90242c0c60
Revert "Revert "search selects""
2016-03-24 22:03:37 -06:00
1a576b0d6a
Merge pull request #1507 from fusionpbx/revert-1497-master
...
Revert "search selects"
2016-03-24 22:02:59 -06:00
68e728b0b6
Revert "search selects"
2016-03-24 22:02:41 -06:00
7217d29d8b
Merge pull request #1497 from blackc2004/master
...
search selects
2016-03-24 21:56:20 -06:00
1eb5b54119
Merge pull request #1491 from dis45927/master
...
Fix bug preventing mysql database creation
2016-03-24 21:47:11 -06:00
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
459a5931fa
Fix some of the elements in the contacts array.
2016-03-24 21:43:03 -06:00
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
eeae7f0cc8
Merge pull request #1503 from blackc2004/patch-37
...
Update directory_extensions.xml
2016-03-24 21:37:06 -06:00
4f068c1d7f
Merge pull request #1504 from blackc2004/patch-38
...
Update directory_extensions.xml
2016-03-24 21:28:46 -06:00
f180be3792
Merge pull request #1505 from blackc2004/patch-39
...
Update directory_extensions.xml
2016-03-24 21:28:26 -06:00
29777ef631
Merge pull request #1506 from blackc2004/patch-40
...
Update directory_extensions.xml
2016-03-24 21:28:01 -06:00
0e3ea02f72
Change sytnax from database["name"] to database.name in the config.lua.
2016-03-24 20:15:09 -06:00
e1b6087e04
Use regex with is_local.
2016-03-24 18:43:51 -06:00
b940749eb5
Merge branch 'master' of https://github.com/fusionpbx/fusionpbx
2016-03-24 15:02:30 -06:00
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
markjcrane
reliberate
Alexey Melnichuk