Laurent Destailleur
|
843e0a2c39
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/adherents/card.php
htdocs/core/class/html.formother.class.php
htdocs/core/modules/societe/doc/doc_generic_odt.modules.php
htdocs/projet/tasks/time.php
htdocs/webservices/server_thirdparty.php
|
2021-03-29 21:47:31 +02:00 |
|
Laurent Destailleur
|
c4a8dca4ab
|
FIX #yogosha5756
|
2021-03-29 21:35:19 +02:00 |
|
Florian HENRY
|
14a90a3a9d
|
on goung
|
2021-03-29 17:26:43 +02:00 |
|
Florian HENRY
|
f25360cc4c
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
|
2021-03-29 15:49:43 +02:00 |
|
Laurent Destailleur
|
ce1f8289a4
|
FIX #yogosha5746
|
2021-03-29 15:07:23 +02:00 |
|
Laurent Destailleur
|
b929641fe1
|
Look and feel v14
|
2021-03-29 13:00:17 +02:00 |
|
Florian HENRY
|
2def98809c
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
|
2021-03-29 11:55:26 +02:00 |
|
Laurent Destailleur
|
5b64a517ea
|
Fix label
|
2021-03-27 14:30:10 +01:00 |
|
Florian HENRY
|
f87711bf2f
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into dev_EventOrganisation
|
2021-03-26 18:30:08 +01:00 |
|
Laurent Destailleur
|
01c1101b29
|
Look and feel v14
|
2021-03-26 18:16:12 +01:00 |
|
Laurent Destailleur
|
99496e365f
|
css
|
2021-03-25 04:13:28 +01:00 |
|
Laurent Destailleur
|
a82ce2e5af
|
css
|
2021-03-25 04:11:13 +01:00 |
|
Laurent Destailleur
|
443fd544be
|
Update time.php
|
2021-03-25 01:07:29 +01:00 |
|
Laurent Destailleur
|
a5034d44f7
|
$_POST war
|
2021-03-24 19:53:31 +01:00 |
|
Laurent Destailleur
|
047471c220
|
Remove $_POST war
|
2021-03-24 19:06:44 +01:00 |
|
Florian HENRY
|
cc78e7c685
|
add field on conf or booth tabs
|
2021-03-23 21:04:38 +01:00 |
|
stickler-ci
|
ba66eaeb18
|
Fixing style errors.
|
2021-03-22 14:42:31 +00:00 |
|
Florian HENRY
|
b121587582
|
change to GETPOST
|
2021-03-22 15:39:54 +01:00 |
|
Laurent Destailleur
|
ca1715df96
|
Add some protection for SQL injection
|
2021-03-22 13:31:06 +01:00 |
|
Laurent Destailleur
|
6063b02bf4
|
Fix #ygosha5698
|
2021-03-22 12:47:23 +01:00 |
|
Laurent Destailleur
|
15440917b1
|
Fix #ygosha5698
|
2021-03-22 11:30:18 +01:00 |
|
Laurent Destailleur
|
d8aa5f5eab
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2021-03-20 12:43:07 +01:00 |
|
Laurent Destailleur
|
3d3a7bfd37
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/comm/propal/card.php
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/element.php
htdocs/projet/tasks.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/note.php
htdocs/projet/tasks/task.php
htdocs/projet/tasks/time.php
|
2021-03-20 12:42:46 +01:00 |
|
Laurent Destailleur
|
7f6044c52e
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/projet/card.php
htdocs/projet/contact.php
htdocs/projet/tasks/comment.php
htdocs/projet/tasks/contact.php
htdocs/projet/tasks/document.php
htdocs/projet/tasks/task.php
|
2021-03-20 12:18:40 +01:00 |
|
Frédéric FRANCE
|
bae1770176
|
uniformise comments to remove nested comments
|
2021-03-20 10:00:24 +01:00 |
|
Robin
|
26dc897042
|
Merge branch '12.0' of https://github.com/Robin-Yann/dolibarr into 12.0
htdocs/projet/card.php
|
2021-03-19 11:12:49 +01:00 |
|
Robin
|
d852816101
|
FIX: fix checkbox displayed according to module project setup parameters
|
2021-03-19 09:54:11 +01:00 |
|
Frédéric FRANCE
|
e7ad9f1290
|
fix project replace projet
|
2021-03-18 20:55:47 +01:00 |
|
Frédéric FRANCE
|
c43d3dff92
|
fix project replace projet
|
2021-03-18 20:51:40 +01:00 |
|
Robin
|
b3757a6f69
|
FIX: fix checkbox displayed according to module project setup parameters - work in progress
|
2021-03-18 11:07:48 +01:00 |
|
Frédéric FRANCE
|
a420d0acbd
|
fix php8 warnings
|
2021-03-17 18:40:11 +01:00 |
|
Frédéric FRANCE
|
efaa2be3b8
|
fix php8 warnings
|
2021-03-17 18:38:24 +01:00 |
|
Laurent Destailleur
|
e366d2c379
|
Merge branch '13.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
ChangeLog
htdocs/admin/tools/export_files.php
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
htdocs/core/lib/functions.lib.php
htdocs/cron/list.php
htdocs/filefunc.inc.php
test/phpunit/FilesLibTest.php
|
2021-03-16 14:57:04 +01:00 |
|
Laurent Destailleur
|
f514dec6ab
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into 13.0
Conflicts:
htdocs/compta/paiement_charge.php
htdocs/compta/sociales/card.php
|
2021-03-16 14:50:06 +01:00 |
|
Laurent Destailleur
|
87ab711a0f
|
Merge pull request #16707 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-16 10:34:55 +01:00 |
|
Laurent Destailleur
|
c84395281e
|
Merge pull request #16716 from frederic34/patch-13
fix php8 warning
|
2021-03-16 10:30:54 +01:00 |
|
Alexandre SPANGARO
|
f8703a0691
|
Translation "Generated documents"
|
2021-03-16 04:04:33 +01:00 |
|
Alexandre SPANGARO
|
4fd24c6855
|
Translation "Generated documents"
|
2021-03-16 04:04:18 +01:00 |
|
Frédéric FRANCE
|
89219fe7fa
|
fix php8 warning
|
2021-03-15 21:13:15 +01:00 |
|
Florian HENRY
|
177a6bfe4f
|
conference or booth card and list ok
|
2021-03-15 20:20:53 +01:00 |
|
Florian HENRY
|
17c49e6ce9
|
ongoinf card and list
|
2021-03-15 18:06:23 +01:00 |
|
Laurent Destailleur
|
8d3ed71f5f
|
Merge pull request #16682 from frederic34/patch-3
fix php8 warning
|
2021-03-15 13:28:50 +01:00 |
|
Laurent Destailleur
|
7d1e18f5ab
|
Merge pull request #16625 from FHenry/dev_EventOrganisation
new: working on conference or booth object and event type #FoundationFunding
|
2021-03-15 11:37:57 +01:00 |
|
Frédéric FRANCE
|
cc25fb727b
|
fix php8 warning
|
2021-03-15 11:25:23 +01:00 |
|
Laurent Destailleur
|
cbaaff799b
|
Merge pull request #16643 from dolibit-ut/patch-72
Update card.php
|
2021-03-15 11:14:26 +01:00 |
|
Laurent Destailleur
|
cc10106a21
|
Fix protection on int
|
2021-03-14 12:20:23 +01:00 |
|
Laurent Destailleur
|
12f50a76d7
|
Fix yogosha #5627
|
2021-03-14 11:48:39 +01:00 |
|
UT from dolibit
|
83c6e5f8e7
|
Update card.php
at $help_url add DE:Modul_Projekte
|
2021-03-13 15:19:09 +01:00 |
|
Frédéric FRANCE
|
815a7683a2
|
force getnextref if project create fail
|
2021-03-12 16:48:43 +01:00 |
|
Florian HENRY
|
862926316a
|
working on list
|
2021-03-11 19:09:42 +01:00 |
|