Laurent Destailleur
|
a4c0459c1e
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/user/list.php
|
2021-01-27 21:09:01 +01:00 |
|
Laurent Destailleur
|
26c22e1b28
|
Fix warning
|
2021-01-26 13:22:20 +01:00 |
|
Laurent Destailleur
|
d7bf173f0d
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/core/lib/functions.lib.php
test/phpunit/SecurityTest.php
|
2021-01-26 12:12:35 +01:00 |
|
Laurent Destailleur
|
8db80ff44d
|
Fix reponsive
|
2021-01-26 11:19:13 +01:00 |
|
Laurent Destailleur
|
0f5fc7353e
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/accountancy/admin/index.php
htdocs/admin/mailing.php
htdocs/admin/paymentbybanktransfer.php
htdocs/admin/prelevement.php
htdocs/modulebuilder/template/admin/setup.php
|
2021-01-24 15:29:53 +01:00 |
|
Laurent Destailleur
|
452aea1d8b
|
Fix bad test
|
2021-01-23 17:59:56 +01:00 |
|
Laurent Destailleur
|
dd69aed27b
|
Fix error test
|
2021-01-23 17:49:08 +01:00 |
|
Laurent Destailleur
|
6d0cbd3ee5
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-23 17:32:49 +01:00 |
|
Laurent Destailleur
|
f2c4e25827
|
Clean code
|
2021-01-23 17:32:14 +01:00 |
|
Laurent Destailleur
|
e1b6f33894
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/card.php
htdocs/contact/class/contact.class.php
htdocs/langs/fr_FR/stocks.lang
htdocs/modulebuilder/template/myobject_list.php
|
2021-01-22 13:40:00 +01:00 |
|
Laurent Destailleur
|
c3ad443200
|
Fix var not defined
|
2021-01-21 13:52:23 +01:00 |
|
Frédéric FRANCE
|
3c2bf5d9e9
|
fix trans
Conflicts:
htdocs/core/class/commonobject.class.php
|
2021-01-16 17:18:58 +01:00 |
|
Laurent Destailleur
|
cdcc6b7324
|
Merge pull request #15974 from frederic34/davadmin
fix trans
|
2021-01-16 17:13:37 +01:00 |
|
Laurent Destailleur
|
329499c103
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-16 16:43:00 +01:00 |
|
Laurent Destailleur
|
992645c13d
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-01-16 16:35:13 +01:00 |
|
Laurent Destailleur
|
871691bf69
|
Fix missing popup
|
2021-01-16 16:34:49 +01:00 |
|
Laurent Destailleur
|
828f1c8314
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
|
2021-01-15 14:04:22 +01:00 |
|
Laurent Destailleur
|
c3046326cb
|
Fix help
|
2021-01-15 12:42:40 +01:00 |
|
Frédéric FRANCE
|
cb7266d261
|
fix trans
|
2021-01-13 16:18:23 +01:00 |
|
Laurent Destailleur
|
c2187b2ff1
|
Merge branch 'develop' into develop_new_workstation
|
2021-01-11 17:59:13 +01:00 |
|
Laurent Destailleur
|
cae9dc3acf
|
Merge pull request #15925 from FHenry/dev_add_tag_contact_thirdpartycontactcreateion
NEW : Add contact tag and bulk email status on thirparty+contact create form
|
2021-01-11 17:28:12 +01:00 |
|
Laurent Destailleur
|
307d718e82
|
Merge pull request #15931 from ATM-Nicolas/new_shipping_workflow
NEW : Workflow to set a shipment as closed
|
2021-01-11 16:34:26 +01:00 |
|
Laurent Destailleur
|
de9835ae47
|
Merge pull request #15936 from bb2a/warhouse_in_propal
NEW Can ask the warehouse in proposal
|
2021-01-11 16:23:15 +01:00 |
|
Laurent Destailleur
|
9a5ae77615
|
Merge pull request #15926 from FHenry/develop
fix : remove php warning on install pages
|
2021-01-11 16:04:04 +01:00 |
|
Laurent Destailleur
|
5660159a6d
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/bom/bom_card.php
|
2021-01-11 13:13:26 +01:00 |
|
Laurent Destailleur
|
c10072ccef
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2021-01-11 13:07:31 +01:00 |
|
Laurent Destailleur
|
fe7be8362f
|
Fix td balance
|
2021-01-11 12:03:28 +01:00 |
|
Gauthier PC portable 024
|
8dfb088fc5
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_workstation
|
2021-01-11 10:34:38 +01:00 |
|
Anthony Berton
|
d3fa8b9f20
|
20210110
|
2021-01-10 01:07:27 +01:00 |
|
ATM-Nicolas
|
5a6e4f54f0
|
NEW : Workflow to set a shipment as closed
|
2021-01-08 16:25:54 +01:00 |
|
Florian HENRY
|
89f75bb766
|
fix missing parethesis
|
2021-01-07 17:59:38 +01:00 |
|
Florian HENRY
|
63755d1337
|
fix missing parethesis
|
2021-01-07 17:59:19 +01:00 |
|
Florian HENRY
|
71589881f6
|
fix missing double quote
|
2021-01-07 17:58:41 +01:00 |
|
Florian HENRY
|
8adfe54949
|
bulk email management
|
2021-01-07 17:33:57 +01:00 |
|
Laurent Destailleur
|
b553dbb9d2
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-06 20:23:07 +01:00 |
|
Laurent Destailleur
|
3d96c5a454
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/admin/dict.php
htdocs/bom/tpl/objectline_create.tpl.php
htdocs/bom/tpl/objectline_edit.tpl.php
htdocs/bom/tpl/objectline_view.tpl.php
htdocs/core/boxes/box_shipments.php
htdocs/societe/class/societe.class.php
|
2021-01-06 20:20:37 +01:00 |
|
jpb
|
19ee163f31
|
Fix add ticket on elementList
|
2021-01-06 13:54:51 +01:00 |
|
stickler-ci
|
4691b5e4df
|
Fixing style errors.
|
2021-01-06 10:41:49 +00:00 |
|
Regis Houssin
|
fadfe4a4bf
|
FIX syntax error
|
2021-01-06 11:39:12 +01:00 |
|
Regis Houssin
|
f80a476bc5
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
|
2021-01-06 11:37:56 +01:00 |
|
Laurent Destailleur
|
ba68c958e1
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-05 19:12:57 +01:00 |
|
Laurent Destailleur
|
9764f086d3
|
Fix Field code is mandatory but not field note in tax dictionary
|
2021-01-05 14:31:14 +01:00 |
|
Regis Houssin
|
889d73d8e3
|
FIX avoid php8 warning
|
2021-01-05 10:16:24 +01:00 |
|
Regis Houssin
|
f845adf343
|
FIX use GETPOST before
|
2021-01-05 09:57:35 +01:00 |
|
Regis Houssin
|
d0d9427666
|
FIX regression
|
2021-01-02 17:23:25 +01:00 |
|
Regis Houssin
|
3b7f5a92cb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
|
2021-01-02 17:20:24 +01:00 |
|
Laurent Destailleur
|
1ab459e854
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-02 16:19:08 +01:00 |
|
Laurent Destailleur
|
f71c581140
|
Merge pull request #15856 from aspangaro/13b5
FIX: Accountancy - Debug experimental function to validate movements & typo
|
2021-01-02 15:53:28 +01:00 |
|
Laurent Destailleur
|
f16be78167
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/admin/limits.php
htdocs/takepos/invoice.php
|
2021-01-02 15:49:30 +01:00 |
|
Laurent Destailleur
|
a8d15fafd2
|
Fix missing span
|
2021-01-02 14:17:54 +01:00 |
|
Regis Houssin
|
e36ae4ac90
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
|
2021-01-02 13:14:30 +01:00 |
|
Laurent Destailleur
|
5cf43a0aab
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-01 22:05:56 +01:00 |
|
Laurent Destailleur
|
f328bdc3f9
|
Fix var name
|
2021-01-01 22:05:12 +01:00 |
|
Laurent Destailleur
|
a8cd62c44e
|
Add AUDIT_ENABLE_PREFIX_SESSION
|
2021-01-01 22:00:00 +01:00 |
|
Laurent Destailleur
|
71e4a672f5
|
Merge branch 'develop' into develop_patch-1
|
2021-01-01 20:52:43 +01:00 |
|
stickler-ci
|
327ec211c4
|
Fixing style errors.
|
2020-12-31 09:49:27 +00:00 |
|
Alexandre SPANGARO
|
46160614b8
|
Typo
|
2020-12-31 03:30:18 +01:00 |
|
Laurent Destailleur
|
4768bfe2a5
|
Merge pull request #15844 from frederic34/adminexpensereport
remove deprecated
|
2020-12-30 23:58:05 +01:00 |
|
Laurent Destailleur
|
020caf8809
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-30 23:52:36 +01:00 |
|
Frédéric FRANCE
|
f5641f8068
|
remove deprecated
|
2020-12-30 22:15:34 +01:00 |
|
Frédéric FRANCE
|
786e251961
|
remove deprecated
|
2020-12-30 22:13:43 +01:00 |
|
Laurent Destailleur
|
e4915d9825
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
|
2020-12-30 22:02:06 +01:00 |
|
Laurent Destailleur
|
40d19e6c36
|
Fix tooltip on timezone
|
2020-12-30 22:01:26 +01:00 |
|
Frédéric FRANCE
|
02d92d3538
|
remove deprecated
|
2020-12-30 21:53:17 +01:00 |
|
Regis Houssin
|
c647c78ee0
|
FIX restore GETPOSTISSET
|
2020-12-30 14:02:53 +01:00 |
|
Regis Houssin
|
07dc29166e
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
|
2020-12-30 13:56:50 +01:00 |
|
Laurent Destailleur
|
8149478c77
|
Merge pull request #15308 from aspangaro/14a2
NEW: Dictionary for availability - Add column position
|
2020-12-30 13:12:27 +01:00 |
|
Regis Houssin
|
7c5248d105
|
FIX and the world turn again
|
2020-12-30 11:27:03 +01:00 |
|
Regis Houssin
|
aec01a95fc
|
FIX again and again
|
2020-12-29 17:48:52 +01:00 |
|
Regis Houssin
|
acabb045fb
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into fix_php_8.0
|
2020-12-29 17:12:18 +01:00 |
|
Regis Houssin
|
325c2b03f8
|
FIX step by step
|
2020-12-29 17:02:35 +01:00 |
|
Laurent Destailleur
|
cefd66c18f
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-29 16:56:39 +01:00 |
|
Regis Houssin
|
20cd9cbbc7
|
FIX avoid warning php 8.0
|
2020-12-29 16:25:29 +01:00 |
|
Alexandre SPANGARO
|
9f0434eb69
|
Merge remote-tracking branch 'upstream/develop' into 14a2
|
2020-12-29 04:50:32 +01:00 |
|
Laurent Destailleur
|
d9a2e2e402
|
Responsive
|
2020-12-29 02:06:42 +01:00 |
|
Laurent Destailleur
|
4b3cd947f2
|
Fix name of function
|
2020-12-28 12:33:00 +01:00 |
|
Laurent Destailleur
|
a6eb14f68b
|
Merge pull request #15585 from cfoellmann/fckeditor-notes
NEW Can toggle FCKeditor on public/private notes
|
2020-12-27 15:06:35 +01:00 |
|
Laurent Destailleur
|
f98f9504f0
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2020-12-24 13:07:39 +01:00 |
|
Laurent Destailleur
|
58cd7c97a5
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/comm/mailing/card.php
htdocs/comm/mailing/cibles.php
htdocs/comm/mailing/class/mailing.class.php
|
2020-12-24 13:05:17 +01:00 |
|
Laurent Destailleur
|
739695c442
|
Fix delay to wait between email for emailing refused float.
|
2020-12-24 12:49:17 +01:00 |
|
Laurent Destailleur
|
740105ae08
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/emailcollector_card.php
|
2020-12-23 11:59:14 +01:00 |
|
Laurent Destailleur
|
4fcf606d04
|
Error management on emailcollector edition
|
2020-12-22 17:22:24 +01:00 |
|
Laurent Destailleur
|
083b6a8c87
|
Fix emailcollector edition
|
2020-12-22 17:03:57 +01:00 |
|
Laurent Destailleur
|
6fad9c2d3b
|
Fix edition of operation into email collector
|
2020-12-22 16:59:59 +01:00 |
|
Laurent Destailleur
|
193d231d4c
|
Fix edition of operation into email collector
|
2020-12-22 16:29:21 +01:00 |
|
Laurent Destailleur
|
15c0773de7
|
Merge pull request #15791 from frederic34/patch-8
Remove no more needed file
|
2020-12-21 18:21:51 +01:00 |
|
Gauthier PC portable 024
|
5116337e0b
|
FIX : stickler feedbacks
|
2020-12-21 13:29:44 +01:00 |
|
Gauthier PC portable 024
|
7b739920a2
|
NEW : Workstations management
|
2020-12-21 12:28:45 +01:00 |
|
Laurent Destailleur
|
67de45b8d7
|
Fix responsive
|
2020-12-21 01:40:15 +01:00 |
|
Laurent Destailleur
|
d3bd709ad6
|
Fix phpcs
|
2020-12-20 18:51:17 +01:00 |
|
Frédéric FRANCE
|
92f38f664a
|
Remove no more needed file
|
2020-12-20 10:44:55 +01:00 |
|
Laurent Destailleur
|
0c6ccb64e0
|
Fix links
|
2020-12-19 21:48:29 +01:00 |
|
Laurent Destailleur
|
fcfd657240
|
Fix links
|
2020-12-19 21:41:15 +01:00 |
|
Laurent Destailleur
|
70d1cc79e0
|
Fix link
|
2020-12-19 21:30:56 +01:00 |
|
Laurent Destailleur
|
b41b528f33
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/sms.php
|
2020-12-19 15:28:58 +01:00 |
|
ptibogxiv
|
22b2247442
|
Update sms.php
|
2020-12-19 13:41:49 +01:00 |
|
Laurent Destailleur
|
0eaf924d3b
|
Add warning on non https website to axplain why features is broken
|
2020-12-18 15:08:00 +01:00 |
|
Laurent Destailleur
|
90d8299c92
|
Fix purge tool
|
2020-12-18 13:24:02 +01:00 |
|
Laurent Destailleur
|
3b8947dadd
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.form.class.php
htdocs/product/price.php
|
2020-12-17 21:50:05 +01:00 |
|
Laurent Destailleur
|
f79dec80e6
|
Fix phpcs
|
2020-12-17 16:45:56 +01:00 |
|
Laurent Destailleur
|
b04cc22350
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/admin/prelevement.php
|
2020-12-17 14:10:45 +01:00 |
|
Laurent Destailleur
|
f0d787debb
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-12-17 14:07:24 +01:00 |
|
Laurent Destailleur
|
27542ed8ed
|
Update prelevement.php
|
2020-12-17 13:53:09 +01:00 |
|
Laurent Destailleur
|
36d6b472ce
|
Update prelevement.php
|
2020-12-17 13:52:03 +01:00 |
|
Haldarys
|
10ac74162e
|
Fix PRELEVEMENT_ADDDAYS check
If we used a positive value in PRELEVEMENT_ADDDAYS it couldn't submit the changes to database
|
2020-12-17 10:19:21 +01:00 |
|
Laurent Destailleur
|
9c759e91f0
|
Fix debug management of docs in ticket module
|
2020-12-16 19:01:26 +01:00 |
|
Laurent Destailleur
|
21c2fae00c
|
Fix setup of antivirus
|
2020-12-16 17:41:18 +01:00 |
|
Laurent Destailleur
|
66e4de628c
|
Fix permissions
|
2020-12-14 20:38:22 +01:00 |
|
Laurent Destailleur
|
43bb5554d7
|
Clean deprecated page
|
2020-12-14 12:19:24 +01:00 |
|
Laurent Destailleur
|
acb73966f7
|
Clean code. Removed phpexcel library.
|
2020-12-13 16:27:44 +01:00 |
|
Frédéric FRANCE
|
8aaa1905a0
|
create url from socialid
|
2020-12-12 21:03:27 +01:00 |
|
Frédéric FRANCE
|
758763f489
|
Merge remote-tracking branch 'upstream/develop' into mycompanysocialnetworks
|
2020-12-12 19:25:15 +01:00 |
|
Frédéric FRANCE
|
6a4990d5bd
|
clean
|
2020-12-12 19:21:40 +01:00 |
|
Laurent Destailleur
|
75570cc984
|
Merge pull request #15743 from frederic34/mycompanysocialnetworks
Mycompany social networks separate tab
|
2020-12-12 19:21:29 +01:00 |
|
Laurent Destailleur
|
a5d2e04dea
|
Debug v13
|
2020-12-12 19:09:07 +01:00 |
|
Laurent Destailleur
|
d19cdae980
|
Merge pull request #15727 from frederic34/patch-8
add option hide topmenu in Config/Display
|
2020-12-12 18:48:11 +01:00 |
|
Frédéric FRANCE
|
818af46b86
|
clean
|
2020-12-12 18:37:09 +01:00 |
|
Frédéric FRANCE
|
b8a01b4d2d
|
my company social networks in a separate tab
|
2020-12-12 18:31:26 +01:00 |
|
Frédéric FRANCE
|
621f246d58
|
my company social networks in a separate tab
|
2020-12-12 18:26:54 +01:00 |
|
Frédéric FRANCE
|
0b3a5dc796
|
fix style
|
2020-12-11 18:09:37 +01:00 |
|
Frédéric FRANCE
|
e9288ce0da
|
fix translation
|
2020-12-11 17:58:43 +01:00 |
|
Frédéric FRANCE
|
8882759e7a
|
hide topmenu option in config/display
|
2020-12-11 17:55:08 +01:00 |
|
Laurent Destailleur
|
1f6f434a9c
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/tools/export_files.php
test/phpunit/SecurityTest.php
|
2020-12-11 15:56:19 +01:00 |
|
Laurent Destailleur
|
4fcd3fe493
|
Fix disallow -- string into filename for security purpose. Vulnerability
reported by Yılmaz Değirmenci
|
2020-12-11 15:12:42 +01:00 |
|
Laurent Destailleur
|
2adbd29b49
|
Debug generation of doc from modulebuilder
|
2020-12-11 14:22:36 +01:00 |
|
Laurent Destailleur
|
c2124479c7
|
Fix missing test on IMAP
|
2020-12-10 16:05:43 +01:00 |
|
Laurent Destailleur
|
c850f4c918
|
Fix fatal error
|
2020-12-10 16:01:06 +01:00 |
|
Laurent Destailleur
|
abe8d25a9a
|
Merge pull request #15711 from hregis/fix_regenerate_mycompany_thumbs
FIX regenerate mycompany logos thumbs if not exists
|
2020-12-09 22:06:19 +01:00 |
|
Laurent Destailleur
|
075cacb8cf
|
Show setup of option SHOW_SUBPRODUCT_REF_IN_PDF
|
2020-12-09 17:40:28 +01:00 |
|
Regis Houssin
|
c18e8ac317
|
FIX regenerate mycompany logos thumbs if not exists
|
2020-12-09 09:28:46 +01:00 |
|
Laurent Destailleur
|
6e479af5b6
|
Merge pull request #15661 from frederic34/adminsms
fix trans removing html
|
2020-12-07 22:45:14 +01:00 |
|
Laurent Destailleur
|
ff1e6ec371
|
Merge pull request #15665 from frederic34/admin_boxes
fix style
|
2020-12-07 22:40:51 +01:00 |
|
Laurent Destailleur
|
d9ba821411
|
Merge pull request #15669 from frederic34/template
typo ortho
|
2020-12-07 22:35:45 +01:00 |
|
Laurent Destailleur
|
3fb63e6a4b
|
Look and feel v13
|
2020-12-07 15:51:22 +01:00 |
|
Frédéric FRANCE
|
d1204e5e9b
|
typo ortho
|
2020-12-05 15:35:52 +01:00 |
|
Laurent Destailleur
|
991cfde0a2
|
Fix css
|
2020-12-05 14:46:29 +01:00 |
|
Frédéric FRANCE
|
8996dd9803
|
fix style
|
2020-12-05 10:28:40 +01:00 |
|
Frédéric FRANCE
|
cccc670c05
|
fix trans removing html
|
2020-12-05 08:45:58 +01:00 |
|
Laurent Destailleur
|
bb0c33a49e
|
Merge pull request #15654 from frederic34/commonkanban
keep common if wanted
|
2020-12-04 22:25:51 +01:00 |
|
Frédéric FRANCE
|
4039ca269f
|
fix translation removing html
|
2020-12-04 21:08:51 +01:00 |
|
stickler-ci
|
d89970ddd1
|
Fixing style errors.
|
2020-12-04 19:31:53 +00:00 |
|
Frédéric FRANCE
|
c8407b2f91
|
keep common if wanted
|
2020-12-04 20:28:05 +01:00 |
|
Laurent Destailleur
|
e7306625f0
|
Fix look and feel v13
|
2020-12-04 15:28:12 +01:00 |
|
Laurent Destailleur
|
56d56929ec
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/dolibarr.php
|
2020-12-03 16:39:22 +01:00 |
|
Laurent Destailleur
|
ac29db92cb
|
FIX #15618
|
2020-12-03 16:35:42 +01:00 |
|
Laurent Destailleur
|
1ec3d4cfdf
|
CSS
|
2020-12-03 13:19:35 +01:00 |
|
Laurent Destailleur
|
bfe4eb7309
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/emailcollector_card.php
htdocs/core/modules/modProduct.class.php
|
2020-12-03 11:26:53 +01:00 |
|
Laurent Destailleur
|
b324425db8
|
code comment
|
2020-12-03 11:19:41 +01:00 |
|
Laurent Destailleur
|
0fd865d8af
|
FIX Better error message with IMAP when connection fails
|
2020-12-03 11:16:02 +01:00 |
|
Laurent Destailleur
|
748630eb25
|
FIX Better error message when IMAP connection fails
|
2020-12-03 11:15:06 +01:00 |
|
Laurent Destailleur
|
cf2dd28a21
|
Fix warning when setup not complete.
|
2020-11-30 19:40:53 +01:00 |
|
Christian Foellmann
|
f801dd7d66
|
PR toggle FCKeditor on public/private notes
|
2020-11-30 16:39:14 +01:00 |
|
Laurent Destailleur
|
00ad6df395
|
Fight against $_POST
|
2020-11-30 14:47:07 +01:00 |
|
Laurent Destailleur
|
7634212811
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/admin/system/phpinfo.php
htdocs/commande/stats/index.php
htdocs/compta/facture/stats/index.php
|
2020-11-29 21:35:03 +01:00 |
|
Laurent Destailleur
|
150dd71774
|
Look and feel v13
|
2020-11-29 16:02:39 +01:00 |
|
Laurent Destailleur
|
6c65ebef0d
|
Look and feel v13
|
2020-11-29 15:16:53 +01:00 |
|
Laurent Destailleur
|
df17c2f26a
|
Removed dead code generating warning.
CSS
|
2020-11-28 16:48:32 +01:00 |
|
Laurent Destailleur
|
41984f9934
|
Clean code
|
2020-11-28 14:00:35 +01:00 |
|
Laurent Destailleur
|
7e6af6a54f
|
FIX translation not loaded for error message of numbering modules
|
2020-11-28 02:09:27 +01:00 |
|
Frédéric FRANCE
|
12dce9cd75
|
avoid large screen for code
|
2020-11-26 23:53:10 +01:00 |
|
Frédéric FRANCE
|
f03930e55e
|
doxygen
|
2020-11-26 23:49:42 +01:00 |
|
Laurent Destailleur
|
4da4499569
|
FIX Param joinfiles not sanitized
Conflicts:
htdocs/admin/mails_templates.php
|
2020-11-26 23:07:52 +01:00 |
|
Laurent Destailleur
|
4114201da9
|
FIX Param joinfiles not sanitized
|
2020-11-26 23:05:49 +01:00 |
|
Laurent Destailleur
|
61c0c7f0a6
|
Fix GETPOST second param
|
2020-11-26 22:59:05 +01:00 |
|
Givriz
|
dca4cf5987
|
Feature : ajout de la class "button-cancel"
Ajout de la class "button-cancel" suite à l'issue #3756 et achèvement de ma tâche Dolibarr.
|
2020-11-23 15:12:52 +01:00 |
|
Laurent Destailleur
|
2f6f242d99
|
CSS
|
2020-11-23 12:29:38 +01:00 |
|
Laurent Destailleur
|
60bfbe2e57
|
Merge pull request #15448 from Givriz/dev
Feature : creation of a "button-save" class
|
2020-11-21 23:44:30 +01:00 |
|
Laurent Destailleur
|
f39ad2359a
|
Debug
|
2020-11-21 17:01:17 +01:00 |
|
Laurent Destailleur
|
bf94ce6aad
|
Fix warnings
|
2020-11-21 16:49:54 +01:00 |
|
Laurent Destailleur
|
95b79094df
|
Fix warning.
Module cron is more clear.
|
2020-11-21 16:27:50 +01:00 |
|
Laurent Destailleur
|
3534555909
|
Fix setup of scheduled jobs
|
2020-11-21 14:14:53 +01:00 |
|
Givriz
|
c48129e279
|
Ajout de la class "button-save"
Ajout de cette class sur les boutons pour pour cloturer une issue ouverte (feature)
|
2020-11-19 20:23:38 +01:00 |
|
Frédéric FRANCE
|
f92b5e87dc
|
doxygen
|
2020-11-13 14:35:04 +01:00 |
|
Laurent Destailleur
|
a98d025f5a
|
Clean option for replenishment on real stock.
|
2020-11-13 11:06:51 +01:00 |
|
Laurent Destailleur
|
56bc788d16
|
Merge pull request #15375 from frederic34/patch-6
doxygen
|
2020-11-13 09:33:36 +01:00 |
|
Laurent Destailleur
|
350d694181
|
Fix security page
|
2020-11-12 19:15:44 +01:00 |
|
Frédéric FRANCE
|
64c48a246a
|
The method PrestaShopWebservice::... is not static, but was called statically
|
2020-11-12 18:53:26 +01:00 |
|
Frédéric FRANCE
|
caa82a1e2f
|
Update PSWebServiceLibrary.class.php
|
2020-11-12 18:43:52 +01:00 |
|
Frédéric FRANCE
|
9c7d698cc7
|
Create index.html
|
2020-11-12 18:40:34 +01:00 |
|
Frédéric FRANCE
|
9e59a9aa8c
|
Create index.html
|
2020-11-12 18:39:50 +01:00 |
|
Laurent Destailleur
|
754a9778ea
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/list.php
htdocs/core/modules/facture/doc/pdf_crabe.modules.php
htdocs/core/modules/modUser.class.php
|
2020-11-12 14:17:10 +01:00 |
|
Laurent Destailleur
|
0764cb2abd
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2020-11-12 14:13:19 +01:00 |
|
Laurent Destailleur
|
a168c3fbb1
|
Remove warnings
|
2020-11-12 12:33:29 +01:00 |
|
Frédéric FRANCE
|
ad05451427
|
Fix missing getpost for scandir odt path
|
2020-11-12 11:23:03 +01:00 |
|
Laurent Destailleur
|
a804ad4914
|
css
|
2020-11-11 16:15:06 +01:00 |
|
Laurent Destailleur
|
741806f47e
|
Clean code
|
2020-11-11 16:08:00 +01:00 |
|
Laurent Destailleur
|
ad04646c05
|
Fix must use json_encode/decode instead of dol_json_encode/decode
|
2020-11-11 15:56:19 +01:00 |
|
Laurent Destailleur
|
e221e19212
|
Update doc
|
2020-11-11 13:20:17 +01:00 |
|
Alexandre SPANGARO
|
82d1f99010
|
Merge remote-tracking branch 'upstream/develop' into 14a2
|
2020-11-10 04:09:00 +01:00 |
|
jcp
|
50d530733e
|
NEW: ICS fields moved into bank account table
|
2020-11-09 14:08:34 +01:00 |
|
Laurent Destailleur
|
da6c6c9e0a
|
Clean code
|
2020-11-08 14:39:20 +01:00 |
|
Alexandre SPANGARO
|
61bca50fa6
|
NEW: Dictionary for availability - Add column position
|
2020-11-05 16:56:28 +01:00 |
|
Laurent Destailleur
|
779566ef30
|
Clean page with security summary
|
2020-11-05 10:03:53 +01:00 |
|
Laurent Destailleur
|
60f55c81bf
|
Fix error if module xml not loaded
|
2020-11-04 17:45:10 +01:00 |
|
Laurent Destailleur
|
38d88ced0b
|
Debug the security page
|
2020-11-04 16:07:59 +01:00 |
|
Laurent Destailleur
|
0dce2c45d9
|
Trans
|
2020-11-02 10:15:33 +01:00 |
|
Frédéric FRANCE
|
fcddf03164
|
fix
|
2020-11-01 14:13:39 +01:00 |
|
Frédéric FRANCE
|
f0d6029d60
|
Merge remote-tracking branch 'upstream/develop' into emailsubscription
|
2020-11-01 14:02:18 +01:00 |
|
Frédéric FRANCE
|
cdc0b8a7d7
|
add models
|
2020-11-01 13:59:43 +01:00 |
|
Frédéric FRANCE
|
c2202e10eb
|
add missing pictos
|
2020-11-01 13:48:32 +01:00 |
|