lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
104,201 Commits 43 Branches 150 Tags 886 MiB
a70e7c7bb2
Commit Graph

104201 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
a70e7c7bb2
Merge pull request #19253 from grandoc/new_branch_30_10_2021 
fixes to be pure markdown
 2021-10-31 13:43:03 +01:00
Laurent Destailleur
598508af41
Merge pull request #19261 from aspangaro/15a29 
Clean module HRM
 2021-10-31 13:39:10 +01:00
Alexandre SPANGARO
57a479e328 Remove useless language key 2021-10-31 07:27:37 +01:00
Alexandre SPANGARO
70ed633171 Update label perms 2021-10-31 07:23:34 +01:00
Alexandre SPANGARO
84c3c9d025 Remove useless language key 2021-10-31 07:12:26 +01:00
Alexandre SPANGARO
62ce27886b Remove useless language key 2021-10-31 07:04:31 +01:00
Alexandre SPANGARO
3242400855 Clean module HRM 2021-10-31 06:26:41 +01:00
Laurent Destailleur
0017c15974 Debug v15 2021-10-30 17:19:46 +02:00
Laurent Destailleur
47c131af74 Fix regression 2021-10-30 14:10:55 +02:00
Philippe GRAND
5f09f11a67 fixes to be pure markdown 2021-10-30 12:25:40 +02:00
Philippe GRAND
466f064d9a fixes to be pure markdown 2021-10-30 12:08:32 +02:00
Laurent Destailleur
be6b1e29ad Add logs 2021-10-29 13:32:32 +02:00
Laurent Destailleur
72069dc208 Fix css 2021-10-29 11:35:09 +02:00
Laurent Destailleur
fe7e1d4118 Look and feel v15 2021-10-29 09:40:38 +02:00
Laurent Destailleur
5baba69970 Fix regressions 2021-10-28 15:05:50 +02:00
Laurent Destailleur
ffc07efb64 Look and feel v15 2021-10-28 14:28:24 +02:00
Laurent Destailleur
d1794d7948 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/modAdherent.class.php
 2021-10-28 11:05:38 +02:00
Laurent Destailleur
f033e91cb0 phpcs 2021-10-28 11:03:27 +02:00
Laurent Destailleur
41bba0e879 Fix import of members 2021-10-28 00:12:41 +02:00
Laurent Destailleur
97d97af932 Clean: Remove fields for social networks (merged into "socialnetworks") 2021-10-27 16:39:34 +02:00
Laurent Destailleur
5df25fece7 Trans and log 2021-10-27 11:15:26 +02:00
Laurent Destailleur
4bde20dd8d Can make update during import of members 2021-10-27 09:23:03 +02:00
Laurent Destailleur
f12c709ec1 Fix checkbox 2021-10-27 03:09:12 +02:00
Laurent Destailleur
e85548d470 Fix look and feel v14 2021-10-27 03:06:50 +02:00
Laurent Destailleur
637e8f44e6 Fix phpcs 2021-10-27 00:05:40 +02:00
Laurent Destailleur
19734c89d6 Fix css 2021-10-26 22:09:07 +02:00
Laurent Destailleur
4e844b4687 Fix phpcs 2021-10-26 20:45:00 +02:00
Laurent Destailleur
7cd09eb649 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 16:34:25 +02:00
Laurent Destailleur
7393abea8f Fix phpcs 2021-10-26 14:42:26 +02:00
Laurent Destailleur
2436f0967b Fix translation of Nature of member in import. 2021-10-26 14:37:15 +02:00
Laurent Destailleur
fcdfd370ba Fix css 2021-10-26 14:31:55 +02:00
Laurent Destailleur
e9ba9fc103 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:52:00 +02:00
Laurent Destailleur
f592318cba Merge pdf 2021-10-26 13:51:43 +02:00
Laurent Destailleur
da2ce063b3 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 
Conflicts:
	htdocs/contact/card.php
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
	htdocs/product/card.php
	htdocs/public/emailing/mailing-unsubscribe.php
 2021-10-26 13:42:30 +02:00
Laurent Destailleur
fde44f2792 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 
Conflicts:
	htdocs/contact/list.php
	htdocs/core/modules/mailings/modules_mailings.php
 2021-10-26 13:29:47 +02:00
Laurent Destailleur
181991ee47 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 2021-10-26 13:10:23 +02:00
Laurent Destailleur
d82cbf6636 Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into 13.0 2021-10-26 13:09:15 +02:00
Laurent Destailleur
e87e354bd5 Fix: can't reset country of origin 2021-10-26 13:08:22 +02:00
Laurent Destailleur
e5a8e41cd9 Trans 2021-10-26 02:00:11 +02:00
Laurent Destailleur
299376f221 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-10-26 01:32:37 +02:00
Laurent Destailleur
c376d40346 css 2021-10-26 01:30:00 +02:00
Laurent Destailleur
93e11e07b4
Merge pull request #19207 from Dolibarr/scrutinizer-patch-4 
Scrutinizer Auto-Fixes
 2021-10-25 23:35:19 +02:00
Laurent Destailleur
5db80efcec css 2021-10-25 22:39:19 +02:00
Laurent Destailleur
cffee1df4b Fix phpcs 2021-10-25 22:09:21 +02:00
stickler-ci
02b2ed3f05 Fixing style errors. 2021-10-25 20:08:01 +00:00
Laurent Destailleur
64ca5365e7 Fix sql 2021-10-25 22:07:36 +02:00
Scrutinizer Auto-Fixer
5567310e44 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2021-10-25 20:07:31 +00:00
Laurent Destailleur
02f8ac4cbc Fix error phpunit 2021-10-25 21:49:25 +02:00
Laurent Destailleur
f64cd9d859 Fix bookmarks page 2021-10-25 21:28:52 +02:00
Laurent Destailleur
20c874d441 Fix escape sql params. 2021-10-25 18:48:44 +02:00