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 |
|
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 |
|
Frédéric FRANCE
|
580e5c42d2
|
GenericFunctionsFunctionCallArgumentSpacing
|
2019-02-09 12:00:49 +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 |
|
Laurent Destailleur
|
471f11dace
|
Merge pull request #10502 from hregis/9.0_merge
FIX wrong merged conflict
|
2019-02-08 09:34:49 +01:00 |
|
Laurent Destailleur
|
af92303319
|
Merge pull request #10487 from frederic34/psr2squizwhite
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-08 09:30:25 +01:00 |
|
Laurent Destailleur
|
3bdf017d41
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-07 19:39:59 +01:00 |
|
Laurent Destailleur
|
8d82135033
|
Fix missing \n
|
2019-02-07 19:39:23 +01:00 |
|
Laurent Destailleur
|
491bfbdbfc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-02-07 19:39:04 +01:00 |
|
Laurent Destailleur
|
89af7b0e98
|
Add doctype to web site
|
2019-02-07 19:38:36 +01:00 |
|
Laurent Destailleur
|
789c089e14
|
Code comment
|
2019-02-05 13:08:28 +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 |
|
Laurent Destailleur
|
a6dde3d6bd
|
Merge branch 'develop' into nospaceaftercomma
|
2019-02-03 19:27:16 +01:00 |
|
Laurent Destailleur
|
9f7dfe2921
|
Merge pull request #10481 from frederic34/psr2forloop
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
|
2019-02-03 19:11:07 +01:00 |
|
Laurent Destailleur
|
49d695c9b2
|
Merge pull request #10479 from frederic34/patch-2
remove psr2 warning for else if usage
|
2019-02-03 19:06:38 +01:00 |
|
Frédéric FRANCE
|
273d68381c
|
psr2 end file new line none found
|
2019-02-03 15:21:21 +01:00 |
|
Frédéric FRANCE
|
80a12fcd1c
|
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
|
2019-02-03 14:29:45 +01:00 |
|
Frédéric FRANCE
|
03701fa091
|
psr2
|
2019-02-02 18:25:01 +01:00 |
|
Frédéric FRANCE
|
25abceb116
|
remove psr2 warning for else if usage
|
2019-02-02 08:59:37 +01:00 |
|
Frédéric FRANCE
|
96de1b175c
|
clean missing spaces in the last merge
|
2019-02-02 08:51:30 +01:00 |
|
Frédéric FRANCE
|
f5b2cf75f2
|
Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma
|
2019-02-01 18:31:44 +01:00 |
|
Laurent Destailleur
|
08050434a1
|
Merge pull request #10435 from wdammak/patch-22
Wrapping for stock movements
|
2019-02-01 16:11:37 +01:00 |
|
Laurent Destailleur
|
cf89fbd165
|
Merge pull request #10474 from ATM-Nicolas/new_contact_related_item_tab
New contact related item tab
|
2019-02-01 15:39:39 +01:00 |
|
Laurent Destailleur
|
eb3621839a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/members.lang
htdocs/langs/fr_FR/members.lang
|
2019-02-01 15:14:19 +01:00 |
|
ATM-Nicolas
|
2cbb58c2eb
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_contact_related_item_tab
|
2019-02-01 10:54:42 +01:00 |
|
ATM-Nicolas
|
f432a874e6
|
NEW : Contact related items tab
|
2019-02-01 10:51:28 +01:00 |
|
Laurent Destailleur
|
3e6aef472d
|
css
|
2019-01-31 20:53:59 +01:00 |
|
Laurent Destailleur
|
189323ad58
|
Fix when using image into description
|
2019-01-31 18:12:34 +01:00 |
|
Laurent Destailleur
|
e18bd6f986
|
Merge branch 'develop' into nospaceaftercomma
|
2019-01-30 18:27:35 +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
|
e72d6c50e6
|
Merge pull request #10428 from frederic34/toomanylines
PSR2.Files.EndFileNewline.TooMany
|
2019-01-30 16:17:09 +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 |
|
wdammak
|
388efb6773
|
Wrapping for stock movements
|
2019-01-28 04:36:26 +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
|
f30a3d59ba
|
Merge branch 'develop' into toomanylines
|
2019-01-27 17:59:13 +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
|
496fa9b0fb
|
PSR2.Files.EndFileNewline.TooMany
|
2019-01-27 14:10:35 +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 |
|
Laurent Destailleur
|
462c1f9c1a
|
Merge pull request #10413 from mapiolca/patch-8
Add date_livraison substitution
|
2019-01-26 15:38:00 +01:00 |
|
Pierre Ardoin
|
6fdbded588
|
Update functions.lib.php
|
2019-01-26 14:40:00 +01:00 |
|
Laurent Destailleur
|
fd192f10c4
|
Merge pull request #10341 from hregis/8.0_bug
FIX security broken with Multicompany
|
2019-01-26 14:28:13 +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
|
7493ba018a
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/install/mysql/migration/8.0.0-9.0.0.sql
|
2019-01-20 20:38:26 +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 |
|
Regis Houssin
|
d5b66eeffb
|
FIX $user is already in parameters
|
2019-01-19 18:12:48 +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 |
|
Philippe GRAND
|
29fdad144d
|
update with html5 compliant code
|
2019-01-19 12:40:17 +01:00 |
|
Laurent Destailleur
|
05cc5b6398
|
Show duration of jobs
|
2019-01-17 17:50:21 +01:00 |
|
gauthier
|
d997309bcb
|
FIX : if(!method_exists(dol_loginfunction))
|
2019-01-17 14:49:30 +01:00 |
|
Regis Houssin
|
c4b9bdd569
|
FIX remove var_dump
|
2019-01-16 19:15:02 +01:00 |
|
Regis Houssin
|
45a7e03562
|
FIX a user can always read its own card
|
2019-01-16 19:13:21 +01:00 |
|
Laurent Destailleur
|
3a8afafabd
|
Merge pull request #10027 from atm-quentin/NEW_manage_multicompany_for_invoice
New manage multicompany for invoice
|
2019-01-16 18:51:01 +01:00 |
|
Laurent Destailleur
|
e7943ae844
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-16 16:48:52 +01:00 |
|
Laurent Destailleur
|
d3828130ab
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
htdocs/adherents/class/adherent.class.php
|
2019-01-16 16:48:21 +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
|
c357cb8c4e
|
Clean code
|
2019-01-16 12:42:54 +01:00 |
|
atm-quentin
|
013c078c8b
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_manage_multicompany_for_invoice
|
2019-01-16 10:52:46 +01:00 |
|
Laurent Destailleur
|
1f87b8bb18
|
FIX Position of price symbol (before) for nl_NL
|
2019-01-16 01:54:08 +01:00 |
|
ptibogxiv
|
c96f349c21
|
update head with schedule
|
2019-01-15 14:55:15 +01:00 |
|
Regis Houssin
|
7c9d85d091
|
FIX problem with multicompany transverse mode
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
|
2019-01-15 12:18:04 +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 |
|
AXeL-dev
|
66e1df753e
|
run_sql function: support for numbers in database prefix
|
2019-01-07 09:33:24 +01:00 |
|
ldestailleur
|
451b3e30cc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
|
2019-01-04 19:36:20 +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 |
|
ldestailleur
|
7c1ed5b913
|
FIX #9972 #10297
|
2019-01-03 13:28:35 +01:00 |
|
ldestailleur
|
7cb3b8dfec
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-02 19:42:26 +01:00 |
|
ldestailleur
|
bc00fb177a
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-02 19:42:15 +01:00 |
|
ldestailleur
|
a9e8e13bb6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
ChangeLog
htdocs/user/param_ihm.php
|
2019-01-02 19:41:39 +01:00 |
|
ldestailleur
|
3d8479291d
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2019-01-02 19:39:35 +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 |
|
ldestailleur
|
8645a7f524
|
FIX Interface regression for bind people. Fix option
MAIN_OPTIMIZEFORTEXTBROWSER
|
2019-01-02 18:58:45 +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
|
2b3fbecd49
|
Fix when random_int is not available
|
2018-12-22 18:15:49 +01:00 |
|
Laurent Destailleur
|
b7b69b79dc
|
Fix phpdoc
|
2018-12-21 09:59:21 +01:00 |
|
Laurent Destailleur
|
8a70cf9ede
|
NEW Add parameter replaceambiguouschars on getRandomPassword function
|
2018-12-21 09:56:54 +01:00 |
|
Laurent Destailleur
|
eed4d9509b
|
Merge pull request #10243 from AXeL-dev/patch-3
fix executable files security check regex
|
2018-12-17 21:09:32 +01:00 |
|
Laurent Destailleur
|
3a4538f429
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-17 19:37:56 +01:00 |
|
Laurent Destailleur
|
c444ef3b4d
|
FIX wrapper could not download shared files
|
2018-12-17 19:37:17 +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
|
ffaff4dc7f
|
Debug website module
|
2018-12-17 17:29:04 +01:00 |
|
Laurent Destailleur
|
4e940ebaf1
|
FIX Download of files with hashp when files are into user dir
|
2018-12-17 15:35:20 +01:00 |
|
Laurent Destailleur
|
17b2fd295f
|
FIX Css of amount on remain to pay on expense report
|
2018-12-17 13:57:30 +01:00 |
|
AXeL-dev
|
7f014d76cc
|
fix executable files security check regex
|
2018-12-17 12:31:12 +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 |
|
Laurent Destailleur
|
319c571d76
|
Merge pull request #10125 from defrance/patch-131
NEW massfilesarea feature for plugin modules
|
2018-12-15 15:13:13 +01:00 |
|
Laurent Destailleur
|
f55db6dd84
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
dev/resources/dbmodel/dolibarr_schema.mwb
|
2018-12-15 14:09:16 +01:00 |
|
Laurent Destailleur
|
27f8096afa
|
Merge branch 'develop' into PR_NEW_reception
|
2018-12-15 12:50:31 +01:00 |
|
Laurent Destailleur
|
baf9b6f309
|
Fix regression (bad name of function)
|
2018-12-14 19:21:19 +01:00 |
|
Laurent Destailleur
|
4ffafae025
|
Merge pull request #10116 from defrance/patch-126
Introduce standard sql date format filter
|
2018-12-14 17:58:45 +01:00 |
|
Laurent Destailleur
|
77c01a1fae
|
Update date.lib.php
|
2018-12-14 17:58:33 +01:00 |
|
Laurent Destailleur
|
3571eaee3d
|
Merge branch 'develop' into NEW_change_order_concat_desc
|
2018-12-14 17:44:08 +01:00 |
|
Laurent Destailleur
|
88a52aa11d
|
Merge branch 'develop' into develop_mc
|
2018-12-14 15:58:52 +01:00 |
|
Laurent Destailleur
|
2011afe6fb
|
Merge branch 'develop' into actionrefused
|
2018-12-14 15:48:24 +01:00 |
|
Laurent Destailleur
|
fec64a78ab
|
Merge branch 'develop' into New_manage_loan_schedule
|
2018-12-14 10:54:09 +01:00 |
|
Laurent Destailleur
|
539e2c55cd
|
FIX #9629 #9625
|
2018-12-14 10:33:07 +01:00 |
|
Laurent Destailleur
|
c1ce902f91
|
FIX #9629 #9625
|
2018-12-14 10:31:09 +01:00 |
|
Laurent Destailleur
|
f97b561af0
|
Merge branch 'develop' into qual_rename_facnumber
|
2018-12-13 20:24:12 +01:00 |
|
Laurent Destailleur
|
1ee1b7a321
|
Merge pull request #10212 from atm-john/new_pdf_improve_desc_item_visibility
NEW Hidden conf to improve pdf desc item visibitity
|
2018-12-13 20:06:50 +01:00 |
|
Laurent Destailleur
|
434cf2e046
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-12-11 09:58:14 +01:00 |
|
Laurent Destailleur
|
3213b3be07
|
Standardize code: Move jabberid into social network module
|
2018-12-11 09:17:02 +01:00 |
|
Laurent Destailleur
|
cf74e5b9a8
|
Change order of tabs
|
2018-12-10 00:25:10 +01:00 |
|
ATM John BOTELLA
|
c6521dbfea
|
NEW improve pdf desc item visibitity
|
2018-12-08 17:56:03 +01:00 |
|
Laurent Destailleur
|
cd3716ff9f
|
Dolibarize module ticket
|
2018-12-08 16:37:41 +01:00 |
|
Laurent Destailleur
|
21b3bbc2e6
|
Merge
|
2018-12-08 11:55:27 +01:00 |
|
Laurent Destailleur
|
a915d82883
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
|
2018-12-08 11:42:30 +01:00 |
|
Laurent Destailleur
|
5ce26bae1b
|
Fix form of bank info for CH
|
2018-12-04 22:01:35 +01:00 |
|
Laurent Destailleur
|
6d093b03f6
|
Code comment
|
2018-12-04 18:07:02 +01:00 |
|
Laurent Destailleur
|
138640fc63
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
|
2018-12-04 14:58:11 +01:00 |
|
Laurent Destailleur
|
d80baaea69
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/comm/propal/class/propal.class.php
htdocs/commande/class/commande.class.php
htdocs/contrat/class/contrat.class.php
htdocs/expensereport/class/expensereport.class.php
htdocs/fourn/class/fournisseur.commande.class.php
htdocs/fourn/class/fournisseur.facture.class.php
|
2018-12-04 14:29:47 +01:00 |
|
Regis Houssin
|
8953a3ed73
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop_mc
Conflicts:
ChangeLog
|
2018-12-03 08:46:03 +01:00 |
|
Maxime Kohlhaas
|
2e496ea83a
|
QUAL rename facnumber by ref
|
2018-12-02 17:33:44 +01:00 |
|
Laurent Destailleur
|
ea119a26c7
|
Update ajax.lib.php
|
2018-12-02 17:03:11 +01:00 |
|
BENKE Charlene
|
044c54da94
|
Warning error if $conf->browser->layout is empty
|
2018-12-02 10:45:37 +01:00 |
|
Laurent Destailleur
|
a8009d4a72
|
Merge pull request #9972 from OPEN-DSI/contact-agenda-multiple-resources
FIX Work with new table actioncomm_resources and multiple contact affectation
|
2018-12-01 16:16:50 +01:00 |
|
Laurent Destailleur
|
9ac984af76
|
Update company.lib.php
|
2018-12-01 16:15:34 +01:00 |
|
Laurent Destailleur
|
f94f7e15ca
|
Update date.lib.php
|
2018-12-01 15:07:55 +01:00 |
|
BENKE Charlene
|
60d0a5efab
|
massfilesarea feature for plugin modules
|
2018-12-01 14:44:34 +01:00 |
|
BENKE Charlene
|
fca332995b
|
scrutinizer major error
|
2018-12-01 11:37:50 +01:00 |
|
BENKE Charlene
|
19e4698488
|
Update date.lib.php
|
2018-12-01 10:32:37 +01:00 |
|
BENKE Charlene
|
085101376c
|
Introduce standard sql date format filter
refactoring standard sql filter for date
|
2018-12-01 00:41:46 +01:00 |
|
Laurent Destailleur
|
bbfd134733
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-11-29 11:24:18 +01:00 |
|
Laurent Destailleur
|
950dfeef58
|
Merge pull request #10081 from oscim/patch-1
Update company.lib.php
|
2018-11-29 11:15:52 +01:00 |
|
Laurent Destailleur
|
f3ce49806d
|
Update company.lib.php
|
2018-11-29 11:15:27 +01:00 |
|
Laurent Destailleur
|
10fc0149d8
|
responsive
|
2018-11-29 11:03:02 +01:00 |
|
Laurent Destailleur
|
b9c08853be
|
CSS
|
2018-11-28 16:54:21 +01:00 |
|
Laurent Destailleur
|
01181ba3a4
|
Fix avoid warning
|
2018-11-28 13:06:39 +01:00 |
|