Laurent Destailleur
|
172cb02b4a
|
Merge pull request #16814 from frederic34/patch-22
fix php8 warning
|
2021-03-18 22:50:31 +01:00 |
|
Frédéric FRANCE
|
a400559342
|
fix php8 warning
|
2021-03-18 22:44:58 +01:00 |
|
Frédéric FRANCE
|
0d67f68174
|
Update card.php
|
2021-03-18 22:36:17 +01:00 |
|
Frédéric FRANCE
|
181436f279
|
fix php8 warning
|
2021-03-18 22:31:41 +01:00 |
|
Frédéric FRANCE
|
ba33bc8eac
|
fix php8 warning
|
2021-03-18 22:29:08 +01:00 |
|
Alexandre SPANGARO
|
6960f0dc25
|
Uniformize translation
|
2021-03-16 04:22:55 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Laurent Destailleur
|
5b74fefb60
|
Fix look and feel v13
|
2021-03-09 17:01:20 +01:00 |
|
stickler-ci
|
47dd477c61
|
Fixing style errors.
|
2021-03-04 09:36:17 +00:00 |
|
lmarcouiller
|
e94f703f5d
|
Fix #16523 : return to backward compatibility
|
2021-03-04 10:33:18 +01:00 |
|
lmarcouiller
|
500f192a05
|
Fix #16523 : New column Contact assigned
|
2021-03-04 10:15:41 +01:00 |
|
Laurent Destailleur
|
f5406d487b
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/compta/facture/card.php
htdocs/core/class/html.formmail.class.php
htdocs/core/lib/product.lib.php
htdocs/product/stock/productlot_card.php
test/phpunit/SecurityTest.php
|
2021-02-26 12:53:06 +01:00 |
|
Laurent Destailleur
|
1a521bcc99
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/contact/class/contact.class.php
|
2021-02-26 10:27:55 +01:00 |
|
Laurent Destailleur
|
5c0fba26e2
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
|
2021-02-26 10:25:55 +01:00 |
|
Laurent Destailleur
|
549136efeb
|
Removed useless log
|
2021-02-26 10:25:30 +01:00 |
|
Laurent Destailleur
|
99a17cadb7
|
Fix sql syntax
|
2021-02-26 10:25:08 +01:00 |
|
Laurent Destailleur
|
8e8efce7d1
|
Fix sql syntax
|
2021-02-26 10:23:53 +01:00 |
|
Florian Mortgat
|
d59ee06438
|
FIX 11.0 - $this->socid injected in query without checking for empty value
|
2021-02-25 14:51:57 +01:00 |
|
Frédéric FRANCE
|
3b6d01ffae
|
code syntax contact directory
|
2021-02-23 21:16:15 +01:00 |
|
Laurent Destailleur
|
f6080d45fa
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-02-22 16:21:26 +01:00 |
|
Laurent Destailleur
|
912f9f9bdb
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/contact/card.php
htdocs/core/actions_massactions.inc.php
|
2021-02-22 15:54:24 +01:00 |
|
Laurent Destailleur
|
c010cab47e
|
Fix translation of default value for contacts
|
2021-02-22 15:51:00 +01:00 |
|
Laurent Destailleur
|
60ae50abb3
|
Merge pull request #16270 from frederic34/patch-3
fix unknown variable
|
2021-02-11 23:00:36 +01:00 |
|
Frédéric FRANCE
|
ac40067e88
|
fix unknown variable
|
2021-02-11 22:11:16 +01:00 |
|
Frédéric FRANCE
|
bcac4386d6
|
doxygen
|
2021-02-11 21:26:21 +01:00 |
|
Laurent Destailleur
|
8a13ad2f26
|
Close #16075
|
2021-01-27 19:31:30 +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
|
7e8d06e8b8
|
Fix update default contact type
|
2021-01-22 14:10:08 +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
|
93ca27d808
|
FIX #16041
|
2021-01-22 13:17:27 +01:00 |
|
Laurent Destailleur
|
cf11f356e8
|
Fix load of data are not complete
|
2021-01-22 10:51:47 +01:00 |
|
Frédéric FRANCE
|
177b87da0d
|
Merge remote-tracking branch 'upstream/develop' into codesyntax
|
2021-01-16 17:58:01 +01:00 |
|
Frédéric FRANCE
|
f1685ba1b1
|
code syntax
|
2021-01-16 14:24:47 +01:00 |
|
Anthony Berton
|
df5e6a2519
|
picto
|
2021-01-14 08:56:38 +01:00 |
|
Florian HENRY
|
d856b0149d
|
Merge branch '13_backport' into develop
|
2021-01-12 10:08:12 +01:00 |
|
Florian HENRY
|
2be924d5d8
|
fix js bulkemail
|
2021-01-12 10:01:32 +01:00 |
|
Florian HENRY
|
8adfe54949
|
bulk email management
|
2021-01-07 17:33:57 +01:00 |
|
Florian HENRY
|
5c53a963e2
|
bulk email management
|
2021-01-07 17:23:02 +01:00 |
|
kamel
|
c2489dd313
|
FIX : Fix the display on the 'contact by default' on the contact card
|
2021-01-06 11:07:25 +01:00 |
|
Laurent Destailleur
|
8baa4c67ae
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-01-04 12:34:09 +01:00 |
|
Laurent Destailleur
|
b0738643fb
|
FIX Solve problem with TZ
|
2021-01-03 18:42:45 +01:00 |
|
Florian HENRY
|
806b40662f
|
merge develop
|
2020-12-28 21:15:25 +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 |
|
Florian HENRY
|
f03574d061
|
bank ok
|
2020-12-24 14:56:26 +01:00 |
|
Florian HENRY
|
055a2b6fec
|
on goung
|
2020-12-23 23:44:38 +01:00 |
|
Florian HENRY
|
26d3ea2227
|
on going
|
2020-12-23 23:32:50 +01:00 |
|
Frédéric FRANCE
|
4664ac1a1c
|
socialnetworks links
|
2020-12-12 17:00:23 +01:00 |
|
Laurent Destailleur
|
05a560c2e3
|
Fix warning
|
2020-12-04 20:43:11 +01:00 |
|
Laurent Destailleur
|
0d4121c5bd
|
Fix warning
|
2020-12-04 12:01:41 +01:00 |
|
Scrutinizer Auto-Fixer
|
6df4954b20
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-12-01 01:41:19 +00: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 |
|
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
|
f6d6efa288
|
CSS
|
2020-11-22 13:23:56 +01:00 |
|
Damien BENOIT
|
ebd64d5e57
|
Merge pull request #5 from Dolibarr/develop
Update fork
|
2020-11-20 13:53:43 +01:00 |
|
Frédéric FRANCE
|
cac91211c9
|
remove deprecated
|
2020-11-19 21:27:20 +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 |
|
Florian HENRY
|
b16af0a7c3
|
fix deprecated warning php 7.4
|
2020-11-11 15:43:36 +01:00 |
|
Laurent Destailleur
|
6536208a14
|
Merge pull request #15322 from OPEN-DSI/new-list-include-array-extra-fields-with-langfile
NEW include tpl for loading lang file for extra fields in list
|
2020-11-10 14:42:21 +01:00 |
|
Laurent Destailleur
|
da6c6c9e0a
|
Clean code
|
2020-11-08 14:39:20 +01:00 |
|
Laurent Destailleur
|
2c6e4b3fea
|
Merge pull request #15313 from frederic34/patch-10
doxygen
|
2020-11-06 18:46:00 +01:00 |
|
lvessiller
|
4ddff7173f
|
NEW include tpl for loading lang file for extra fields in list
|
2020-11-06 12:19:45 +01:00 |
|
Laurent Destailleur
|
ed8a0093ff
|
Debug v13
|
2020-11-05 22:25:14 +01:00 |
|
stickler-ci
|
d87749e5a6
|
Fixing style errors.
|
2020-11-05 19:31:42 +00:00 |
|
Frédéric FRANCE
|
0c56664c4f
|
Update card.php
|
2020-11-05 20:30:09 +01:00 |
|
Frédéric FRANCE
|
9d1756e499
|
doxygen
|
2020-11-05 14:48:41 +01:00 |
|
Scrutinizer Auto-Fixer
|
ab25e047c0
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 17:51:30 +00:00 |
|
Scrutinizer Auto-Fixer
|
7f52920716
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-31 13:32:18 +00:00 |
|
Laurent Destailleur
|
a24071492e
|
Start fix for php8 compatibility
|
2020-10-30 05:56:07 +01:00 |
|
Frédéric FRANCE
|
e546e56b22
|
Update contact.class.php
|
2020-10-28 20:50:33 +01:00 |
|
Frédéric FRANCE
|
5a01d91492
|
Update contact.class.php
|
2020-10-27 20:48:13 +01:00 |
|
Frédéric FRANCE
|
0a024f285d
|
Update contact.class.php
|
2020-10-27 20:13:01 +01:00 |
|
Frédéric FRANCE
|
5a3780e062
|
end of dol_fiche_end
|
2020-10-27 18:19:31 +01:00 |
|
Frédéric FRANCE
|
ae3228b9e0
|
retrieve the spelling 🎉
|
2020-10-23 20:08:35 +02:00 |
|
Frédéric FRANCE
|
9a470fa42d
|
replace deprecated
|
2020-10-22 22:50:03 +02:00 |
|
Frédéric FRANCE
|
8fd4101876
|
Fix upload photo
|
2020-10-17 20:43:34 +02:00 |
|
Laurent Destailleur
|
7838ca32ba
|
Fix sql injection reported by Jason Nordenstam
|
2020-10-14 01:52:53 +02:00 |
|
Scrutinizer Auto-Fixer
|
1512521d91
|
Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
|
2020-10-07 13:01:28 +00:00 |
|
Laurent Destailleur
|
e3542c6d4f
|
Merge pull request #14848 from TobiasSekan/ShowCategoryInListOnlyWithRights
NEW Show category filter on lists only when user have rights to read categories
|
2020-10-06 12:29:10 +02:00 |
|
Laurent Destailleur
|
a0722f2a30
|
Merge pull request #14862 from TobiasSekan/UseObjectFieldsOnContactList
NEW Use object field of contact in contact list (internal)
|
2020-10-01 19:27:49 +02:00 |
|
Laurent Destailleur
|
7b3a7c9921
|
Add token on all url with action=delete
|
2020-10-01 10:50:54 +02:00 |
|
Laurent Destailleur
|
f442dac2c9
|
Add token on most GET url for admin action
|
2020-09-30 15:13:28 +02:00 |
|
Sekan, Tobias
|
8d2cd144ce
|
fix removed fields
|
2020-09-30 11:52:22 +02:00 |
|
Sekan, Tobias
|
6c46b2e8de
|
Address feedback
|
2020-09-30 11:45:29 +02:00 |
|
stickler-ci
|
ce8d240d8f
|
Fixing style errors.
|
2020-09-29 13:06:23 +00:00 |
|
Sekan, Tobias
|
c8e11f9eae
|
Use object fileds on contact list
|
2020-09-29 14:59:16 +02:00 |
|
Sekan, Tobias
|
2bf15b3a92
|
Show category filter only on rights to read it
|
2020-09-28 10:42:49 +02:00 |
|
Laurent Destailleur
|
d53e7266d2
|
Update agenda.php
|
2020-09-27 18:34:35 +02:00 |
|
Florian HENRY
|
f9d4a4d2ba
|
Merge branch 'develop' into fix_eventcreation
|
2020-09-27 17:58:05 +02:00 |
|
Tobias Sekan
|
a72519f353
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-23 09:09:42 +02:00 |
|
Florian HENRY
|
1efec17228
|
remove commented code since 3 years
|
2020-09-21 11:53:09 +02:00 |
|
Florian HENRY
|
0adca0a660
|
fix event creation same on all page
|
2020-09-21 11:43:08 +02:00 |
|
Laurent Destailleur
|
216b3c885d
|
Fix escaping
|
2020-09-20 01:30:36 +02:00 |
|
Laurent Destailleur
|
2d38644ae1
|
Sanitize sortfield
|
2020-09-18 17:13:01 +02:00 |
|
Laurent Destailleur
|
cf8e8ee68b
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
|
2020-09-18 14:54:20 +02:00 |
|
Laurent Destailleur
|
0b2aa2b01d
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/lib/functions.lib.php
|
2020-09-18 14:48:40 +02:00 |
|
Laurent Destailleur
|
07556e061d
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/contact/card.php
htdocs/core/lib/functions.lib.php
htdocs/document.php
|
2020-09-18 14:46:23 +02:00 |
|
Tobias Sekan
|
b2a953ed5b
|
Merge branch 'develop' into PreselectThirpartyOnNewFromList
|
2020-09-18 12:21:41 +02:00 |
|
Sekan, Tobias
|
eac9e54e0b
|
fix more different button visibility
|
2020-09-18 11:48:53 +02:00 |
|
Laurent Destailleur
|
b35db6b9dd
|
Clean code managing canvas
|
2020-09-18 06:02:52 +02:00 |
|