2
0
forked from Wavyzz/dolibarr
Commit Graph

5262 Commits

Author SHA1 Message Date
Laurent Destailleur
5f6ca1119a Replace arrow picto with fontawesome 2019-03-02 14:07:13 +01:00
Frédéric FRANCE
65551864d5 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-03-02 12:24:15 +01:00
Laurent Destailleur
359f2c6e81 NEW Add option MAIN_ALLOW_SELECT2_WITH_SMARTPHONE
Removed migration files
2019-03-02 12:16:37 +01:00
Frédéric FRANCE
40d34940f1 fix exclude from phpcs 2019-03-02 10:00:51 +01:00
John BOTELLA
421c009e58 Standardise new function name 2019-03-01 15:33:23 +01:00
John BOTELLA
162c3249cf Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-01 13:49:42 +01:00
John BOTELLA
b222c44bb9 Add helper functions and little review size of badges 2019-03-01 12:01:25 +01:00
Frédéric FRANCE
4f9e35f350 Merge remote-tracking branch 'upstream/develop' into Squiz.Scope.MethodScope.Missing 2019-02-28 20:48:23 +01:00
Laurent Destailleur
429da47d68 Fix default language of reminders 2019-02-28 13:11:14 +01:00
Laurent Destailleur
c444521abc IFTTT 2019-02-28 11:00:40 +01:00
Frédéric FRANCE
ba4ca5d7c2 add visibility 2019-02-28 00:15:32 +01:00
Laurent Destailleur
29cfa03fa4 Fix font awesome 5 regressions 2019-02-27 13:54:39 +01:00
John BOTELLA
9f0a93f68f Add color lib for color automation 2019-02-26 17:44:16 +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
Laurent Destailleur
6b46a927f1 Merge branch 'develop' into PSR2MethodsFunctionCallSignatureSpaceBeforeOpenBracket 2019-02-24 20:53:54 +01:00
ptibogxiv
47f5ff3303 Fix declare functions2.lib.php for donations API 2019-02-24 20:51:00 +01:00
Laurent Destailleur
c002fd68ae Merge pull request #10679 from ptibogxiv/patch-129
Fix declare functions2.lib.php for donations API
2019-02-24 20:49:59 +01:00
Laurent Destailleur
e349fe780e Merge pull request #10641 from OPEN-DSI/fix-show-action-done-emailing
Fix url for emailing type event (link to emailing card)
2019-02-24 20:48:57 +01:00
Laurent Destailleur
3fa2680859 Merge pull request #10669 from frederic34/html5fix
replace by html5 in ticket supplier_proposal, stripe, societe
2019-02-24 20:36:24 +01:00
Frédéric FRANCE
894123fb06 PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +01:00
ptibogxiv
efd27ec1d8 Fix declare functions2.lib.php for donations API 2019-02-24 16:11:52 +01:00
Frédéric FRANCE
167a857f4c replace html code by html5 in contact 2019-02-24 14:47:47 +01:00
Frédéric FRANCE
cdf5348b47 Update ajax.lib.php 2019-02-23 18:15:56 +01:00
Laurent Destailleur
0a83bc474c Merge pull request #10635 from grandoc/new_branch_19_02_2019
update with html5 compliant code
2019-02-23 14:09:17 +01:00
Lionel VESSILLER
cdc2c5ae77 Company Lib : Fix contact events with no thirdparty 2019-02-21 09:49:46 +01:00
Lionel VESSILLER
d10c5cab34 Company Lib : Fix url for emailing type event (link to emailing card) 2019-02-20 15:14:50 +01:00
Laurent Destailleur
a3a89b755f NEW Gain space by moving the meteo on title line 2019-02-20 06:01:13 +01:00
Laurent Destailleur
abfd610bbc Fix quote not closed 2019-02-20 03:44:08 +01:00
Philippe GRAND
d83b77432d update with html5 compliant code 2019-02-19 17:42:12 +01:00
Regis Houssin
1c3541295b FIX wrong class name "CUnits instead CMeasuringUnits" 2019-02-19 09:24:30 +01:00
Laurent Destailleur
e644de4a70 Fix for font awesome 5 2019-02-15 15:30:21 +01:00
Laurent Destailleur
c480f4be68 FIX Bad remote ip address when user is using a proxy 2019-02-15 15:17:24 +01:00
Laurent Destailleur
a7af1b1765 Remove deprecated code 2019-02-14 16:29:13 +01:00
Laurent Destailleur
42f754cbc0 Merge pull request #10596 from frederic34/patch-33
Update functionsnumtoword.lib.php
2019-02-14 13:33:03 +01:00
Laurent Destailleur
6b00bb1a6f Merge pull request #10583 from frederic34/patch-18
Update company.lib.php
2019-02-14 13:26:21 +01:00
Frédéric FRANCE
0594061ef4 Update functionsnumtoword.lib.php 2019-02-14 00:03:10 +01:00
Frédéric FRANCE
154ba78ee7 Update company.lib.php 2019-02-13 22:43:12 +01:00
Frédéric FRANCE
b9d37c276d update doc in barcode.lib.php 2019-02-13 22:23:14 +01:00
Laurent Destailleur
2311912d8a Merge branch 'develop' into dev_importproduct_measuringunit 2019-02-13 16:35:46 +01:00
Laurent Destailleur
69313cbf0d Merge pull request #10567 from frederic34/patch-18
Update images.lib.php
2019-02-13 16:25:32 +01:00
florian HENRY
de87321c15 fix travcis 2019-02-13 10:28:08 +01:00
florian HENRY
e2d13c0e1f Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
dev_importproduct_measuringunit

Conflicts:
	htdocs/contact/consumption.php
	htdocs/webservices/server_productorservice.php
2019-02-13 09:23:52 +01:00
florian HENRY
5c059c897d fix travis (mosty for dev no conerne by my changes) 2019-02-13 09:21:14 +01:00
florian HENRY
d88475c61a Merge branch 'develop' of local repository into dev_importproduct_measuringunit 2019-02-13 08:59:18 +01:00
Frédéric FRANCE
e4b73e8273 Update images.lib.php 2019-02-12 23:39:59 +01:00
Frédéric FRANCE
2aae952760 fix doc in tax.lib.php 2019-02-12 23:25:26 +01:00
Laurent Destailleur
5fceee3048 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/mysql/migration/8.0.0-9.0.0.sql
2019-02-12 19:02:19 +01:00
Laurent Destailleur
affbd20cdb FIX Bad link in menu manager 2019-02-12 18:56:32 +01:00
florian HENRY
5b5f96bafb NEW : measuring unit dictionnary and product size/unit import 2019-02-12 16:58:11 +01:00