Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

2269 Commits

Author SHA1 Message Date
Laurent Destailleur
a664cd6461 Fix check when uploading a non image as user photo 2019-05-10 20:09:41 +02:00
Laurent Destailleur
3def11d5c9 Standardize translation 2019-05-10 19:32:46 +02:00
Regis Houssin
10da976b93 FIX try to fix phpcs error 2019-05-10 16:37:03 +02:00
Regis Houssin
9a6029b1d9 FIX disable phpcs 2019-05-10 16:12:16 +02:00
Regis Houssin
2ce96290eb FIX broken feature !! 2019-05-10 11:50:01 +02:00
Regis Houssin
de84f12b24 FIX broken feature with ldap trigger !!! 2019-05-10 11:47:44 +02:00
Laurent Destailleur
68d438b697 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/card.php
	htdocs/user/class/user.class.php
 2019-04-25 01:50:48 +02:00
Regis Houssin
740fddcd42 FIX missing global $user 2019-04-24 08:22:00 +02:00
Regis Houssin
41a82023e3 FIX missing compatibility with multicompany 2019-04-24 08:17:10 +02:00
ATM john
292d9c38a5 Appli function to links 2019-04-15 00:21:58 +02:00
Laurent Destailleur
fae2983c2a Merge branch 'develop' into new_user_hr_fields 2019-04-11 18:27:58 +02:00
Laurent Destailleur
05c14e4f2f Look and feel v10 2019-04-10 15:54:29 +02:00
Laurent Destailleur
7b01e76d2b Fix doxygen 2019-04-08 16:04:15 +02:00
Laurent Destailleur
fad2fa48dd NEW Introduce a config parameter $dolibarr_main_instance_unique_id 2019-04-07 15:44:17 +02:00
Laurent Destailleur
fff9b7db9d Fix doxygen 2019-04-04 18:33:12 +02:00
Laurent Destailleur
1b2826f476 Look and feel v10 2019-03-29 13:26:26 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
c1df84a165 Fix phpcs 2019-03-22 13:17:26 +01:00
Philippe GRAND
69906b9888 translation 2019-03-22 09:38:04 +01:00
Laurent Destailleur
6e4d6c94dd FIX phpcs 2019-03-21 20:17:31 +01:00
Laurent Destailleur
ee4150665e Fix phpcs 2019-03-21 20:15:19 +01:00
Laurent Destailleur
5693fbfe97 Merge pull request #10898 from grandoc/new_branch_21_03_2019 
add some comments
 2019-03-21 18:29:11 +01:00
Mathieu Pellegrin
e0d89101df #9480 Password link broken if login contains space 2019-03-21 18:25:00 +01:00
Laurent Destailleur
6c2bd13b58 Merge pull request #10895 from mpellegrin/develop 
#9480 Password link broken if login contains space
 2019-03-21 18:24:21 +01:00
Philippe GRAND
efc393e13c add some comments 2019-03-21 15:19:01 +01:00
Philippe GRAND
2ad649eaea add some comments 2019-03-21 15:18:05 +01:00
Laurent Destailleur
5d21547854 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/product/price.php
	htdocs/user/perms.php
 2019-03-21 12:20:24 +01:00
Mathieu Pellegrin
e971018c71 #9480 Password link broken if login contains space 2019-03-21 12:06:43 +01:00
Laurent Destailleur
3c1d7bfbf0 FIX counter of permissions in badge was wrong 2019-03-19 16:30:40 +01:00
Laurent Destailleur
0c101f3d1b Fix translation 2019-03-18 11:21:51 +01:00
Philippe GRAND
60e8c3d7e3 update with html5 compliant code 2019-03-17 10:30:16 +01:00
Philippe GRAND
ee675645c1 update with html5 compliant code 2019-03-17 10:29:00 +01:00
Philippe GRAND
e8c98f91cf update with html5 compliant code 2019-03-17 10:27:54 +01:00
Maxime Kohlhaas
0a0e29a089 New fields on user object for hrm purpose 2019-03-16 08:53:06 +01:00
Frédéric FRANCE
f283782445 change visibility 2019-03-04 19:57:46 +01:00
Laurent Destailleur
8fce6e5e31 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/card.php
	htdocs/core/modules/mailings/xinputfile.modules.php
	htdocs/fourn/facture/card.php
 2019-03-02 19:13:37 +01:00
Laurent Destailleur
40e923ec85 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 
Conflicts:
	htdocs/core/modules/modAgenda.class.php
 2019-03-02 19:07:14 +01:00
Frédéric FRANCE
bd2e541fd6 add visibility 2019-03-01 18:28:51 +01:00
Frédéric FRANCE
c5d252fa2e Merge remote-tracking branch 'origin/Squiz.Scope.MethodScope.Missing' into Squiz.Scope.MethodScope.Missing 2019-02-27 17:56:13 +01:00
Laurent Destailleur
b3fb0eaf5b Merge branch 'develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 15:48:31 +01:00
Laurent Destailleur
ee3dd016e7 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-02-27 14:47:23 +01:00
Frédéric FRANCE
49cbaed569 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 14:21:15 +01:00
Laurent Destailleur
c4e96e9f74 Fix language 2019-02-27 13:48:13 +01:00
Laurent Destailleur
727c4b787b Merge pull request #10617 from wdammak/patch-29 
NEW Add Default Warehouse to user record (if module stock is on)
 2019-02-27 13:38:55 +01:00
Laurent Destailleur
e873608d84 Update card.php 2019-02-27 13:37:53 +01:00
Frédéric FRANCE
5a4ac82880 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-27 08:23:29 +01:00
Frédéric FRANCE
1c07006015 wip 2019-02-25 21:36:27 +01:00
Regis Houssin
6fa016dc85 FIX wrong feature2 when user rights "group_advance" is used 2019-02-25 10:44:22 +01:00
Alexandre SPANGARO
2da1447a0b Merge remote-tracking branch 'upstream/develop' into 10.0_linkedin 2019-02-25 09:12:04 +01:00
Alexandre SPANGARO
acb9cfe07a NEW: Add LinkedIn field 2019-02-25 09:07:58 +01:00