Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-07 17:42:53 +01:00
Code Issues Packages Projects Releases Wiki Activity
70,955 Commits 37 Branches 191 Tags
ed76fef860edc19aeb77c959d3605bc4f09cc894
Commit Graph

70955 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Laurent Destailleur
ed76fef860 Merge pull request #9954 from LaurentBouquet/feature/product-search-barcode 
NEW Add product search from barcode via REST api.
 2018-11-08 19:18:41 +01:00
Laurent Destailleur
5e705ae209 Merge pull request #9950 from grandoc/new_branch_04_11_2018 
Clean and update code
 2018-11-08 19:16:25 +01:00
Laurent Destailleur
a50eb014ee Merge pull request #9946 from ptibogxiv/patch-88 
Fix with new stripe payment function
 2018-11-08 19:13:38 +01:00
Laurent BOUQUET
320e7adef7 Fix blank lines and whitespace at end of lines 2018-11-08 17:09:54 +01:00
Laurent BOUQUET
b03a91213f Merge branch 'develop' into feature/product-search-barcode 2018-11-08 16:57:49 +01:00
Laurent BOUQUET
43aad33713 Merge remote-tracking branch 'upstream/develop' into develop 2018-11-08 16:57:09 +01:00
Laurent BOUQUET
360eb6eed6 Fix syntax error in 'htdocs\accountancy\admin\export.php' : Delete 'aZ09' text in line 45 2018-11-08 16:24:31 +01:00
Laurent Destailleur
6401a7ab06 Fix css 2018-11-08 16:03:10 +01:00
Laurent Destailleur
224d37cfeb Add bootstrap-iso class 2018-11-08 12:12:08 +01:00
Laurent Destailleur
22170ac1c1 FIX Crop of large files was selecting wrong image area. 2018-11-08 10:45:39 +01:00
Laurent Destailleur
5bbf7e8f1d Fix look and feel v8 2018-11-08 10:21:43 +01:00
Laurent Destailleur
c74ad61365 Fix look and feel v8 2018-11-08 10:04:25 +01:00
Laurent Destailleur
976516a796 Fix look and feel v8 2018-11-08 09:51:46 +01:00
Laurent Destailleur
193b153fbf Work on email collector 2018-11-07 18:02:08 +01:00
Laurent Destailleur
6ba78b2bb3 Work on email collector 2018-11-07 16:33:06 +01:00
Laurent Destailleur
46db246273 Look and feel v9: Autofocus on create forms 2018-11-07 13:04:43 +01:00
Laurent Destailleur
66ffcf287a Fix filter on extrafields 2018-11-07 12:49:17 +01:00
Laurent Destailleur
9a0b5fb599 Fix extrafields 2018-11-07 12:25:22 +01:00
Laurent Destailleur
c5231112c5 Fix regression with old canvas 2018-11-07 12:22:12 +01:00
Laurent Destailleur
c1cf4fbb95 Fix phpcs 2018-11-06 20:29:58 +01:00
Laurent Destailleur
7dd941dd51 Fix bad fix 2018-11-06 19:51:16 +01:00
Laurent Destailleur
c4db549f94 Work on emailcollector 2018-11-06 19:49:52 +01:00
Laurent Destailleur
a976dd74db Fix Report error if file size too large 2018-11-06 18:44:51 +01:00
Laurent Destailleur
e0070bd348 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/modules/expedition/doc/pdf_rouget.modules.php
	htdocs/filefunc.inc.php
 2018-11-06 18:30:57 +01:00
Laurent Destailleur
7e33af6677 Fix max size 2018-11-06 17:40:59 +01:00
Laurent Destailleur
1e801c7c8a Fix css 2018-11-06 16:50:31 +01:00
Laurent Bouquet
f05b67909b NEW : Add product search from barcode via REST api 2018-11-06 12:13:16 +01:00
Laurent Destailleur
ae8120041e Typo 2018-11-06 10:07:46 +01:00
Laurent Destailleur
7f4276cd6f Update doc 2018-11-06 10:07:28 +01:00
Laurent Destailleur
055a55b900 NEW Add SHIPPING_PDF_HIDE_WEIGHT_AND_VOLUME and 
SHIPPING_PDF_HIDE_QTYTOSHIP
 2018-11-06 10:03:12 +01:00
Laurent Destailleur
52aa860008 Code comment 2018-11-06 09:39:22 +01:00
Laurent Bouquet
cb10da4d41 [Core] Add product search from barcode via REST api 2018-11-05 23:06:19 +01:00
Laurent Bouquet
0f43521274 Fix syntax error in 'htdocs\accountancy\admin\export.php' : Delete 'aZ09' text in line 45 2018-11-05 22:52:57 +01:00
Laurent Destailleur
15dd2b3e35 Work on email collector 2018-11-05 21:19:09 +01:00
Laurent Destailleur
4a25317f10 Fix security on GETPOST('action'). Param must be sanitized. 2018-11-05 20:29:07 +01:00
Laurent Destailleur
763f3cd518 Debug modulebuilder 2018-11-05 18:10:38 +01:00
Laurent Destailleur
c0f4ec5a3e FIX sanitize param $action 2018-11-05 17:53:31 +01:00
Laurent Destailleur
dd70f1bf08 Debug emailcollector 2018-11-05 16:59:40 +01:00
Laurent Destailleur
eb9defcf1d Debug emailcollector 2018-11-05 16:42:29 +01:00
Laurent Destailleur
52d4426e87 Debug new modules 2018-11-05 16:38:07 +01:00
Laurent Destailleur
d65bf1fbc7 Fix emailcollector 2018-11-05 15:31:41 +01:00
Laurent Destailleur
f0305a7beb Prepare 8.0.4 2018-11-05 13:50:12 +01:00
Laurent Destailleur
9556a6dfb9 Remove warning 2018-11-05 12:31:35 +01:00
Laurent Destailleur
c988e2e681 Fix phpcs 2018-11-05 10:44:37 +01:00
Laurent Destailleur
4c591daab1 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/core/class/html.formprojet.class.php
8.0.3 		2018-11-05 10:39:22 +01:00
Laurent Destailleur
90729c03c4 Fix dependencies of new modules 2018-11-05 10:28:44 +01:00
Laurent Destailleur
56a70ab4e5 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0 2018-11-05 10:23:15 +01:00
Laurent Destailleur
693cf72fca Merge pull request #9920 from ATM-Marc/FIX_6.0_task_activity_access 
FIX: task time screen: bad task assignments
 2018-11-05 10:21:28 +01:00
Laurent Destailleur
01d7b1e96a Fix readme detection 2018-11-05 10:15:22 +01:00
Laurent Destailleur
0c7f33e1ba Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-05 09:58:19 +01:00