Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-31 22:22:28 +01:00
Code Issues Packages Projects Releases Wiki Activity
71,222 Commits 37 Branches 191 Tags
a06b032c23590c190860d2e87795fa62943d8375
Commit Graph

1937 Commits

Author SHA1 Message Date
Laurent Destailleur
b51004e809 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-15 17:34:36 +01:00
Laurent Destailleur
2d6f7f926c FIX xss injection on user address 2018-11-15 17:34:11 +01:00
Laurent Destailleur
e1407c8289 Merge pull request #10012 from hregis/develop_mc 
FIX compatibility between proposal sharing and proposalnumber sharing
 2018-11-15 17:19:28 +01:00
Laurent Destailleur
8a97ba4ba9 Update card.php 2018-11-15 16:56:12 +01:00
David Beniamine
01947288fb Fix issue #9956 User can edit some of their data without permissons 2018-11-14 18:29:15 +01:00
Regis Houssin
2bc25fc008 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop_mc 2018-11-14 15:24:41 +01:00
Laurent Destailleur
df2aa2e2f6 Fix column balance 2018-11-14 13:52:43 +01:00
Laurent Destailleur
ba22ae45e7 Fix column balance 2018-11-14 13:45:20 +01:00
Laurent Destailleur
0201939ebe Fix column balance 2018-11-14 13:43:39 +01:00
Regis Houssin
04edcaa89c FIX compatibility between proposal sharing and proposalnumber sharing 2018-11-13 20:20:46 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
86d854f3f4 Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose 2018-10-24 23:04:26 +02:00
Laurent Destailleur
3ef32a24a4 Look and feel 2018-10-17 00:34:39 +02:00
Laurent Destailleur
00dc78dd01 Fix responsive 2018-10-16 21:58:33 +02:00
Philippe GRAND
ba40ad4aab Standardize and update code 2018-10-12 12:23:45 +02:00
Laurent Destailleur
82c89f739d social network module 2018-10-12 11:29:47 +02:00
Laurent Destailleur
cb53e18aa4 Social network module 2018-10-12 11:19:18 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
Laurent Destailleur
46ad7de5dd Merge pull request #9709 from bafbes/abb80031 
NEW Category filter on user list
 2018-10-09 15:38:00 +02:00
Laurent Destailleur
0938ac4afa Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/user/list.php
 2018-10-09 14:54:18 +02:00
Laurent Destailleur
3c8b365c3e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-09 14:53:39 +02:00
Abbes Bahfir
073914572c Fix: users categories type is Categorie::TYPE_USER 2018-10-09 14:24:41 +02:00
Laurent Destailleur
966e97617d Merge pull request #9708 from bafbes/abb80030 
FIX users categories type is Categorie::TYPE_USER
 2018-10-09 14:24:21 +02:00
Laurent Destailleur
f365a987c4 FIX restore last seach criteria 
FIX filter on employee
 2018-10-09 14:20:53 +02:00
Abbes Bahfir
603c70ffc7 Fix: Searching on employee field disables employee mode 2018-10-09 14:10:04 +02:00
Laurent Destailleur
362c226ad6 Merge pull request #9710 from bafbes/abb80032 
Fix: Searching on employee field disables employee mode
 2018-10-09 14:09:23 +02:00
Philippe GRAND
bba6669f03 Merge remote-tracking branch 'upstream/develop' into new_branch_05_10_2018 2018-10-09 08:47:26 +02:00
Abbes Bahfir
34da7cc731 Fix: Searching on employee field disables employee mode 2018-10-09 00:25:55 +01:00
Abbes Bahfir
06a943fc80 Fix: Category filter on user list 2018-10-09 00:02:14 +01:00
Abbes Bahfir
1e706c2e6b Fix: users categories type is Categorie::TYPE_USER 2018-10-08 23:50:14 +01:00
Laurent Destailleur
506ba30d5a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-10-06 20:54:14 +02:00
Laurent Destailleur
fef40439be responsive 2018-10-06 20:05:41 +02:00
Philippe GRAND
956c7b21e2 Standardize code 2018-10-06 12:18:03 +02:00
Philippe GRAND
5890647afd Standardize code 2018-10-06 12:04:17 +02:00
Philippe GRAND
74c86f477c Standardize code 2018-10-06 12:01:00 +02:00
Frédéric FRANCE
4d72812129 Create index.html 2018-09-30 14:56:12 +02:00
Frédéric FRANCE
3f0162789b Create index.html 2018-09-30 14:55:55 +02:00
Frédéric FRANCE
877184638c add index.html in user directory 2018-09-30 14:55:15 +02:00
Laurent Destailleur
79ade6a1af Work on website 2018-09-26 15:20:37 +02:00
Philippe GRAND
9c9f5bd3c3 Standardize and update code 2018-09-20 17:26:39 +02:00
Philippe GRAND
83871468ba Standardize and update code 2018-09-18 17:37:08 +02:00
Frédéric FRANCE
4120d0f92c reduce complexity of user class 2018-09-16 13:49:22 +02:00
Laurent Destailleur
80fb1e0657 NEW Each user can set its prefered default calendar 2018-09-14 11:23:15 +02:00
Frédéric FRANCE
987fdbe73c Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-12 21:29:41 +02:00
Laurent Destailleur
963d5eeddf Merge pull request #9387 from frederic34/camelCaps2 
start changing phpcs:ignore
 2018-09-12 21:14:34 +02:00