Commit Graph

1643 Commits

Author SHA1 Message Date
Laurent Destailleur
7a5a561170 Fix label of status of invoice record when using smartphone 2019-03-15 23:00:50 +01:00
Laurent Destailleur
91f80934f3 Fix: On smartphone, hide label of status only on lists. 2019-03-15 20:39:55 +01:00
Laurent Destailleur
b6cacf3a20 Fix label of status for members on smartphone 2019-03-15 20:18:35 +01:00
Laurent Destailleur
d512e54407 Restore toggle of login_block because it was no more visible 2019-03-15 20:10:39 +01:00
Laurent Destailleur
3b4bcc67c9
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
NEW/FIX Theme sidebarr toggle
2019-03-15 19:41:39 +01:00
Laurent Destailleur
6f0fbc42c1 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea
Conflicts:
	htdocs/expensereport/card.php
	htdocs/projet/card.php
	htdocs/public/members/new.php
	htdocs/public/opensurvey/studs.php
2019-03-15 15:16:29 +01:00
Laurent Destailleur
e5c08978c3 FIX Param keepn must be 1 when dol_escape_htmltag used for textarea 2019-03-15 15:13:28 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Laurent Destailleur
f8a4d9075b Fix css for fontawesome 5 2019-03-14 11:48:25 +01:00
Laurent Destailleur
fcbd39fda9 Fix typo 2019-03-13 19:07:19 +01:00
Laurent Destailleur
e7cd8d690c Remove warnings 2019-03-13 19:06:45 +01:00
Laurent Destailleur
1bd9d6a8e5 Fix font awesome 5 picto for notes 2019-03-13 15:02:43 +01:00
Laurent Destailleur
7d82073eab Use fontawesome for icon "setup". 2019-03-12 11:57:55 +01:00
Laurent Destailleur
d762766a56 Font awesome 5 by default 2019-03-12 10:11:34 +01:00
John BOTELLA
be2885c75b Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle 2019-03-12 09:24:42 +01:00
Laurent Destailleur
abdc2aa21a Fix phpcs 2019-03-11 21:03:23 +01:00
John BOTELLA
57c6c60118 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-11 14:44:35 +01:00
John BOTELLA
5d7118340b Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-11 14:40:19 +01:00
Laurent Destailleur
fac329e637 Clean code 2019-03-11 01:01:15 +01:00
John BOTELLA
ccebb8d1a7 Fix travis errors 2019-03-08 14:40:22 +01:00
John BOTELLA
37cd62b564 Add user friendly behavior 2019-03-08 14:26:06 +01:00
John BOTELLA
218690db00 add css behavior 2019-03-07 17:05:27 +01:00
John BOTELLA
a0b14b9105 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-07 15:53:41 +01:00
John BOTELLA
74c8754092 fix travis 2019-03-07 15:49:16 +01:00
John BOTELLA
e382f13637 remove test 2019-03-05 17:16:38 +01:00
John BOTELLA
ef9ad4d109 Merge branch 'theme_top_menu' of github.com:atm-john/dolibarr into theme_badge_status 2019-03-05 17:14:59 +01:00
John BOTELLA
600f0c9fa6 Fix condition 2019-03-05 17:14:29 +01:00
John BOTELLA
72d96d2ac3 prepare badges 2019-03-05 17:13:20 +01:00
John BOTELLA
6b98eecd32 fix compatibility status 2019-03-05 16:58:05 +01:00
John BOTELLA
95981ca14c PR feedback 2019-03-05 15:26:19 +01:00
John BOTELLA
7cadaca8fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-04 11:37:16 +01:00
John BOTELLA
c420cab500 fix travis errors 2019-03-04 11:11:15 +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
03237d1730 NEW Look and feel v10 - Add CSS tabBarNoTop 2019-03-02 18:20:13 +01:00
Laurent Destailleur
5f6ca1119a Replace arrow picto with fontawesome 2019-03-02 14:07:13 +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
Laurent Destailleur
429da47d68 Fix default language of reminders 2019-02-28 13:11:14 +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
Frédéric FRANCE
894123fb06
PSR2.Methods.FunctionCallSignature.SpaceBeforeOpenBracket 2019-02-24 20:06:55 +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
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
Alexandre SPANGARO
b99149b940 Move error on function dol_include_once() to LOG_WARNING 2019-02-12 16:34:52 +01:00
Laurent Destailleur
e054b080a5
Merge branch 'develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-12 13:33:39 +01:00
ATM-Nicolas
4e35ebe52a FIX : Default sign out icon if not using Font Awesome 5 2019-02-12 10:43:00 +01:00
Laurent Destailleur
27cad29e1e Fix regression of right alignement 2019-02-11 15:06:52 +01:00
Laurent Destailleur
0bd30b160a Fix picto logout with fontawesome 5 2019-02-11 11:55:48 +01:00
Frédéric FRANCE
152d8ffcbf
Merge remote-tracking branch 'upstream/develop' into GenericFunctionsFunctionCallArgumentSpacing 2019-02-10 11:08:59 +01:00
Frédéric FRANCE
1e43f8e54a
PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
522afd8e7b Fix font awesome 5 2019-02-09 13:11:02 +01:00
Laurent Destailleur
38d4284638 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/db/pgsql.class.php
	htdocs/core/modules/facture/doc/pdf_crabe.modules.php
	htdocs/filefunc.inc.php
	htdocs/imports/import.php
	htdocs/supplier_proposal/card.php
2019-02-08 11:26:08 +01:00
Regis Houssin
8860eab6b1 FIX wrong merged conflict 2019-02-05 07:40:50 +01:00
Frédéric FRANCE
e1e14ae6e6
wip 2019-02-03 22:58:56 +01:00
Frédéric FRANCE
970392adb8
Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Laurent Destailleur
9fdba921b4 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/lib/functions.lib.php
2019-01-30 16:48:33 +01:00
Laurent Destailleur
81ae4c52c5
Merge pull request #10446 from mapiolca/8.0
Fix #10317 et #10318
2019-01-30 16:43:14 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Pierre Ardoin
b6df02e795
Correction oubli date de livraison
Corrige l'oubli de la substitution de la date de livraison pour les commandes et demande de prix fournisseurs
2019-01-29 11:47:39 +01:00
Laurent Destailleur
08a181bfbf Fix substitution of REF_CLIENT and REF_SUPPLIER 2019-01-29 11:00:17 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
ff39491f15
wip 2019-01-27 23:31:37 +01:00
Frédéric FRANCE
b10558bacd
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
4f9f0fd7b5
Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1
Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc
PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Pierre Ardoin
6fdbded588
Update functions.lib.php 2019-01-26 14:40:00 +01:00
Pierre Ardoin
78f8607d41
Add date_livraison substitution
Complete the substitution for supplier orders.
2019-01-25 13:15:24 +01:00
Laurent Destailleur
e860d664d7 Fix substitution of __REF_CLIENT__ 2019-01-23 11:54:20 +01:00
Laurent Destailleur
8104b7fa2d look and feel v10 2019-01-22 15:40:51 +01:00
Laurent Destailleur
42743027d4
Merge branch 'develop' into objectline_etc 2019-01-21 18:04:48 +01:00
torvista
9b1cf648dc more validation fixes 2019-01-21 16:19:31 +01:00
torvista
07b2bb6715 Swap of align/valign/border/width for css
Removal of type="text/javascript"
2019-01-20 23:36:39 +01:00
Laurent Destailleur
3ddfcbe3bb Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	.travis.yml
	dev/setup/codesniffer/ruleset.xml
2019-01-20 20:36:45 +01:00
Laurent Destailleur
4ffd7de9f7 doc 2019-01-19 16:15:05 +01:00
Laurent Destailleur
f311deb405 Fix hash for gol_getprefix must not contains special char. 2019-01-19 16:14:45 +01:00
Laurent Destailleur
a72d92006b Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-16 13:57:33 +01:00
Laurent Destailleur
638be67f96 Fix tooltip 2019-01-16 13:56:13 +01:00
Laurent Destailleur
1f87b8bb18 FIX Position of price symbol (before) for nl_NL 2019-01-16 01:54:08 +01:00
Laurent Destailleur
126e02798a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/cashdesk.lang
	htdocs/langs/fr_FR/cashdesk.lang
2019-01-07 19:49:15 +01:00
Laurent Destailleur
1306918eb0 FIX #10299 2019-01-07 16:03:55 +01:00
ldestailleur
5638ac8f4d FIX title on picto no more visible
Conflicts:
	htdocs/core/lib/functions.lib.php
2019-01-04 15:25:14 +01:00
ldestailleur
b4fc4b0178 FIX title on picto no more visible 2019-01-04 15:22:59 +01:00
ldestailleur
ab9fe1a757 Add option to use fontawesome 5 with fontawesome 4 2019-01-03 21:14:59 +01:00
Laurent Destailleur
422e18ee8e
Merge pull request #10268 from hregis/develop_upgrade
FIX remove old unused and deprecated function "getStaticMember"
2019-01-02 19:37:49 +01:00
Laurent Destailleur
294107bba0 FIX vars for substitution must be null if not applicable (and not '') 2018-12-27 05:07:11 +01:00
Laurent Destailleur
6a708666b2 FIX vars for substitution must be null if not applicable (and not '') 2018-12-27 05:06:37 +01:00
Regis Houssin
4ee09c9d5b FIX remove old unused and deprecated function 2018-12-25 07:58:32 +01:00
Laurent Destailleur
35debd06fb List of events show user firstname by default 2018-12-23 01:28:36 +01:00
Laurent Destailleur
623afd1020 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/website.lang
2018-12-17 18:50:06 +01:00
Laurent Destailleur
17b2fd295f FIX Css of amount on remain to pay on expense report 2018-12-17 13:57:30 +01:00
Laurent Destailleur
527ad04ae8 FIX Mandatory field feature should works on textarea
Conflicts:
	htdocs/core/lib/functions.lib.php
2018-12-15 18:13:30 +01:00
Laurent Destailleur
6188156c52 FIX Mandatory field feature should works on textarea 2018-12-15 18:11:40 +01:00