Laurent Destailleur
|
222556b464
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/accounting-files.php
htdocs/core/lib/functions.lib.php
|
2020-03-19 22:09:17 +01:00 |
|
Laurent Destailleur
|
7eb4522636
|
FIX missing token and save of survey description
|
2020-03-19 11:59:57 +01:00 |
|
Alexandre SPANGARO
|
bac099dc60
|
Merge remote-tracking branch 'upstream/develop' into 12.0_a23
|
2020-03-19 11:48:21 +01:00 |
|
Laurent Destailleur
|
8c34a091b4
|
Fix import
|
2020-03-18 19:24:11 +01:00 |
|
Laurent Destailleur
|
30b48a9ee3
|
Fix update
|
2020-03-18 19:21:32 +01:00 |
|
Laurent Destailleur
|
87edf27bbf
|
Merge branch 'develop' into dev_NEW_setup_SeparateurCSV
|
2020-03-18 19:12:52 +01:00 |
|
Laurent Destailleur
|
b9f404b5fa
|
Fix form inside table
|
2020-03-18 19:07:15 +01:00 |
|
florian HENRY
|
9bfc60064b
|
ass credential
|
2020-03-18 15:12:02 +01:00 |
|
florian HENRY
|
15614abc3f
|
NEW: add csv separator setup in module admin
|
2020-03-18 15:08:58 +01:00 |
|
Alexandre SPANGARO
|
033f796398
|
Work on split module fournisseur
|
2020-03-17 14:51:48 +01:00 |
|
UT from dolibit
|
8e712c6d0e
|
Update https for country websites
Update https for country websites
|
2020-03-16 13:13:11 +01:00 |
|
Laurent Destailleur
|
33c5db9cc3
|
Prepare code for the new pagination possibility
|
2020-03-13 13:07:11 +01:00 |
|
Scrutinizer Auto-Fixer
|
f413ce6aac
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-03-12 11:45:44 +00:00 |
|
Laurent Destailleur
|
148e2e58e5
|
Fix MAIN_SHOW_LOGO
|
2020-03-07 17:37:08 +01:00 |
|
Laurent Destailleur
|
119784fb3d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-03-07 17:34:01 +01:00 |
|
Jean Traullé
|
a6e3980acb
|
Update ihm.php
|
2020-03-06 17:35:03 +01:00 |
|
Jean Traullé
|
ddf87e6d80
|
Fix param lost
Reported on https://www.dolibarr.fr/forum/t/v11-petites-regressions/32228
|
2020-03-06 16:13:09 +01:00 |
|
Laurent Destailleur
|
7d0d0aa75a
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
|
2020-03-04 01:56:50 +01:00 |
|
Laurent Destailleur
|
6f3197bbea
|
Merge pull request #13258 from atm-ph/fix_11.0_dict_sql_error_sortorder
Fix sql syntax error
|
2020-03-03 22:54:11 +01:00 |
|
Laurent Destailleur
|
d5546df57b
|
Responsive
|
2020-03-03 22:50:37 +01:00 |
|
Laurent Destailleur
|
fd64f0fadb
|
Fix responsive
|
2020-03-03 22:46:29 +01:00 |
|
Laurent Destailleur
|
88d2e13f02
|
Fix reponsive
|
2020-03-03 22:15:55 +01:00 |
|
atm-ph
|
e916ff40ff
|
Fix sql syntax error
|
2020-03-03 11:55:05 +01:00 |
|
Laurent Destailleur
|
a3e56994b6
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
.travis.yml
htdocs/admin/company.php
htdocs/compta/tva/document.php
htdocs/core/lib/files.lib.php
htdocs/main.inc.php
|
2020-02-27 18:35:32 +01:00 |
|
Laurent Destailleur
|
b326d1fe49
|
Add link to wiki doc
|
2020-02-27 18:26:38 +01:00 |
|
Laurent Destailleur
|
f039008282
|
Fix reponsive
|
2020-02-27 16:33:24 +01:00 |
|
Laurent Destailleur
|
957295ee2d
|
Fix look and feel v11
|
2020-02-27 01:12:53 +01:00 |
|
Laurent Destailleur
|
3d436eb645
|
Merge pull request #13208 from oscim/patch-25
Update emailcollector_card.php
|
2020-02-26 16:22:28 +01:00 |
|
Laurent Destailleur
|
aba29207a3
|
Fix param lost
|
2020-02-26 16:10:12 +01:00 |
|
Laurent Destailleur
|
4370bf8fdc
|
FIX Use GETPOST instead of POST
Conflicts:
htdocs/admin/ihm.php
|
2020-02-26 15:44:54 +01:00 |
|
Laurent Destailleur
|
8ceafa2624
|
FIX Use GETPOST instead of POST
|
2020-02-26 15:21:52 +01:00 |
|
stickler-ci
|
0e91b9e5ec
|
Fixing style errors.
|
2020-02-26 07:20:08 +00:00 |
|
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 |
|