Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
dolibarr
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Container Registry
Model registry
Analyze
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software_Artifact_Infrastructure_Repository
dolibarr
Commits
e99883f1
Commit
e99883f1
authored
11 years ago
by
Laurent Destailleur
Browse files
Options
Downloads
Plain Diff
Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts: htdocs/admin/modules.php
parents
ab7a17fe
5b63b561
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
ChangeLog
+1
-0
1 addition, 0 deletions
ChangeLog
htdocs/admin/modules.php
+1
-1
1 addition, 1 deletion
htdocs/admin/modules.php
htdocs/core/modules/modFckeditor.class.php
+2
-0
2 additions, 0 deletions
htdocs/core/modules/modFckeditor.class.php
with
4 additions
and
1 deletion
ChangeLog
+
1
−
0
View file @
e99883f1
...
...
@@ -287,6 +287,7 @@ backport commit 384e3812eb73a15adafb472cacfb93397a54459b to fix W3C/edit contrac
***** ChangeLog for 3.3.5 compared to 3.3.4 *****
- Fix: Change to make debian package ok despite removal of ckeditor.
- Fix: jcrop file to match debian rules
- Fix: Add missing country UK.
- Fix: Minor fix into package.
...
...
This diff is collapsed.
Click to expand it.
htdocs/admin/modules.php
+
1
−
1
View file @
e99883f1
...
...
@@ -158,7 +158,7 @@ foreach ($modulesdir as $dir)
if
(
$objMod
->
version
==
'development'
&&
(
empty
(
$conf
->
global
->
$const_name
)
&&
(
$conf
->
global
->
MAIN_FEATURES_LEVEL
<
2
)))
$modulequalified
=
0
;
if
(
$objMod
->
version
==
'experimental'
&&
(
empty
(
$conf
->
global
->
$const_name
)
&&
(
$conf
->
global
->
MAIN_FEATURES_LEVEL
<
1
)))
$modulequalified
=
0
;
// We discard modules according to property disabled
if
(
isset
(
$objMod
->
hidden
)
&&
$objMod
->
hidden
)
$modulequalified
=
false
;
if
(
!
empty
(
$objMod
->
hidden
))
$modulequalified
=
false
;
// Define array $categ with categ with at least one qualified module
if
(
$modulequalified
)
...
...
This diff is collapsed.
Click to expand it.
htdocs/core/modules/modFckeditor.class.php
+
2
−
0
View file @
e99883f1
...
...
@@ -62,6 +62,8 @@ class modFckeditor extends DolibarrModules
$this
->
config_page_url
=
array
(
"fckeditor.php"
);
// Dependances
global
$dolibarr_js_CKEDITOR
;
$this
->
hidden
=
(
$dolibarr_js_CKEDITOR
==
'disabled'
?
1
:
0
);
// A condition to disable module (used for native debian packages)
$this
->
depends
=
array
();
$this
->
requiredby
=
array
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment