Commit Graph

1294 Commits

Author SHA1 Message Date
Laurent Destailleur
c8d0476728 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/modulebuilder/template/core/modules/mymodule/mod_myobject_standard.php
2020-06-01 04:09:52 +02:00
Laurent Destailleur
dbac97a908 Fix several troubles into numbering modules.
Prefix for takepos moved from TK to TC (TK was already used for tasks)
2020-06-01 04:02:47 +02:00
Laurent Destailleur
838a13cec1 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-01 02:41:11 +02:00
Laurent Destailleur
5a8c4ad3f5 Debug modulebuilder 2020-06-01 00:01:23 +02:00
Laurent Destailleur
28df07225d Debug modulebuilder 2020-05-31 23:23:56 +02:00
Laurent Destailleur
62dacfa713 Debug modulebuilder 2020-05-31 23:11:49 +02:00
Laurent Destailleur
c04903d15c Fix debug modulebuilder for doc and ref generation
Conflicts:
	htdocs/core/class/commonobject.class.php
2020-05-31 23:01:13 +02:00
Laurent Destailleur
e2bb04dcae Fix debug modulebuilder for doc and ref generation 2020-05-31 22:59:33 +02:00
Laurent Destailleur
b24c0e57a6 Fix transifex 2020-05-31 10:29:38 +02:00
stickler-ci
a5ed630a57 Fixing style errors. 2020-05-31 00:19:21 +00:00
bahfir abbes
fe52539787 fix:rempalcement de qqes valeurs de champs de BDDs par les valeurs adéquates 2020-05-31 01:14:44 +01:00
bahfir abbes
ef890a29eb fix:Le label doit être une clé de dictionnaire 2020-05-31 01:10:27 +01:00
bahfir abbes
cf68317ae7 fix:Clé de langue dans les titres de menus 2020-05-31 00:56:51 +01:00
Laurent Destailleur
8dbc0ff040 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/prelevement.php
	htdocs/admin/system/phpinfo.php
	htdocs/modulebuilder/index.php
2020-05-31 00:31:14 +02:00
Laurent Destailleur
f9ac4c2ada Fix template 2020-05-30 01:25:51 +02:00
Laurent Destailleur
a69be00d37 Fix template 2020-05-30 01:23:47 +02:00
Laurent Destailleur
48596122e4 Fix template 2020-05-30 01:17:23 +02:00
Laurent Destailleur
e2656ff2f8 Update template 2020-05-30 00:49:11 +02:00
Laurent Destailleur
0fd3292715 Fix show error message 2020-05-30 00:35:11 +02:00
Laurent Destailleur
926a9f68c4 Trans 2020-05-30 00:23:14 +02:00
Laurent Destailleur
455ba002b4 css 2020-05-29 22:13:10 +02:00
Laurent Destailleur
540a64bbba Fix templates 2020-05-29 21:48:33 +02:00
Laurent Destailleur
264fd709e4 Fix template 2020-05-29 21:48:27 +02:00
Laurent Destailleur
21c58e9fab Error management 2020-05-29 15:29:47 +02:00
Laurent Destailleur
7f8c0d0e7a Fix templates 2020-05-29 15:29:33 +02:00
Laurent Destailleur
972430d50c Fix template 2020-05-29 15:13:16 +02:00
Laurent Destailleur
ab82797dfc var not defined 2020-05-29 13:20:33 +02:00
Laurent Destailleur
b11ef125c3 FIX Force of HTML content only for ckeditor
Conflicts:
	htdocs/modulebuilder/index.php
2020-05-29 03:27:30 +02:00
Laurent Destailleur
a0a440cf5f FIX Force of HTML content only for ckeditor 2020-05-29 03:26:05 +02:00
Laurent Destailleur
40816c02ce Merge branch 'develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-25 22:40:59 +02:00
Laurent Destailleur
17382051c2 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-05-25 22:19:50 +02:00
Laurent Destailleur
e4ef6334aa Look and feel v12 2020-05-25 14:08:36 +02:00
Frédéric FRANCE
5aa84c64d0 Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Philippe GRAND
23282acfbc update 2020-05-21 11:20:01 +02:00
Frédéric FRANCE
85625a46bb add new rule 2020-05-21 09:35:30 +02:00
Frédéric FRANCE
43dcd9beb5 add new rule 2020-05-21 00:02:33 +02:00
Laurent Destailleur
672ea60ffd FIX #13896 2020-05-15 13:58:34 +02:00
Frédéric FRANCE
91dcf10375 session_cache_limiter before starting session 2020-05-06 23:56:02 +02:00
Laurent Destailleur
eacb1b3b2e Debug modulebuilder 2020-05-05 21:45:10 +02:00
Laurent Destailleur
650096ea0f Fix look and feel v12 2020-05-05 21:27:40 +02:00
Laurent Destailleur
41aaf5363d Fix templates 2020-05-05 18:53:41 +02:00
Laurent Destailleur
e871e736eb Fix for #5824 2020-05-05 17:55:03 +02:00
Laurent Destailleur
3857c08277 Fix quick search on MO 2020-05-04 13:24:09 +02:00
Laurent Destailleur
4d6a45d491 Major doxygen fix 2020-05-03 22:48:35 +02:00
Laurent Destailleur
14a81eea5f Merge pull request #13781 from nervo/reindent-module-template
Reindent module template
2020-05-01 20:45:47 +02:00
nervo
ba0ca3f7f7 Reindent module template 2020-05-01 08:40:55 +02:00
nervo
bc32b75fd2 PSR-2 Noncompliance 2020-05-01 08:13:03 +02:00
Laurent Destailleur
3c1d989c30 FIX #13751 2020-04-27 11:41:35 +02:00
Laurent Destailleur
068a890c36 Enable more PHPCS rules 2020-04-25 19:13:20 +02:00
Laurent Destailleur
38f2aad0c6 Debug asset module 2020-04-25 03:19:30 +02:00