Laurent Destailleur
5c27ec5d25
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/compta/compta-files.php
2019-02-13 11:21:20 +01:00
Laurent Destailleur
11f48460b2
Fix
2019-02-12 23:26:25 +01:00
Laurent Destailleur
d86017b8ff
Fix create left menu entry
2019-02-12 23:21:53 +01:00
Laurent Destailleur
639dfa09aa
Fix creation of left menu
2019-02-12 23:17:40 +01:00
Laurent Destailleur
1f9f335e44
FIX creation of menu entry with parent id not int
...
Conflicts:
htdocs/admin/menus/edit.php
2019-02-12 19:11:05 +01:00
Laurent Destailleur
986fb2ae38
FIX creation of menu entry with parent id not int
2019-02-12 19:09:27 +01:00
Frédéric FRANCE
be9cfdae85
Update index.php
2019-02-11 00:05:38 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite
2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
2019-01-27 23:23:38 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call
2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged
2019-01-27 10:49:34 +01:00
Philippe GRAND
218636271a
update with html5 compliant code
2019-01-21 22:36:14 +01:00
Laurent Destailleur
bdb4295379
Fix menu editor
2018-12-10 18:24:05 +01:00
Laurent Destailleur
b35a9c0e64
FIX Edition of menu fails (mainmenu required for top menu)
2018-12-10 17:50:58 +01:00
Regis Houssin
569d59d251
FIX change my deprecated email
2018-10-27 14:43:12 +02:00
Philippe GRAND
035b2be2eb
Standardize and update call to langs
2018-09-07 14:58:22 +02:00
Philippe GRAND
f17275845d
standardize
2018-07-28 14:29:28 +02:00
Laurent Destailleur
8184eff66c
Fix for #9079
2018-07-09 15:25:14 +02:00
Laurent Destailleur
d26b2a694d
FIX Security fixes (filter onload js, less verbose error message in
...
download and viewimage, show info to encourage dolibarr_main_prod=1)
2017-09-06 11:39:30 +02:00
Laurent Destailleur
bb8d458468
Fix menu editor
2017-07-30 19:41:45 +02:00
Laurent Destailleur
658fe93d8c
Fix menu editor (data not aligned)
2017-07-01 12:42:49 +02:00
Laurent Destailleur
68e333879f
Fix var not sanitized
2017-05-16 13:27:32 +02:00
philippe grand
edaa3ae672
Update code using new css class
2017-04-12 17:44:01 +02:00
Laurent Destailleur
4df8dcf980
Work on module modBlockedLog and modModuleBuilder
2017-03-29 21:50:15 +02:00
Laurent Destailleur
60b8582aa9
Fix more then 30 security defects
2016-12-18 01:44:26 +01:00
Sof
a30d4a0a38
Fix : Custom menu handler is not accessible for editing
2016-10-18 16:58:50 +02:00
Laurent Destailleur
6c5849fc87
Fix field too small
2016-08-09 15:56:39 +02:00
appchecker
4b1dfbc2fb
replace intval with GETPOST
2016-07-11 12:56:05 +03:00
appchecker
9895084627
prevent SQLi
2016-07-07 20:23:38 +03:00
Laurent Destailleur
5f5328c3d8
FIX Link in menu when using left menu editor was wrong.
...
FIX Updating an entry with menu editor did not save fk_leftmenu.
2016-06-29 14:09:18 +02:00
Laurent Destailleur
ab444af8c2
Fix bad css
2016-06-29 13:38:19 +02:00
Laurent Destailleur
b57476153f
Merge remote-tracking branch 'origin/3.9' into develop
...
Conflicts:
htdocs/admin/menus/edit.php
htdocs/fourn/ajax/getSupplierPrices.php
htdocs/societe/consumption.php
2016-06-04 01:14:36 +02:00
Laurent Destailleur
c663ca13b8
Fix edit left menu
2016-06-01 21:41:47 +02:00
Laurent Destailleur
bf5fbd3a80
FIX Infinite loop on menu tree output for edition
...
FIX Can show tree of entries added by external modules using fk_mainmenu
and fk_leftmenu instead of fk_menu.
2016-06-01 21:14:28 +02:00
Laurent Destailleur
466404d968
Fix missing dol_fiche_xxx
2016-04-29 17:58:39 +02:00
Laurent Destailleur
26b4a5a1e0
Merge pull request #4267 from bafbes/patch-12
...
allow cherry-pick of a sub-menu by changing its parent identifier
2016-04-29 17:55:29 +02:00
Laurent Destailleur
bcb4b2b607
Work on website module
2016-04-23 21:34:10 +02:00
Laurent Destailleur
7ce82aaf16
Removed hidden option MAIN_MENU_USE_JQUERY_LAYOUT. This feature will be
...
implemented with pure CSS/Jquery so no more need of not maintained
external library.
2016-04-12 13:38:41 +02:00
Laurent Destailleur
91caea5707
Code was corrupted with very bad commits. I restore files manually.
2016-03-25 15:53:44 +01:00
Marcos García de La Fuente
5a046125db
Missing changes from previous commits
2016-03-20 14:24:49 +01:00
Bahfir Abbes
61ef9921bd
correction of precedent commit
...
I do not kow how I deleted a line instead of another.
Sorry for it.
Hope it's resolved
2015-12-27 17:50:29 +01:00
Bahfir Abbes
4f4c6d904e
Update edit.php
...
allow cherry-pick of a sub-menu by changing its parent identifier
2015-12-20 13:37:46 +01:00
philippe grand
9b0dd8159e
[Qual] Close database handler should be after Footer
2015-12-11 12:29:19 +01:00
Laurent Destailleur
2a345b6fc0
Merge remote-tracking branch 'origin/3.8' into develop
...
Conflicts:
htdocs/admin/company.php
htdocs/admin/menus/edit.php
htdocs/core/class/hookmanager.class.php
htdocs/core/class/html.form.class.php
htdocs/core/lib/pdf.lib.php
2015-11-21 12:48:41 +01:00
Marcos García de La Fuente
5dba9ef54e
FIX #4043 Incorrect translation in error mesage in menu creation admin page
2015-11-20 22:00:11 +01:00
philippe grand
3767ab437e
[Qual] Uniformize code
2015-10-23 12:58:30 +02:00
philippe grand
f31ddc23aa
[Qual] Uniformize code
2015-10-17 16:18:33 +02:00
Raphaël Doursenaud
631ee83745
[Qual] Replaced deprecated print_fiche_titre()
2015-09-24 18:34:58 +02:00
Raphaël Doursenaud
e149d49fb8
[Qual] Use jQuery property instead of attribute to test and set disabled
2015-05-12 14:53:01 +02:00
Raphaël Doursenaud
5d2f081152
[Qual] Fixed HTML select form selected attribute
...
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The select form selected attribute should not have a value.
2015-05-07 14:21:14 +02:00
jfefe
c905f88498
Change generic and setup image title
2015-04-18 23:13:48 +02:00
Laurent Destailleur
f090893807
Hide a feature that is really not stable. So i move it as a "develop"
...
feature.
2015-03-13 18:02:54 +01:00
Laurent Destailleur
e3713c8b6d
Merge remote-tracking branch 'origin/3.7' into develop
...
Conflicts:
htdocs/admin/tools/eaccelerator.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/commande/dispatch.php
2015-02-19 00:01:26 +01:00
Marcos García de La Fuente
e21681a369
PHPDoc and misc fixes for Admin
2015-02-10 10:52:48 +01:00
aspangaro
c4c69e191b
Replace <center> tags
2014-11-25 20:13:43 +01:00
aspangaro
da258cd4b0
Typo & presentation
2014-11-12 07:29:57 +01:00
Laurent Destailleur
ca3c5d9513
Fix: invalid list of params
...
Fix: loading of sql menu
2014-09-19 14:36:55 +02:00
Laurent Destailleur
83447243ae
Merge remote-tracking branch 'origin/3.6' into develop
...
Conflicts:
build/debian/get-orig-source.sh
htdocs/product/class/product.class.php
htdocs/societe/soc.php
2014-09-15 22:58:39 +02:00
Laurent Destailleur
05f3a47018
Merge remote-tracking branch 'origin/3.5' into 3.6
...
Conflicts:
build/debian/control
htdocs/compta/bank/account.php
htdocs/fourn/paiement/fiche.php
htdocs/product/class/product.class.php
htdocs/product/fiche.php
2014-09-15 22:52:59 +02:00
Marcos García de La Fuente
74e16db632
[ bug #1589 ] Menu type in "Edit menu" page is not translated
2014-09-14 13:14:03 +02:00
Marcos García de La Fuente
4f4ac30fc0
Deprecating arbitrary use of dol_htmloutput* functions
2014-07-20 02:32:13 +02:00
Marcos García de La Fuente
ac824728bc
Migrated old error notifications to the """new""" system
2014-07-20 01:09:43 +02:00
Marcos García de La Fuente
434bb1bec7
Migrated old message notifications to the """new""" system
2014-07-20 00:10:40 +02:00
Laurent Destailleur
90a5f6c7ef
Qual: Remove end php tag.
2014-07-08 01:02:30 +02:00
Marcos García de La Fuente
ae4bd4445e
Moved dol_syslog query log to the database handler and decreased report level to DEBUG
2014-06-09 15:49:54 +02:00
Raphaël Doursenaud
f8f502d013
Removed closing php tag
...
http://php.net/manual/en/language.basic-syntax.phptags.php
2014-05-03 18:18:44 +02:00
Laurent Destailleur
91718bc902
Qual: Replace deprecated call ->form_confirm with ->formconfirm
2013-09-06 11:51:24 +02:00
Laurent Destailleur
f6c2bd4928
Fix: Uniformize menu conditions
2013-04-28 23:25:28 +02:00
Laurent Destailleur
4e0ef01389
Qual: nowrap="nowrap" is replaced with a CSS class style .nowrap
2013-04-25 01:13:13 +02:00
Laurent Destailleur
89ad634230
Merge remote-tracking branch 'origin/3.3' into develop
...
Conflicts:
htdocs/compta/facture/class/facture.class.php
htdocs/core/class/hookmanager.class.php
htdocs/langs/fr_FR/holiday.lang
2013-04-22 01:39:49 +02:00
Marcos García
40a9ab9772
Added missing translations
2013-04-20 00:08:09 +02:00
Laurent Destailleur
89365786a8
New: enhance tool fixdosfiles.sh
...
Convert DOS files to unix
2013-03-30 14:27:13 +01:00
Grand Philippe
c5e742278e
fix : trad error
2013-03-24 07:11:44 +01:00
Laurent Destailleur
1224e79ee3
Qual: Start to clean how menu managers works.
2013-02-22 19:16:03 +01:00
Laurent Destailleur
2852aded3a
New: Add button collapse/expand for menu, category and user views.
2013-02-20 21:16:31 +01:00
Laurent Destailleur
320b4bde1f
Qual: Code to output tree is now generic
2013-02-20 19:01:29 +01:00
Laurent Destailleur
6db881c09d
New: Add link collapse all - expand all.
...
Fix: Add missing images.
2013-02-20 18:34:54 +01:00
Laurent Destailleur
9ddd6215f8
Qual: Replace native code with jquery plugin treeview.
2013-02-19 20:15:30 +01:00
Laurent Destailleur
95098a9b59
Fix: Menu editor
2013-02-19 15:23:25 +01:00
Laurent Destailleur
8d206fdfb0
Prepare move to other licence. For the moment all answers for licence
...
upgrade were not yet received. So we prepare for GPL by uniformizing
licence text keys to GPL-3+. Will move later to AGPL if all answers are
positive.
2013-01-16 15:36:08 +01:00
Regis Houssin
b838895db9
Fix: change for a neutral email
2012-12-30 15:13:49 +01:00
Regis Houssin
bcf46d00f0
Fix: convert line delimiters !!
2012-09-30 21:26:58 +02:00
Laurent Destailleur
051b93c73b
Qual: Code cleaner using field name instead of index number.
...
New: Can use new syntax to define parent of a menu
(fk_mainmenu=&fk_leftmenu=)
2012-09-27 00:05:13 +02:00
Laurent Destailleur
c291ea2ec2
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop
2012-09-11 11:23:08 +02:00
Marcos García
b3235887d3
Improved translations of menu edit
2012-09-10 23:50:46 +02:00
Laurent Destailleur
4847e946a4
Fix: Use varchar instead of char (for better compatibility, char is an
...
old directive)
Fix: Restore usage of text field for "enabled" menu because, even if in
standard code, we use 0 or 1, into external module, or menu editor we
should be able to use full condition dynamic string.
2012-09-10 16:20:34 +02:00
Regis Houssin
e9c72f812d
Merge pull request #380 from marcosgdf/minor
...
Modified llx_menu sql and improved add menu form
2012-09-10 04:18:31 -07:00
Marcos García
45cd500882
Modified llx_menu sql and improved new menu form
...
Modified `enabled` field to tinyint(1) because only holds 0 or 1
Enabled input field now made yes/no select
2012-09-10 02:09:52 +02:00
Marcos García
5536fecc3b
Missing translations & improved es_ES translations
2012-09-10 01:15:57 +02:00
Laurent Destailleur
a7fdbcbddc
Update auguria module
2012-09-08 02:03:47 +02:00
Marcos García
4209898d20
Lower-cased Header function
2012-08-31 05:58:38 +02:00
Marcos García
f3674317ec
Removed parenthesis from all require and replaced with single quotes
2012-08-22 23:24:21 +02:00
Marcos García
706d79986c
Removed parenthesis from all require_once and replaced with single quotes
2012-08-22 23:11:24 +02:00
Regis Houssin
41789458c5
Fix: warning again and again...
2012-07-09 18:09:44 +02:00
Regis Houssin
6f1651309e
Fix: global converting lines delimiter
2012-07-02 19:30:37 +02:00
Laurent Destailleur
c1c94abcd3
Fix: Menu list was empty into menu editor.
2012-06-14 16:48:02 +02:00
Laurent Destailleur
a23df4f407
Qual: Removed deprecated var
...
New: Can add global js
2012-06-12 18:35:29 +02:00
Laurent Destailleur
2647cb72ac
New: Now all features can be provided by a module with all files inside
...
the directory of module.
2012-02-22 16:18:03 +01:00
Laurent Destailleur
acef131833
New: Uniformize code to manage menus handler provided by external
...
modules
2012-02-12 15:17:54 +01:00
