Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
79,034 Commits 36 Branches 189 Tags
fec67aade476d54d96db49b200bf53e0927e5eb0
Commit Graph

2131 Commits

Author SHA1 Message Date
Alexandre SPANGARO
aec50d3ac9 NEW Add fa_icon on load_fiche_titre 2019-09-30 10:14:55 +02:00
Laurent Destailleur
6858dce344 Rename table for categorie of warehouses 2019-09-27 13:28:28 +02:00
Laurent Destailleur
961f2b5165 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/categories/viewcat.php
	htdocs/fourn/class/fournisseur.product.class.php
	htdocs/takepos/invoice.php
 2019-09-24 14:25:02 +02:00
Laurent Destailleur
db334a3b94 FIX Var not enough sanitized 2019-09-24 14:16:24 +02:00
Laurent Destailleur
9bf387d43c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/admin/mails_templates.php
	htdocs/main.inc.php
	htdocs/user/card.php
 2019-09-18 15:12:38 +02:00
Laurent Destailleur
e52788eb75 Fix xss 2019-09-18 14:31:03 +02:00
Laurent Destailleur
771104bc68 Fix XSS 2019-09-18 14:25:53 +02:00
Laurent Destailleur
345ac28c89 Fix js injection 
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/user/group/card.php
 2019-09-18 14:21:02 +02:00
Laurent Destailleur
421631f2be Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-09-15 15:53:45 +02:00
Laurent Destailleur
27e3a2cb1d Update perms.php 2019-09-15 15:32:43 +02:00
Laurent Destailleur
d380ef1812 Update usergroup.class.php 2019-09-14 16:37:07 +02:00
Abbes Bahfir
4098ecfe17 Merge branch 'abb100077' of github.com:bafbes/dolibarr into abb100077 2019-09-12 11:30:14 +01:00
Abbes Bahfir
195ac8e8f6 fix : Tests for attributes exsitence in Use of posixAccount and posixGroup objectclass for users and groups in LDAP 2019-09-12 11:24:30 +01:00
Regis Houssin
60e85136df FIX an admin can not access his own permissions after enabling advanced 
permissions
 2019-09-12 08:48:55 +02:00
stickler-ci
e5878c105a Fixing style errors. 2019-09-11 21:48:17 +00:00
Abbes Bahfir
5183a1ec7a New : Use of posixAccount and posixGroup objectclass for users and groups in LDAP 2019-09-11 22:45:52 +01:00
Laurent Destailleur
529dd05226 Replace deprecated code 2019-09-06 10:53:05 +02:00
Laurent Destailleur
da3d230182 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	.stickler.yml
	htdocs/takepos/invoice.php
 2019-09-03 17:34:49 +02:00
Laurent Destailleur
9c6cbfeb7f Merge pull request #11774 from ptibogxiv/patch-250 
FIX logout redirect to takepos.php
 2019-09-03 15:10:28 +02:00
Laurent Destailleur
a040d7eccc Fix bad link 2019-09-02 04:39:45 +02:00
Laurent Destailleur
621dd83a7f Fix bad link 2019-09-02 04:38:36 +02:00
Laurent Destailleur
ac7d0b5eb6 Fix scrutinizer 2019-09-02 04:12:48 +02:00
Laurent Destailleur
a3e221468a Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-31 01:15:04 +02:00
Laurent Destailleur
7942c5edf7 Fix js injection 2019-08-30 16:22:24 +02:00
ptibogxiv
4cf2c835c6 Update logout.php 2019-08-28 19:48:45 +02:00
Laurent Destailleur
54203dda1f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/admin/modules.php
 2019-08-21 16:25:48 +02:00
Laurent Destailleur
15a765a79a Fix responsive 2019-08-19 13:28:24 +02:00
Laurent Destailleur
d21e557100 FIX #11671 CVE-2019-15062 2019-08-17 22:16:27 +02:00
Laurent Destailleur
a746075dbe Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/filefunc.inc.php
 2019-08-16 17:04:28 +02:00
Laurent Destailleur
9692ea5faf FIX #11671 CVE-2019-15062 2019-08-16 16:41:53 +02:00
Laurent Destailleur
8ad2081555 NEW Can select website templates from available default templates 2019-08-12 22:19:24 +02:00
John Botella
4aeaa580ea Add color blind option 2019-08-07 11:11:47 +02:00
Laurent Destailleur
d7a41c6b72 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/admin.lang
 2019-08-01 12:54:27 +02:00
Laurent Destailleur
5eb8f05061 FIX #11584 2019-08-01 12:23:02 +02:00
Alexandre SPANGARO
0af1206892 Merge branch 'develop' into 11.0_salaries 2019-07-19 23:11:06 +02:00
Alexandre SPANGARO
9ab0734415 NEW Extrafields on salaries 2019-07-19 23:08:24 +02:00
Laurent Destailleur
50480bf517 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/opensurvey/index.php
 2019-07-18 18:23:24 +02:00
Laurent Destailleur
e976195777 Fix missing key for api 2019-07-18 14:08:15 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
575dce2dff Fix css 2019-07-05 12:17:36 +02:00
Laurent Destailleur
fa476b4994 Properties ->libelle_incoterms were renamed into ->label_incoterms 2019-06-25 13:00:02 +02:00
Laurent Destailleur
609eefaf08 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:36:08 +02:00
Laurent Destailleur
28024d5cd1 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0 
Conflicts:
	htdocs/core/actions_massactions.inc.php
 2019-06-24 16:28:48 +02:00
Laurent Destailleur
22b91f3693 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 13:28:44 +02:00
Laurent Destailleur
0f808114e5 Sync transifex 
Fix CSS for Left To Right Languages
 2019-06-22 13:18:33 +02:00
John Botella
e5298d0666 Fix send mail ancor 2019-06-21 11:20:04 +02:00
Laurent Destailleur
4308f48cad Merge branch 'develop' into MissingHook 2019-06-20 03:04:32 +02:00
Laurent Destailleur
b4e47d289b Code comment 2019-06-20 02:43:56 +02:00
Nicolas ZABOURI
2e4db8c83c Merge remote-tracking branch 'Dolibarr/10.0' into MissingHook 2019-06-19 08:39:05 +02:00
Laurent Destailleur
663998bab1 Fix scrutinizer errors 2019-06-18 20:15:04 +02:00