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

68001 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
e3d9e609d5 Fix var not defined 2018-07-16 11:20:54 +02:00
Laurent Destailleur
3710f95719 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/exports.lang
 2018-07-16 10:01:23 +02:00
Laurent Destailleur
6846ff7d21 Fix problem in some vars as reported in #8955 2018-07-16 09:57:45 +02:00
Steve
2cf28e055b more minor grammar corrections 
Conflicts:
	htdocs/langs/en_US/admin.lang
	htdocs/langs/en_US/companies.lang
	htdocs/langs/en_US/exports.lang
	htdocs/langs/en_US/mails.lang
	htdocs/langs/en_US/products.lang
	htdocs/langs/en_US/sms.lang
 2018-07-16 09:43:19 +02:00
Laurent Destailleur
387abf2da8
Merge pull request #9057 from inoveaconseil/checkRightOnLink 
ADD Check right on link
 2018-07-16 09:31:21 +02:00
Laurent Destailleur
ae76e61885
Merge pull request #9108 from torvista/misc-texts 
more minor grammar corrections
 2018-07-16 09:23:10 +02:00
Steve
bd9149e03b more minor grammar corrections 2018-07-16 07:28:22 +02:00
Laurent Destailleur
d968a61445 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-15 20:17:17 +02:00
Laurent Destailleur
1e42db0641 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-15 20:16:54 +02:00
Laurent Destailleur
f3b7bc53bd Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2018-07-15 20:16:08 +02:00
Laurent Destailleur
e92052353d
Merge pull request #9026 from inoveaconseil/FixExtrafieldResource 
Fix extrafields resource
 2018-07-15 20:13:24 +02:00
Laurent Destailleur
9b644fb92f
Merge pull request #9054 from grandoc/new_branch_05_07_2018 
docs: complete comments
 2018-07-15 20:12:21 +02:00
Laurent Destailleur
b690306b70
Merge pull request #9027 from hregis/7.0_price 
Fix: avoid a non numeric value !!
 2018-07-15 20:11:50 +02:00
Laurent Destailleur
bff4ed8103
Merge pull request #9098 from atm-florian/develop 
fix list of event of thirdparty and unformize code
 2018-07-15 20:10:19 +02:00
Laurent Destailleur
a5442033ac Code comment 2018-07-15 20:09:51 +02:00
Laurent Destailleur
ba36d1aef0
Merge pull request #9095 from IAS-SYSTEMS-CSC/dolibarr-fixes 
fix sql error functions.lib.php
 2018-07-15 20:00:54 +02:00
Laurent Destailleur
0ca9f6f522
Update functions.lib.php 2018-07-15 20:00:43 +02:00
Laurent Destailleur
b796c10534
Merge pull request #9101 from hregis/develop_api 
NEW can add documents on agenda events using API REST
 2018-07-15 19:59:52 +02:00
Laurent Destailleur
4279ba66e1
Merge pull request #9103 from grandoc/new_branch_13_07_2018 
fix: breacking link
 2018-07-15 19:59:10 +02:00
Laurent Destailleur
cb0553c3bf
Merge pull request #9094 from atm-ph/fix_7.0_getrights 
Fix user rights overrided by user group rights
 2018-07-15 19:58:00 +02:00
Laurent Destailleur
29c76a3f56
Merge pull request #9090 from grandoc/new_branch_10_07_2018 
New branch 10 07 2018
 2018-07-15 19:52:07 +02:00
Laurent Destailleur
0ce101f395
Merge pull request #9096 from grandoc/new_branch_12_07_2018 
update code and typo
 2018-07-15 19:48:05 +02:00
Laurent Destailleur
20e360e918 Start to introduce array fields for products 2018-07-15 18:22:26 +02:00
Laurent Destailleur
a45ac4519a Fix translation 2018-07-15 18:03:31 +02:00
Philippe GRAND
9ae7e55fea fix: breaking link 2018-07-13 19:54:37 +02:00
Laurent Destailleur
988b6a49d2 Fix warning php 7.3 2018-07-13 18:40:54 +02:00
Regis Houssin
e1dabe3924 NEW add agenda documents in API REST 2018-07-13 16:07:19 +02:00
Laurent Destailleur
1e775ffa6e Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:12:01 +02:00
Laurent Destailleur
c27dd8d301 Fix phpcs 2018-07-13 09:11:46 +02:00
Laurent Destailleur
e4be3ab954 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-13 09:09:51 +02:00
Laurent Destailleur
1b33703cd8 Fix missing country code 2018-07-13 09:08:42 +02:00
florian HENRY
09fe2f83fa Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into develop 2018-07-12 18:27:22 +02:00
florian HENRY
1fa13fc747 fix list of event unformize code 2018-07-12 18:27:09 +02:00
Laurent Destailleur
ebe5325f2b Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-07-12 18:06:26 +02:00
Laurent Destailleur
52dee71b39 Responsive 2018-07-12 18:06:06 +02:00
Laurent Destailleur
872895c0b6 Code comment 2018-07-12 11:17:21 +02:00
Philippe GRAND
6945680e03 update code and typo 2018-07-12 10:11:42 +02:00
ias-ceo
740f35966c installation default port number if missing 2018-07-12 05:15:09 +03:00
ias-ceo
076bf0a3a7 fix sql error 2018-07-12 05:09:36 +03:00
atm-ph
0c252d9778 Fix user rights overrided by user group rights 2018-07-11 18:09:29 +02:00
Laurent Destailleur
22ab4c54a6
Merge pull request #9089 from atm-florian/dev_addcactiontrigger 
Add DELETE Trigger action into admin event agenda log
 2018-07-11 10:56:35 +02:00
Laurent Destailleur
b203421ac6 Fix log 2018-07-11 10:54:42 +02:00
Laurent Destailleur
2e36e5afa5 Some fix with dolistore api 2018-07-11 10:47:55 +02:00
Laurent Destailleur
6eb9f13ec2 Fix warning 2018-07-11 10:01:26 +02:00
Laurent Destailleur
4c65f4d498 Log 2018-07-11 09:38:40 +02:00
Hytham Soliman
e17d5279ac
Merge pull request #2 from IAS-SYSTEMS-CSC/develop 
develop > dolibarr-fixes
 2018-07-11 10:03:18 +03:00
Regis Houssin
f52187e829 Merge branch '7.0' of https://github.com/Dolibarr/dolibarr.git into 7.0_price 2018-07-11 08:22:13 +02:00
Hytham Soliman
eeb0076b15
Merge pull request #1 from Dolibarr/develop 
dolibarr/develop > IAS/develop
 2018-07-11 08:23:04 +03:00
Philippe GRAND
72adc485f0 Docs : Update and complete 2018-07-10 22:32:55 +02:00
florian HENRY
2f2ca16e2b Add DELETE Trigger action into admin event agenda log 2018-07-10 16:44:14 +02:00