Commit Graph

6079 Commits

Author SHA1 Message Date
oscim
2522d1e31b
Update emailcollector_card.php
support hook for add action
2020-02-26 08:15:49 +01:00
Laurent Destailleur
2c6e7f2917 Tooltip for example on IP restrictions 2020-02-25 13:40:19 +01:00
Laurent Destailleur
32d74adf20 NEW Truncate columns names when too long and show full title as popup 2020-02-24 21:18:49 +01:00
stickler-ci
028566616d Fixing style errors. 2020-02-19 11:07:42 +00:00
John Botella
6acf10c0d4 extend retained warranty to be available for all invoices 2020-02-19 11:54:55 +01:00
Scrutinizer Auto-Fixer
fd48877dc6 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-02-18 22:47:25 +00:00
Laurent Destailleur
b618581692 More ajax button in setup. Can reload after on ajaxonoff. 2020-02-18 09:38:34 +01:00
Laurent Destailleur
4b5cda5cd2 Code comment on OAUth ahtent 2020-02-16 21:16:00 +01:00
Laurent Destailleur
f4f3efec62 Fight against $_POST 2020-02-16 19:33:58 +01:00
Laurent Destailleur
52aebce789 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-16 18:16:05 +01:00
Laurent Destailleur
5b87b12e64 FIX Vulnerability reported by code16 2020-02-16 18:06:25 +01:00
Laurent Destailleur
35ada37d4d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/comm/propal/list.php
	htdocs/filefunc.inc.php
2020-02-14 19:14:26 +01:00
Laurent Destailleur
4f1c8e7f53 FIX #10203 2020-02-13 12:18:26 +01:00
Laurent Destailleur
74d3912763 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/fourn/class/fournisseur.facture.class.php
2020-02-11 16:52:58 +01:00
Laurent Destailleur
8518e0752f NEW Can edit option PDF_USE_ALSO_LANGUAGE_CODE from PDF setup page 2020-02-11 16:01:32 +01:00
Laurent Destailleur
94d6fa06dc FIX #13022 2020-02-09 18:34:53 +01:00
Laurent Destailleur
df7cdd1da8 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/export_files.php
	htdocs/comm/mailing/class/advtargetemailing.class.php
	htdocs/core/tpl/advtarget.tpl.php
2020-02-08 15:42:35 +01:00
ksar
e951743077 Update export_files.php
Remove Warning
2020-02-08 15:04:27 +01:00
ksar
b5da9763ce Update export_files.php
Remove Warning
2020-02-06 12:15:18 +01:00
ksar
16fdab6089 Update export_files.php
REmove the Warning
2020-02-06 12:12:20 +01:00
Laurent Destailleur
5aa4f9b5ae Fix phpcs 2020-02-05 21:58:53 +01:00
Laurent Destailleur
8ab96447c7 Page of permissions is cleaner now 2020-02-05 21:31:28 +01:00
Laurent Destailleur
bd90cdf492 FIX #13023 2020-02-05 13:03:43 +01:00
Laurent Destailleur
ffa847bc8e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-02-02 19:32:37 +01:00
Laurent Destailleur
075b1ea744 FIX Log of authentication ko or ko + CVE-2020-7996 2020-02-02 19:05:38 +01:00
Laurent Destailleur
967d97ccd7 FIX CVE-2020-7994 2020-02-02 15:01:57 +01:00
Laurent Destailleur
bd322dc12e Fix search on country 2020-02-02 12:59:11 +01:00
Scrutinizer Auto-Fixer
5fda829023 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-30 00:48:28 +00:00
Laurent Destailleur
7b10c2440b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-29 23:08:42 +01:00
Laurent Destailleur
a9d917a3f0 Fix phpcs 2020-01-29 22:40:10 +01:00
Laurent Destailleur
1e879126cd Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/exports/class/export.class.php
2020-01-29 19:28:06 +01:00
Laurent Destailleur
633ba666aa Add info of email reference syntax to help debug. 2020-01-29 19:26:04 +01:00
Laurent Destailleur
2ccfdce178 var not defined 2020-01-29 14:41:06 +01:00
Laurent Destailleur
65e8113373 Look and feel v11 2020-01-29 14:23:44 +01:00
Laurent Destailleur
7c34d97e2d Fix messages for SPF 2020-01-29 13:10:16 +01:00
ptibogxiv
ab0d60065d
Update delais.php 2020-01-28 21:27:45 +01:00
Laurent Destailleur
80707d6a5e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-28 17:24:26 +01:00
Laurent Destailleur
3a9e238dc6 FIX Missing value of $formconfirm as parameters of hook 2020-01-28 12:00:27 +01:00
Laurent Destailleur
40636adb56 Enhance #12865
No need of option. A new parameter on url is enough.
2020-01-28 03:34:56 +01:00
Laurent Destailleur
c2c80bf40f Fix Look and feel v11 2020-01-28 02:44:41 +01:00
Laurent Destailleur
0f2141269a Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/supplier_proposal/class/supplier_proposal.class.php
2020-01-25 14:43:57 +01:00
Laurent Destailleur
de6b30be8c Look and feel v11 2020-01-25 13:06:10 +01:00
Laurent Destailleur
27a0858050 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/product/stock/class/mouvementstock.class.php
2020-01-23 17:41:31 +01:00
Laurent Destailleur
553107258e Fix alignement 2020-01-22 17:00:54 +01:00
Laurent Destailleur
b6e7b228ee Removed useless vars in setup 2020-01-22 01:24:04 +01:00
Laurent Destailleur
a9790f355d Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-21 11:32:40 +01:00
Laurent Destailleur
54a0d97891 Fix responsive 2020-01-21 10:48:15 +01:00
Laurent Destailleur
d2cf4c55ee Fix label of status 2020-01-20 23:58:01 +01:00
Laurent Destailleur
5b86851cf3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:46:52 +01:00
Laurent Destailleur
5cac54b2e1 Doc 2020-01-20 18:46:13 +01:00
Laurent Destailleur
92856788a3 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-20 18:39:46 +01:00
Laurent Destailleur
cfc74db5bc FIX field 'private' on email templates was not managed. 2020-01-20 18:38:53 +01:00
Laurent Destailleur
65fef47bdb Enable new pdf templates as stable 2020-01-20 01:05:30 +01:00
Laurent Destailleur
526ae83e8f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:16 +01:00
Laurent Destailleur
e679e05f57 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-19 19:49:04 +01:00
Laurent Destailleur
e803e06c0d Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
	htdocs/admin/tools/listevents.php
	htdocs/commande/class/commande.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/expensereport/card.php
	htdocs/exports/export.php
2020-01-19 19:01:46 +01:00
Laurent Destailleur
041d5aeb46 FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:55:22 +01:00
Laurent Destailleur
6a958dd45b FIX XSS vulnerability in description of list of audit events. 2020-01-19 18:51:37 +01:00
Scrutinizer Auto-Fixer
8744f6ab7b Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-18 15:17:07 +00:00
Laurent Destailleur
c578752714 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-17 11:52:49 +01:00
Laurent Destailleur
26e450fb2a Fix extension of backup file 2020-01-17 11:52:21 +01:00
Laurent Destailleur
48c077af56 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-17 11:39:46 +01:00
Laurent Destailleur
2099e05f22 Fix translation 2020-01-17 11:39:22 +01:00
Laurent Destailleur
9c1e409feb Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-17 11:35:16 +01:00
Laurent Destailleur
906110dc1d Fix backup. Recommended compression is gzip. 2020-01-17 11:34:31 +01:00
Scrutinizer Auto-Fixer
0aa156db78 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2020-01-16 01:54:00 +00:00
Laurent Destailleur
ace43a4227 Fix message 2020-01-16 01:40:14 +01:00
Laurent Destailleur
8f73bce878 Add warning if zip lib missing 2020-01-16 01:11:39 +01:00
Laurent Destailleur
2e70739fe0 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 21:50:32 +01:00
Laurent Destailleur
1de62b1f44 Doc 2020-01-15 21:50:11 +01:00
Laurent Destailleur
d708fcac5e Fix deploy module 2020-01-15 21:49:17 +01:00
Laurent Destailleur
2c40e4be94 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-15 20:13:45 +01:00
Laurent Destailleur
ed0e4b53d4 Fix error in mysqldump 2020-01-15 16:11:31 +01:00
Laurent Destailleur
6e367b6406 Fix detection 2020-01-15 12:56:36 +01:00
Tobias Sekan
503671a307
Fix lint error 2020-01-15 10:21:36 +01:00
Tobias Sekan
c47da64476
A few fixes 2020-01-15 10:13:55 +01:00
Tobias Sekan
a893b42202
Show extra short php function overview 2020-01-15 10:02:18 +01:00
Laurent Destailleur
ffd12cd44e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-13 13:44:44 +01:00
Laurent Destailleur
03a1897089 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/stocks.lang
2020-01-13 13:44:32 +01:00
Laurent Destailleur
ed2c75a2f8
Merge pull request #12776 from aspangaro/12.0_a4
NEW Add social networks of the company
2020-01-13 13:38:16 +01:00
Laurent Destailleur
5740d17450 Better help 2020-01-13 12:10:20 +01:00
Laurent Destailleur
58e5eeabdd Fix to be able to use zip signature 2020-01-11 11:15:50 +01:00
Laurent Destailleur
97f62c68f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2020-01-08 13:38:03 +01:00
Laurent Destailleur
ecdd43f770 Fix: If signature is zipped, we must unzip it first 2020-01-07 16:22:58 +01:00
Laurent Destailleur
9e6fb7b2f1 Look and feel v11 2020-01-07 14:55:31 +01:00
Laurent Destailleur
afd32135f2 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/takepos/invoice.php
2020-01-01 22:37:13 +01:00
Laurent Destailleur
d3d7592072 FIX Warning for some country must appears if company is in this country. 2020-01-01 22:26:47 +01:00
Alexandre SPANGARO
9879a43cf4 NEW Add social networks of the company 2019-12-30 21:17:41 +01:00
Laurent Destailleur
ece8390277 Add tables to store translation of all objects (like llx_product_lang) 2019-12-26 13:23:18 +01:00
Laurent Destailleur
ea4c236311 fix alignment 2019-12-26 13:05:03 +01:00
VESSILLER
e03222b831 FIX var transkey not defined in input hidden 2019-12-23 14:38:01 +01:00
Laurent Destailleur
07c1a5717e Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/facture_situation.php
	htdocs/core/class/html.formother.class.php
2019-12-23 14:16:34 +01:00
Laurent Destailleur
d59357d88d Fix help 2019-12-22 21:34:52 +01:00
Laurent Destailleur
693551069b Fix look and feel v11 2019-12-22 21:32:35 +01:00
Laurent Destailleur
30b8affdb7 Fix look and feel v11 2019-12-22 21:32:19 +01:00
Laurent Destailleur
05a7e62bf4 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-12-22 12:56:25 +01:00
Laurent Destailleur
e2451bcd26 Update images
Fix value of delay for warning on project not closed
2019-12-21 17:11:21 +01:00
Laurent Destailleur
ad039ff968 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/install/repair.php
2019-12-21 14:03:45 +01:00
Laurent Destailleur
583aa3c619 CSS 2019-12-20 11:50:13 +01:00
Laurent Destailleur
92da6c7549 Fix hash for ping 2019-12-20 11:41:18 +01:00
Laurent Destailleur
2ae779a13e Fix can set zero as value for max number of decimal 2019-12-19 11:08:42 +01:00
Laurent Destailleur
dd0a1b3e10
Merge branch 'develop' into develop_project 2019-12-19 10:56:03 +01:00
Laurent Destailleur
f44b85f557 Fix $_SESSION['newtoken'] must be newToken() 2019-12-18 23:12:31 +01:00
Scrutinizer Auto-Fixer
455178ff73 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-18 14:20:36 +00:00
Laurent Destailleur
4a734e53a6 Fix column too low.
Fix automatic event not found if from a module with several objects
2019-12-17 14:47:58 +01:00
Laurent Destailleur
6e2e02fd40 Look and feel v11 2019-12-16 21:06:32 +01:00
Scrutinizer Auto-Fixer
c8baaa2995 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-12-16 12:06:25 +00:00
Laurent Destailleur
28bcb49957 Fix css 2019-12-16 11:32:27 +01:00
Laurent Destailleur
d979f6f0f4 Debug module ticket. Add error if sender email is not defined. 2019-12-15 20:02:56 +01:00
Laurent Destailleur
838633d0de Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/system/filecheck.php
	htdocs/api/class/api_setup.class.php
	htdocs/compta/facture/card.php
	htdocs/compta/stats/index.php
	htdocs/core/actions_massactions.inc.php
	htdocs/install/upgrade2.php
	htdocs/loan/card.php
	htdocs/loan/document.php
	htdocs/loan/info.php
	htdocs/loan/note.php
	htdocs/loan/schedule.php
	htdocs/product/list.php
	htdocs/ticket/card.php
	htdocs/user/class/user.class.php
2019-12-14 14:53:49 +01:00
Laurent Destailleur
17b9964678 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	build/generate_filelist_xml.php
	htdocs/core/class/utils.class.php
	htdocs/core/lib/files.lib.php
2019-12-14 14:43:14 +01:00
Laurent Destailleur
a8de7b850a Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0
Conflicts:
	htdocs/admin/system/filecheck.php
2019-12-14 14:33:46 +01:00
Laurent Destailleur
835d22f556
Merge branch 'develop' into doxygen_todo 2019-12-14 13:46:40 +01:00
Laurent Destailleur
9f2a628c3b Remove bak file 2019-12-14 13:25:21 +01:00
Frédéric FRANCE
50937f8ca1
Update filecheck.php 2019-12-13 12:56:48 +01:00
Frédéric FRANCE
6e64a20f9e
Update filecheck.php 2019-12-13 11:16:46 +01:00
Frédéric FRANCE
a923a48e64
Update filecheck.php 2019-12-13 10:44:12 +01:00
Laurent Destailleur
95141550fa NEW Support of deployement of metapackages 2019-12-12 15:40:06 +01:00
Laurent Destailleur
ce47de453e Fix HTML5 2019-12-12 10:31:08 +01:00
Frédéric FRANCE
66805a502a
doxygen 2019-12-11 22:53:57 +01:00
Frédéric FRANCE
c98ab917dd
doxygen 2019-12-11 20:33:58 +01:00
Frédéric FRANCE
307bad1d2a
doxygen todo 2019-12-11 19:11:13 +01:00
Laurent Destailleur
ae6d536d1d Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/admin/tools/dolibarr_export.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
2019-12-09 13:32:56 +01:00
Laurent Destailleur
94bab15528 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into 10.0
Conflicts:
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/pdf.lib.php
2019-12-09 13:27:30 +01:00
Laurent Destailleur
652e99600a Look and feel v11 2019-12-09 09:43:38 +01:00
Florian Mortgat
4846885eea NEW 9.0: enable user to use the mysqldump '--quick' option
(useful if the server has low RAM or large tables)
2019-12-02 16:54:05 +01:00
Laurent Destailleur
92070fa491 Fix name of variable $trigger_name into $triggersendname 2019-12-02 09:38:16 +01:00
Laurent Destailleur
f5f8459930 Look and feel v11 2019-11-28 12:50:38 +01:00
Scrutinizer Auto-Fixer
5f99e25c45 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-28 11:36:20 +00:00
Laurent Destailleur
1e84b0ea97
Merge pull request #12522 from Dolibarr/scrutinizer-patch-15
Scrutinizer Auto-Fixes
2019-11-28 12:19:43 +01:00
Laurent Destailleur
c22fea52e5 Fix do not ping name of server 2019-11-27 11:38:30 +01:00
Scrutinizer Auto-Fixer
057ab6a059 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-26 11:52:04 +00:00
Laurent Destailleur
334265ee6e
Merge pull request #12510 from frederic34/patch-8
fk_user fk_usergroup are int
2019-11-26 09:21:27 +01:00
Laurent Destailleur
1f8361ea9e Tooltip 2019-11-25 21:02:26 +01:00
Frédéric FRANCE
d280eef1e0
Update expensereport_rules.php 2019-11-25 20:12:51 +01:00
Laurent Destailleur
712ae48e4e Fix default setup 2019-11-24 18:07:38 +01:00
Laurent Destailleur
24bb345ee1 Fix bad name of function 2019-11-22 15:35:19 +01:00
Laurent Destailleur
1ed2eacbef Debug add email profile 2019-11-22 12:40:17 +01:00
Laurent Destailleur
6191307865 Debug v11 2019-11-22 12:22:27 +01:00
Laurent Destailleur
2f2ac90fbf Try to disable autocomplete 2019-11-21 21:35:16 +01:00
Laurent Destailleur
c9b79c8aa1 Fix norsh 2019-11-21 20:07:22 +01:00
Laurent Destailleur
ab7c5a7575 Fix connectstring imap 2019-11-21 19:12:25 +01:00
Laurent Destailleur
6ef01a09f3 Fix error management 2019-11-21 18:51:26 +01:00
Laurent Destailleur
f9045aa412 Fix var not defined 2019-11-21 18:39:41 +01:00
Scrutinizer Auto-Fixer
cd7523318d Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-19 08:30:26 +00:00
Laurent Destailleur
ae0fdf014f Debug email collector. Missing unique key. Fix initial setup. 2019-11-18 11:55:22 +01:00
Scrutinizer Auto-Fixer
ddcc14dc16 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-14 11:09:15 +00:00
Laurent Destailleur
411e9c87e3 Debug feature to set sender profiles 2019-11-14 11:53:28 +01:00
Laurent Destailleur
52787b56b2 Fix when limit = 0
Look and feel v11
2019-11-14 11:00:49 +01:00
Laurent Destailleur
171b94fc5c
Merge pull request #12429 from Dolibarr/scrutinizer-patch-5
Scrutinizer Auto-Fixes
2019-11-14 08:50:24 +01:00
Laurent Destailleur
86094613e8
Merge pull request #12428 from Dolibarr/scrutinizer-patch-4
Scrutinizer Auto-Fixes
2019-11-14 08:50:06 +01:00
Scrutinizer Auto-Fixer
b40ecc3933 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:37:08 +00:00
Scrutinizer Auto-Fixer
ac40dd8bbe Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:39 +00:00
Scrutinizer Auto-Fixer
8a527631a0 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-13 18:35:02 +00:00
Laurent Destailleur
f65ce1d5d0 Fix var not declared 2019-11-12 10:17:46 +01:00
Scrutinizer Auto-Fixer
c85e54b08c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-12 08:46:08 +00:00
Scrutinizer Auto-Fixer
812d0af1d9 Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-08 14:51:54 +00:00
Scrutinizer Auto-Fixer
0b406172fd Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2019-11-07 11:59:59 +00:00
Laurent Destailleur
2aac4b382f
Merge pull request #12372 from OPEN-DSI/fix-admin-dict-transkey-not-defined
FIX var transkey not defined in input hidden
2019-11-07 12:56:21 +01:00
Laurent Destailleur
f29a176423
Merge pull request #12357 from frederic34/patch-19
can't edit socialnetwork dict
2019-11-07 11:41:57 +01:00
VESSILLER
146fa461c1 FIX var transkey not defined in input hidden 2019-11-07 11:36:17 +01:00
Frédéric FRANCE
6bd90b7e0a
can't edit socialnetwork dict 2019-11-06 07:29:43 +01:00
Frédéric FRANCE
35751a80ab
100% centpercent 2019-11-05 21:24:41 +01:00
Laurent Destailleur
94bd0f71d9 Fix pb with permission 2019-11-05 19:41:30 +01:00
Laurent Destailleur
204475efb9 Removed deprecated file 2019-11-05 19:10:29 +01:00
Laurent Destailleur
ce1dec253f FIX #11364 2019-11-05 12:47:38 +01:00
Laurent Destailleur
2f05d79352
Merge pull request #12333 from frederic34/patch-14
missing newtoken
2019-11-05 10:06:06 +01:00
Laurent Destailleur
c84a17f58a
Merge pull request #12332 from frederic34/patch-13
missing newtoken
2019-11-05 10:05:31 +01:00
Frédéric FRANCE
c6c7d1f5e1
missing newtoken 2019-11-04 23:08:00 +01:00
Frédéric FRANCE
5d2386228b
missing newtoken 2019-11-04 23:04:30 +01:00
Frédéric FRANCE
77b05553d4
Update agenda_reminder.php 2019-11-04 23:02:43 +01:00
Frédéric FRANCE
96556dfd04
missing newtoken 2019-11-04 23:01:28 +01:00
Laurent Destailleur
1aef1c60dd
Merge pull request #11867 from frederic34/socialnetworks
NEW add socialnetworks dictionary
2019-11-04 21:10:22 +01:00
Frédéric FRANCE
6ad983bb7b
Merge remote-tracking branch 'upstream/develop' into escpos 2019-11-04 18:52:29 +01:00
Laurent Destailleur
11500fb8d9 FIX confusion between permto... and permisstionto... 2019-11-04 15:33:49 +01:00
Laurent Destailleur
1f6a86e166 Fix look and feel v11 2019-11-04 13:32:34 +01:00
Laurent Destailleur
e2bae297ea Look and feel v11 2019-11-04 13:27:01 +01:00
Laurent Destailleur
8aa2fd04ad NEW The integrity checker now show the expected size of files 2019-11-04 13:23:48 +01:00
Frédéric FRANCE
872f58f261
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-11-03 21:48:24 +01:00
Frédéric FRANCE
5a3347104f
rework an experimental module 2019-11-03 12:57:06 +01:00
Frédéric FRANCE
d797ea590e
rework an experimental module 2019-11-03 00:50:58 +01:00
Frédéric FRANCE
59b30b9cec
wip ticket printer 2019-11-02 21:15:48 +01:00
Laurent Destailleur
6f82c212a0 Finished migration to the new architecture of extrafields 2019-11-02 17:38:19 +01:00
Laurent Destailleur
02ebbf17e9
Merge pull request #12250 from oscim/patch-8
Update modulehelp.php
2019-11-02 13:42:11 +01:00
Laurent Destailleur
e087ac434d
Merge pull request #12283 from frederic34/socid
replace deprecated user->societe_id by user->socid
2019-11-02 13:34:21 +01:00
Laurent Destailleur
58ffb73627 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-11-02 12:59:49 +01:00
Laurent Destailleur
45c77b4560 Renaming some libelle into label 2019-11-02 12:59:38 +01:00
Laurent Destailleur
25e64b0610
Merge branch 'develop' into socid 2019-11-02 12:01:06 +01:00
Laurent Destailleur
5785cd101a
Merge pull request #12293 from frederic34/patch-18
Update translation.php
2019-11-02 11:41:55 +01:00
Frédéric FRANCE
e191dd7cc0 $key is overwriting a variable from outer foreach loop 2019-11-02 11:39:32 +01:00
Frédéric FRANCE
dbed10a701
Merge remote-tracking branch 'upstream/develop' into socid 2019-11-01 21:39:20 +01:00
Frédéric FRANCE
e98619745f
Update translation.php 2019-11-01 16:27:30 +01:00
Frédéric FRANCE
12b6e4fae6
Update translation.php
Are you sure the usage of print_barre_liste($title... '', 0, '', '', $limit) is correct as it seems to always return null.
2019-11-01 16:25:22 +01:00
Frédéric FRANCE
ec05e8e2c5
$key is overwriting a variable from outer foreach loop 2019-11-01 16:13:40 +01:00
Laurent Destailleur
135e65c4aa Look and feel v11
Enhance the progress bar of tasks
2019-11-01 15:53:57 +01:00
Laurent Destailleur
b8803fa8df Work on MO 2019-10-31 22:56:08 +01:00
Laurent Destailleur
716c2bb531 Work on MO 2019-10-31 22:46:34 +01:00
Laurent Destailleur
f98df3c807 NEW Can edit link to the translation page in website module 2019-10-31 21:09:33 +01:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Laurent Destailleur
645390c990 Work on BOM templates 2019-10-31 02:36:16 +01:00
Frédéric FRANCE
f7747ed00a
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-30 20:06:43 +01:00
Laurent Destailleur
4ea69abd89
Merge pull request #12249 from oscim/patch-7
Update modulehelp.php
2019-10-30 02:44:32 +01:00
stickler-ci
9cfa20480f Fixing style errors. 2019-10-29 10:18:10 +00:00
oscim
490ab95dfa
Update modulehelp.php
add function modulehelp_prepare_head
2019-10-29 11:12:27 +01:00
oscim
253e1530c1
Update modulehelp.php
how not loaded module hidden. If module is hidden, it is not link to display in modulehelp.
except in a specific context defined by the developer. In this case, this ligen blocks the information display capability of the module.
2019-10-29 10:45:57 +01:00
stickler-ci
f0f61ff0fe Fixing style errors. 2019-10-29 09:41:47 +00:00
oscim
eb73459899
Update modulehelp.php
if module is not loaded, or not found, the $objMod display is last $objMod loaded but not this id for display
2019-10-29 10:39:15 +01:00
Frédéric FRANCE
a43e6f96b5
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-25 08:12:54 +02:00
Laurent Destailleur
18aa03defe Remove not used dangerous code 2019-10-23 15:14:20 +02:00
Laurent Destailleur
1c6df393a7 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/accountancy/supplier/index.php
2019-10-22 02:41:10 +02:00
Laurent Destailleur
6205913056 FIX CVE-2019-17578 CVE-2019-17577 CVE-2019-17576 2019-10-22 02:35:54 +02:00
Laurent Destailleur
b21bca17de Add button Save and stay when editing property of web site 2019-10-21 00:55:52 +02:00
Frédéric FRANCE
9ec7836387
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-20 16:37:18 +02:00
Laurent Destailleur
e550acc688 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-20 13:22:38 +02:00
Laurent Destailleur
bf1b2242ea Fix no focus if we are on edit mode directly 2019-10-20 13:22:29 +02:00
Frédéric FRANCE
360bf55f5b
clean indent 2019-10-20 01:09:11 +02:00
Frédéric FRANCE
f4540dddb8
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-17 20:24:04 +02:00
Laurent Destailleur
de396dc9b3 Clean code for order of modules 2019-10-17 19:21:30 +02:00
Frédéric FRANCE
e75f7d448c
Squiz.WhiteSpace.ControlStructureSpacing.SpacingAfterOpen 2019-10-16 20:00:01 +02:00
Laurent Destailleur
12f1962085 Better error message when module file is corrupted 2019-10-16 00:40:42 +02:00
Frédéric FRANCE
2351750d2b
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-14 19:02:46 +02:00
Laurent Destailleur
ef09da8794 Fix CSRF check 2019-10-14 11:45:13 +02:00
Frédéric FRANCE
367ef4acaf
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-11 16:44:25 +02:00
Laurent Destailleur
7ce01c5ceb Look and feel v11 2019-10-11 14:42:55 +02:00
Laurent Destailleur
60395f2a9c NEW Look and feel v11: Some setup pages are by default on edit mode 2019-10-11 14:09:26 +02:00
Laurent Destailleur
96dad08db7 Fix option ADD_UNSPLASH_LOGIN_BACKGROUND 2019-10-11 13:51:07 +02:00
Laurent Destailleur
89161910ff NEW Look and feel v11: Some setup pages are by default on edit mode 2019-10-11 13:45:51 +02:00
Laurent Destailleur
9251f04d63 Update thumbs of themes 2019-10-11 13:26:48 +02:00
Laurent Destailleur
ab8199f71a Fix avoid deletion of file if we still need it 2019-10-11 11:38:49 +02:00
Laurent Destailleur
de107fb02e NEW Can set a squarred icon on your company setup 2019-10-11 11:27:05 +02:00
Frédéric FRANCE
03bbfc6ad9
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-10 23:24:50 +02:00
Laurent Destailleur
aebae5ff83 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/en_US/margins.lang
	htdocs/user/class/user.class.php
2019-10-10 10:37:17 +02:00
Laurent Destailleur
346e9f3e1b Fix import of web site
Fix sort on constant setup page lost
2019-10-09 15:01:19 +02:00
Frédéric FRANCE
02b706f9c0
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-09 13:40:46 +02:00
Laurent Destailleur
a26281dab3
Merge pull request #12066 from fuhraih/feature1
NEW #4301
2019-10-09 11:52:45 +02:00
Frédéric FRANCE
f253315c8d
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 18:30:58 +02:00
Laurent Destailleur
6bfcecf207 Fight against colspan 2019-10-08 16:49:10 +02:00
Laurent Destailleur
f55a4d77e4 css 2019-10-08 16:41:03 +02:00
fuhraih
8aee2fa534
Update dict.php 2019-10-08 15:48:18 +02:00
Laurent Destailleur
43a70e5548 Clean code to use the new $extrafields->attributes array 2019-10-08 09:28:50 +02:00
Frédéric FRANCE
b78187c1eb
Merge remote-tracking branch 'upstream/develop' into socialnetworks 2019-10-08 00:07:27 +02:00
Laurent Destailleur
156eb7fa61
Merge branch '10.0' into hotfix/12041-security-generate-password 2019-10-07 20:22:19 +02:00
Laurent De Coninck
2ba8506608 validate the 0 as min value consecutive; meaning not take that rule into account 2019-10-07 17:53:23 +02:00
Laurent Destailleur
035da6a711
Merge pull request #11951 from aspangaro/11.0_accountancy_portal
NEW Accountancy - Add an option to hide FAQ on index and add specific widget in this area
2019-10-07 14:24:22 +02:00
Laurent Destailleur
21ab307cd6
Merge pull request #12020 from frederic34/patch-13
Update dav admin
2019-10-07 14:21:30 +02:00
Laurent Destailleur
1a32a3b7f1
Update dav.php 2019-10-07 14:21:22 +02:00
Laurent Destailleur
c2a7ae23bc
Merge pull request #12034 from aspangaro/11_faicon
Fix Fa-icon
2019-10-07 13:03:27 +02:00
Laurent Destailleur
71e922635b Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-10-07 12:57:52 +02:00
Laurent Destailleur
68a4ab87a2 Fix can set min repeat to 0 for password 2019-10-07 12:57:24 +02:00
Laurent Destailleur
022c67ee68
Merge pull request #12045 from laudeco/hotfix/12041-security-generate-password
[fix #12041] - Generate password mode perso
2019-10-07 12:54:45 +02:00