Commit Graph

6486 Commits

Author SHA1 Message Date
FusionPBX 71cdf97e5a Merge pull request #1512 from schraegervogel/master
initialize call_context
2016-03-27 04:25:22 -06:00
markjcrane b10f0af345 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 03:34:32 -06:00
markjcrane f691287d86 Update themes/app_defaults to reduce database selects. 2016-03-27 03:34:16 -06:00
reliberate 74a25f19c0 Theme: Fix js confirmation on logout icon click (set language variable as global inside menu function). 2016-03-27 03:22:42 -06:00
reliberate 5864777a64 Theme: Restore footer/copyright on Login page. 2016-03-27 03:09:50 -06:00
reliberate 95cf70bcd2 Import Contacts: Fix layout issue. 2016-03-27 03:00:05 -06:00
reliberate eb7f66e42e Command: Correct layout & styles. 2016-03-27 02:54:29 -06:00
reliberate 11f33c6e5b Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 02:33:40 -06:00
reliberate a8faf347e0 Theme: Added defaults (in the code) for the footer/copyright if missing in Settings. 2016-03-27 02:33:27 -06:00
markjcrane ad0a802571 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 02:31:29 -06:00
markjcrane a405964829 Change the login background. 2016-03-27 02:31:13 -06:00
reliberate c4362576f9 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 02:18:08 -06:00
reliberate 68c9b44c5a Theme: Adjustment to defaults. 2016-03-27 02:17:45 -06:00
markjcrane 32ffe4d37f Remove the create_menus() from the install as it is now handled in the menu class. 2016-03-27 02:15:27 -06:00
reliberate 1ad01ea842 Theme: Fixed CSS issue with domain name (selector) style. 2016-03-27 02:09:27 -06:00
reliberate 442791478f Theme: Remove login_opacity from app_defaults - no longer necessary. 2016-03-27 01:27:29 -06:00
markjcrane 2d6b3f3973 Change the app/emails/app_languages.php to UTF-8 encoding and used a spanish dictionary to fix the translations that were broken when converting file encoding. 2016-03-27 01:18:51 -06:00
markjcrane 3356ee39ce Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 01:10:49 -06:00
markjcrane 6fa0cd2e2c Change the encoding type for app/emails/app_menu.php to UTF-8. 2016-03-27 01:10:29 -06:00
reliberate cdaba6dc99 Theme: Only round bottom menu corners on Static menu style. 2016-03-27 01:03:13 -06:00
reliberate 9b49b88fb5 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 00:46:23 -06:00
reliberate f2324a5148 Theme: Minor adjustments on Fixed and Static style menus. 2016-03-27 00:46:06 -06:00
markjcrane d6ecfa1ca2 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-27 00:33:38 -06:00
markjcrane 4fa0649eba Only call the scripts class if its installed. 2016-03-27 00:33:19 -06:00
reliberate 77cff78bf2 Theme adjustments and fixes.
Flesh out Theme Default Settings descriptions.
2016-03-27 00:32:19 -06:00
markjcrane 2107b2a1b5 Fix v_settings update sql command in app/settings/app_defaults.php. 2016-03-26 23:59:28 -06:00
markjcrane 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
markjcrane db9ba1f533 Merge branch 'master' of https://github.com/fusionpbx/fusionpbx 2016-03-26 22:59:19 -06:00
markjcrane fa2b753e62 Add the menu_default method to app_defaults.php. 2016-03-26 22:59:00 -06:00
reliberate 9894a34004 Default Template: Removed body_opacity setting - superseded by body_color rgba ability 2016-03-26 21:42:55 -06:00
markjcrane c0b93e849c Change the method name to menu_default. 2016-03-26 21:22:52 -06:00
markjcrane d5b3fffda8 Add methoed 'default' to the menu class. 2016-03-26 21:18:02 -06:00
markjcrane f15645f2a1 Minor adjustment to the checkbox. 2016-03-26 19:51:44 -06:00
markjcrane a836d7985b Remove the include to the resources/menu.php file that is no longer in use. 2016-03-26 19:37:42 -06:00
markjcrane a3f87106ee Fix two of the button labels. 2016-03-26 19:35:24 -06:00
markjcrane 3d7b9fef13 Fix a the name of a few of the install buttons. 2016-03-26 19:29:04 -06:00
markjcrane d71f1323c3 Update the install.php. 2016-03-26 19:17:33 -06:00
markjcrane e3175814bd Fix the reference to the prepared statement. 2016-03-26 14:03:44 -06:00
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