Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
9af2097
Fix CSS (badges & Areatabaction)
aspangaro Sep 8, 2024
b830b97
ChangeLog
aspangaro Sep 10, 2024
93236b3
fix print_oblyon_menu with noout (#165)
UltraViolet33 Sep 30, 2024
32a9165
ChangeLog
aspangaro Sep 30, 2024
8e38a88
fix left menu does not scroll on mobile device with landscape orienta…
UltraViolet33 Dec 6, 2024
2070ab8
fix position sticky (#169)
uvaldenaire-opendsi Dec 6, 2024
da678da
new options for font and more (#168)
SylvainLegrand Dec 29, 2024
6bd3ea4
ChangeLog
aspangaro Dec 29, 2024
9d151d3
WIP Merge Oblyon & QuickUX
aspangaro Dec 31, 2024
37129cb
Update global.inc.php (#172)
SylvainLegrand Jan 2, 2025
32fd2f9
WIP Merge Oblyon & QuickUX
aspangaro Jan 2, 2025
7f1015f
Merge branch '2024_rc' of github.com:aspangaro/oblyon into 2024_rc
aspangaro Jan 2, 2025
d3d74d1
WIP Merge Oblyon & QuickUX
aspangaro Jan 2, 2025
6863bab
WIP Merge Oblyon & QuickUX
aspangaro Jan 2, 2025
9898c02
Add new hidden option MAIN_MAXTABS_IN_CARD (#173)
SylvainLegrand Jan 3, 2025
721ee93
WIP Merge Oblyon & QuickUX
aspangaro Jan 3, 2025
3bb7bb1
WIP Merge Oblyon & QuickUX
aspangaro Jan 3, 2025
3a22d62
Review & CSS
aspangaro Jan 5, 2025
57c4cd6
ChangeLog
aspangaro Jan 5, 2025
98f07d9
Update global.inc.php (#174)
SylvainLegrand Jan 11, 2025
14b1a7e
Update css
aspangaro Jan 11, 2025
0833c11
Update global.inc.php (#175)
SylvainLegrand Feb 15, 2025
de100f1
Update global.inc.php (#176)
SylvainLegrand Apr 21, 2025
7b76f50
Fix date picker (#178)
SylvainLegrand Apr 21, 2025
98a979b
Remove old icons (3.0.0)
aspangaro Apr 21, 2025
fa3533f
NEW Add option Sticky list title bar so that title, mass action, pagi…
aspangaro Apr 21, 2025
7855431
NEW Add option Sticky list title bar so that title, mass action, pagi…
aspangaro Apr 21, 2025
75f45f4
Fix some options CSS
aspangaro Apr 21, 2025
66604d0
new Dolibarr functions (#179)
SylvainLegrand Apr 25, 2025
bf11a9b
clean code + backport
SylvainLegrand May 4, 2025
d044d41
New option + fix translations
SylvainLegrand May 5, 2025
dea3e94
Update global.inc.php
SylvainLegrand May 5, 2025
81ed5d5
clean code + backport (#180)
SylvainLegrand May 7, 2025
458c38e
new option for CKEditor and fonts
SylvainLegrand May 15, 2025
5bb2311
Merge branch '2024_rc' into 2024_rc
SylvainLegrand May 15, 2025
7a417c9
new option for CKEditor and fonts (#181)
SylvainLegrand May 16, 2025
63ae603
Merge branch 'aspangaro:2024_rc' into 2024_rc
SylvainLegrand May 28, 2025
df2d22f
Remove old file
aspangaro Jul 9, 2025
fe2ade1
Compatibility v21
aspangaro Jul 9, 2025
6ad7770
Update from Alex
SylvainLegrand Jul 16, 2025
d48244a
Images
SylvainLegrand Jul 16, 2025
6a95c45
Clean code
SylvainLegrand Jul 22, 2025
0eef728
Merge branch '2024_rc' of https://github.com/SylvainLegrand/InfraS-ob…
SylvainLegrand Jul 22, 2025
9fa2c57
Fix_event_dat_text
LuckyRoussel98 Oct 1, 2025
4a1c32b
Update global.inc.php
LuckyRoussel98 Oct 1, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
156 changes: 89 additions & 67 deletions CHANGELOG.md → ChangeLog.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.0.5
3.1.0
20 changes: 16 additions & 4 deletions admin/about.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2015 Nicolas Rivera <[email protected]>
* Copyright (C) 2015-2024 Alexandre Spangaro <[email protected]>
* Copyright (C) 2023-2025 Sylvain Legrand <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand Down Expand Up @@ -30,6 +31,15 @@
dol_include_once('/oblyon/lib/oblyon.lib.php');
dol_include_once('/oblyon/lib/inovea_common.lib.php');

/**
* @var Conf $conf
* @var DoliDB $db
* @var HookManager $hookmanager
* @var Societe $mysoc
* @var Translate $langs
* @var User $user
*/

// Langs
$langs->loadLangs(array('admin','oblyon@oblyon', 'inovea@oblyon', 'oldauthors@oblyon'));

Expand All @@ -47,17 +57,19 @@
/*
* View
*/
$help_url = '';
$page_name = "ThemeOblyonAboutTitle";
llxHeader('', $langs->trans($page_name));

llxHeader('', $langs->trans($page_name), $help_url, '', 0, 0, '', '', '', 'mod-oblyon page-admin_support');

// Subheader
$linkback = '<a href = "'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans('BackToModuleList').'</a>';
print load_fiche_titre($langs->trans($page_name), $linkback);
print load_fiche_titre($langs->trans($page_name), $linkback, 'object_inovea.png@oblyon');

// Configuration header
$head = oblyon_admin_prepare_head();

print dol_get_fiche_head($head, 'about', $langs->trans("Module432573Name"), 0, "inovea@oblyon");
print dol_get_fiche_head($head, 'about', $langs->trans("Module432573Name"), -1, "info");

$modClass = new modOblyon($db);
$oblyonVersion = !empty($modClass->getVersion()) ? $modClass->getVersion() : 'NC';
Expand All @@ -66,7 +78,7 @@
$supportvalue.= " * Module : Oblyon"."<br>";
$supportvalue.= " * Module version : ".$oblyonVersion."<br>";
$supportvalue.= " * Dolibarr version : ".DOL_VERSION."<br>";
$supportvalue.= " * Dolibarr version installation initiale : ".$conf->global->MAIN_VERSION_LAST_INSTALL."<br>";
$supportvalue.= " * Dolibarr version installation initiale : ".getDolGlobalString('MAIN_VERSION_LAST_INSTALL')."<br>";
$supportvalue.= " * Version PHP : ".PHP_VERSION."<br>";
$supportvalue.= " *****/"."<br><br>";
$supportvalue.= "Description de votre problème :"."<br>";
Expand Down
23 changes: 16 additions & 7 deletions admin/changelog.php
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<?php
/* Copyright (C) 2015 Nicolas Rivera <[email protected]>
* Copyright (C) 2015-2024 Alexandre Spangaro <[email protected]>
* Copyright (C) 2023-2025 Sylvain Legrand <[email protected]>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
Expand All @@ -21,14 +22,23 @@
* \ingroup oblyon
* \brief Changelog Page < Oblyon Theme Configurator >
*/
// Dolibarr environment *************************
require '../config.php';
// Dolibarr environment *************************
require '../config.php';

// Libraries
require_once DOL_DOCUMENT_ROOT . '/core/lib/admin.lib.php';
dol_include_once('/oblyon/lib/oblyon.lib.php');
dol_include_once('/oblyon/lib/inovea_common.lib.php');

/**
* @var Conf $conf
* @var DoliDB $db
* @var HookManager $hookmanager
* @var Societe $mysoc
* @var Translate $langs
* @var User $user
*/

// Langs
$langs->loadLangs(array('admin','oblyon@oblyon', 'inovea@oblyon', 'oldauthors@oblyon'));

Expand All @@ -47,24 +57,23 @@
* View
*/
$page_name = "ThemeOblyonChangelogTitle";
llxHeader('', $langs->trans($page_name));
$help_url = '';
llxHeader('', $langs->trans($page_name), $help_url, '', 0, 0, '', '', '', 'mod-oblyon page-admin_changelog');

// Subheader
$linkback = '<a href = "'.DOL_URL_ROOT.'/admin/modules.php?restore_lastsearch_values=1">'.$langs->trans('BackToModuleList').'</a>';
print load_fiche_titre($langs->trans($page_name), $linkback);
print load_fiche_titre($langs->trans($page_name), $linkback, 'object_inovea.png@oblyon');

// Configuration header
$head = oblyon_admin_prepare_head();

print dol_get_fiche_head($head, 'changelog', $langs->trans("Module432573Name"), 0, "inovea@oblyon");
print dol_get_fiche_head($head, 'changelog', $langs->trans("Module432573Name"), -1, "info");

print '<div class="div-table-responsive-no-min">';
print '<table summary="edit" class="noborder centpercent editmode tableforfield">';

print '<h2>Licence</h2>';
print $langs->trans("LicenseMessage");
print '<h2>Bugs / comments</h2>';
print $langs->trans("AboutMessage");

$changelog = inovea_common_getChangeLog('oblyon');

Expand Down
Loading