Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
91,506 Commits 36 Branches 189 Tags
eb0fd1674d26a8157ff133173f9177ee6a23e81f
Commit Graph

223 Commits

Author SHA1 Message Date
Scrutinizer Auto-Fixer
7f52920716 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-10-31 13:32:18 +00:00
Frédéric FRANCE
cd7cee061a Update index.php 2020-10-28 17:56:26 +01:00
Frédéric FRANCE
5a3780e062 end of dol_fiche_end 2020-10-27 18:19:31 +01:00
Frédéric FRANCE
9a470fa42d replace deprecated 2020-10-22 22:50:03 +02:00
Laurent Destailleur
7b3a7c9921 Add token on all url with action=delete 2020-10-01 10:50:54 +02:00
Laurent Destailleur
f442dac2c9 Add token on most GET url for admin action 2020-09-30 15:13:28 +02:00
Laurent Destailleur
830bc7d871 Look and feel v13 2020-09-22 09:42:44 +02:00
Laurent Destailleur
c4b5f5a249 Maxi clean of code 2020-09-18 01:29:17 +02:00
Laurent Destailleur
eae5410ced Protect md file 2020-09-17 16:57:39 +02:00
Laurent Destailleur
53522fb8dd Fix popup on objects in modulebuilder 2020-08-18 18:41:36 +02:00
Laurent Destailleur
43b23994e4 WIP Recruitment module 2020-08-06 15:55:04 +02:00
Laurent Destailleur
3ed4773d7f Fix tab popup when there is 2 head tabs in same page 2020-07-24 18:31:14 +02:00
Laurent Destailleur
70b58b5755 Merge pull request #14169 from ksar-ksar/develop 
FIX : Correct ModuleBuilder left menu
 2020-07-03 00:20:59 +02:00
ksar
22448b19f4 FIX : Correct ModuleBuilder left menu 2020-07-01 22:19:10 +02:00
Laurent Destailleur
146c521efd Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/security.lib.php
	htdocs/filefunc.inc.php
 2020-06-29 18:06:42 +02:00
Laurent Destailleur
b64fc7dc3f FIX Avoid warning when creating a module with already existing files 2020-06-29 14:37:36 +02:00
Laurent Destailleur
ab88890f3a Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-06-28 21:48:28 +02:00
Laurent Destailleur
41c6155922 Hiden useless entry 2020-06-27 14:44:38 +02:00
Laurent Destailleur
3527d011f5 Merge pull request #14006 from bafbes/abb110215 
fix:The label must be a dictionary key
 2020-06-11 23:15:52 +02:00
Laurent Destailleur
4b47a270af Update index.php 2020-06-11 23:15:00 +02:00
Laurent Destailleur
f92426034f Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
	htdocs/website/index.php
 2020-06-03 01:06:27 +02:00
Laurent Destailleur
3b4fe0d582 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/product/class/html.formproduct.class.php
 2020-06-02 13:31:22 +02:00
Laurent Destailleur
bdeee9ea99 Merge pull request #14007 from bafbes/abb110216 
fix:replace some bd field types by their correspondant field type
 2020-06-01 20:55:06 +02:00
Laurent Destailleur
52d0c1a9ae Update index.php 2020-06-01 20:54:24 +02:00
Laurent Destailleur
2324834b73 Debug modulebuilder for doc generation 
Conflicts:
	htdocs/core/class/html.formfile.class.php
	htdocs/modulebuilder/template/admin/setup.php
 2020-06-01 16:47:50 +02:00
Laurent Destailleur
58e76947ac Debug modulebuilder for doc generation 2020-06-01 16:44:22 +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
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
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
21c58e9fab Error management 2020-05-29 15:29:47 +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
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
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
Scrutinizer Auto-Fixer
444c293c01 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-10 08:59:32 +00:00
Scrutinizer Auto-Fixer
612bac6598 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-04-05 00:44:59 +00:00
Laurent Destailleur
221f20e13f Fix merge 2020-04-03 19:24:16 +02:00