Commit Graph

81180 Commits

Author SHA1 Message Date
Laurent Destailleur
f81463af0c Update templates 2019-08-15 00:55:47 +02:00
Laurent Destailleur
dfe2c3de74 Add template stellar 2019-08-15 00:31:37 +02:00
Laurent Destailleur
b2f1cb22e8 Add tooltip in website module 2019-08-14 23:57:44 +02:00
Laurent Destailleur
2b805cc63d Add tooltip help in CSS edition 2019-08-14 23:47:01 +02:00
Jean Traullé
4252a2c868 Merge branch 'develop' into feature-rest-api-supplierinvoices-payments 2019-08-14 23:35:35 +02:00
Jean Traullé
c739b95666 Fix codestyle
lessc.class.php should be excluded from ruleset as it is an external lib
2019-08-14 23:33:06 +02:00
Laurent Destailleur
f753799810 FIX Support #tag into url of website module 2019-08-14 23:27:34 +02:00
Jean Traullé
6d55af2530 Merge remote-tracking branch 'remotes/upstream/develop' into feature-rest-api-supplierinvoices-payments 2019-08-14 23:24:15 +02:00
Jean Traullé
003642fe10 Preserve spaces instead of tabs for indentation. 2019-08-14 23:07:18 +02:00
Jean Traullé
1d2c2f8551 NEW Add payments GET and POST REST API endpoints for supplierinvoices. 2019-08-14 23:00:40 +02:00
Laurent Destailleur
87b2a01a35 NEW Add less 2 css converter 2019-08-14 19:49:07 +02:00
Laurent Destailleur
0818571827 Work on the edit inline tool. 2019-08-14 19:48:52 +02:00
VESSILLER
b19817194d NEW add mass actions and FIX type ent array not defined in shipment list 2019-08-14 17:11:59 +02:00
VESSILLER
891cd155ea NEW add mass actions and FIX type ent array not defined in shipment list 2019-08-14 17:04:13 +02:00
Laurent Destailleur
10a3e773ce FIX Avoid to add new line in css file at each save 2019-08-14 16:28:41 +02:00
Laurent Destailleur
6df36866e1 Remove mentions to register_globals 2019-08-14 15:30:03 +02:00
Laurent Destailleur
bb4618e2cf Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/website.lib.php
	htdocs/website/index.php
2019-08-14 04:12:37 +02:00
Laurent Destailleur
12bebdefbb Fix can replace PclZip with ZipArchive 2019-08-14 04:07:25 +02:00
Laurent Destailleur
fbf6cbe091 FIX Option to use ZipArchive instead of PclZip bugged with large files. 2019-08-14 04:07:02 +02:00
Laurent Destailleur
4a20c99656 FIX Content send before header warning 2019-08-14 04:06:50 +02:00
Laurent Destailleur
6de2118f11 FIX Bad error management in zip compress and web site export
Conflicts:
	htdocs/website/index.php
2019-08-14 04:06:29 +02:00
Laurent Destailleur
e1ab5089d7 FIX Missing some replacements in website module
Conflicts:
	htdocs/website/index.php
2019-08-14 04:02:57 +02:00
Laurent Destailleur
f1c6f1b375 Fix can replace PclZip with ZipArchive 2019-08-14 04:00:08 +02:00
Laurent Destailleur
b0172f136b FIX Option to use ZipArchive instead of PclZip bugged with large files. 2019-08-14 03:43:15 +02:00
Laurent Destailleur
198b35b419 FIX Content send before header warning 2019-08-14 02:46:09 +02:00
Laurent Destailleur
bc230c2d25 FIX Bad error management in zip compress and web site export 2019-08-14 01:43:06 +02:00
Laurent Destailleur
53b43eb98a Fix error message 2019-08-13 19:34:21 +02:00
Laurent Destailleur
df53826426 FIX Missing some replacements in website module 2019-08-13 18:22:18 +02:00
ptibogxiv
93d64bb84e Update functions.lib.php 2019-08-13 17:59:19 +02:00
ptibogxiv
8198276d64 FIX for MAIN_MAXTABS_IN_CARD = $i card 2019-08-13 17:47:30 +02:00
Jean Traullé
e3bca063a0 Fix CI code style checks
Not my fault but I am disciplined so, if the CI says it is an error ... I just fix it to get green again ;)
2019-08-13 17:06:46 +02:00
Jean Traullé
b90815b972 FIX require product class (fixes POST /supplierinvoices REST API endpoint)
When passing a fk_product field into a supplier invoice line on the POST /supplierinvoices REST API endpoint, we need to require the product class first in fournisseur.facture.class.php to be able to load the Product from the passed id.
2019-08-13 16:36:41 +02:00
Jean Traullé
d4bd80a168 Merge pull request #8 from Dolibarr/develop
Merge from upstream
2019-08-13 16:27:49 +02:00
ATM john
4ccabca101 Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar 2019-08-13 16:04:10 +02:00
ATM john
2a068030e5 Fix : foreach optimized 2019-08-13 16:01:15 +02:00
ATM john
717ea523e9 Fix lang and add size control 2019-08-13 15:54:32 +02:00
Laurent Destailleur
b443b1b372 FIX permission check on API intervention 2019-08-13 14:21:43 +02:00
Regis Houssin
34579dd4db FIX phpcs 2019-08-13 07:46:03 +02:00
Regis Houssin
7c8b3c9a38 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop_menu 2019-08-13 07:34:02 +02:00
Regis Houssin
056f51bfc5 FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme 2019-08-13 07:14:42 +02:00
Laurent Destailleur
49e61e237c Better log 2019-08-13 07:08:45 +02:00
Laurent Destailleur
91cdb2a5a8 Add more logs 2019-08-13 07:05:06 +02:00
Laurent Destailleur
7891c8d856 Enhance logs 2019-08-13 06:52:07 +02:00
Laurent Destailleur
99473097a9 FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks

Conflicts:
	htdocs/website/index.php
2019-08-13 06:43:28 +02:00
Laurent Destailleur
277a693c16 FIX Add log and type of content in dolWebsiteOutput and
dolWebsiteReplacementOfLinks
2019-08-13 06:37:06 +02:00
Laurent Destailleur
52d34edb03 FIX USEDOLIBARREDITOR not always set 2019-08-13 05:23:10 +02:00
Laurent Destailleur
172271c98a FIX USEDOLIBARREDITOR not always set 2019-08-13 05:22:49 +02:00
Laurent Destailleur
8e0a023270 FIX Disabling a website does not put it offline 2019-08-13 05:05:19 +02:00
Laurent Destailleur
983dc80d9e FIX Disabling a website does not put it offline 2019-08-13 05:03:45 +02:00
Laurent Destailleur
77c96a49e1 Update website template 2019-08-13 04:53:47 +02:00