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
Laurent Destailleur
d5865dbfcc
Merge pull request #16791 from Robin-Yann/12.0
...
FIX: fix checkbox displayed according to module project setup parameters - work in progress
2021-03-20 12:06:03 +01:00
Chl
36baf9b76b
FIX #16143 Old PG requires "()" on DROP FUNCTION
...
On PostgreSQL 9.6 and previous, the upgrade script fails with a syntax
error if the dropped function's name is not followed by parentheses.
Patch tested on 9.6 and 13.2.
2021-03-20 11:56:19 +01:00
Laurent Destailleur
2df54d5da7
Merge pull request #16858 from frederic34/patch-10
...
fix nested comments for doxygen
2021-03-20 11:25:01 +01:00
Laurent Destailleur
7b7db14473
Fix regression
2021-03-20 11:23:32 +01:00
Laurent Destailleur
996ee2caee
Merge pull request #16856 from aspangaro/14a28
...
FIX SQL Error on v14 fresh install
2021-03-20 11:19:54 +01:00
Laurent Destailleur
0dd49d4022
Merge pull request #16861 from frederic34/patch-13
...
fix doxygen
2021-03-20 11:17:37 +01:00
Laurent Destailleur
ebebce8730
Merge pull request #16862 from frederic34/patch-14
...
fix nested comments
2021-03-20 11:17:29 +01:00
Laurent Destailleur
c058bd9e71
Merge pull request #16863 from frederic34/patch-15
...
fix nested comments
2021-03-20 11:17:13 +01:00
Laurent Destailleur
7b5e5eeaf8
Merge pull request #16864 from frederic34/patch-16
...
fix nested comments
2021-03-20 11:17:03 +01:00
Laurent Destailleur
b3b68d65f2
Merge pull request #16866 from frederic34/patch-17
...
fix doxygen
2021-03-20 11:16:51 +01:00
Laurent Destailleur
824d73d935
Merge pull request #16867 from frederic34/patch-18
...
fix doxygen
2021-03-20 11:16:35 +01:00
Laurent Destailleur
bb57d773e9
Merge pull request #16869 from frederic34/patch-20
...
fix doxygen
2021-03-20 11:16:18 +01:00
Laurent Destailleur
d9f52ea11c
Merge pull request #16870 from frederic34/patch-21
...
fix doxygen
2021-03-20 11:16:00 +01:00
Laurent Destailleur
5f0a2e648b
Merge pull request #16871 from frederic34/patch-19
...
fix doxygen
2021-03-20 11:15:48 +01:00
Laurent Destailleur
685ec0bc63
Merge pull request #16872 from frederic34/patch-22
...
fix doxygen
2021-03-20 11:15:32 +01:00
Laurent Destailleur
3ce4762710
Merge pull request #16873 from frederic34/patch-23
...
fix doxygen
2021-03-20 11:15:22 +01:00
Laurent Destailleur
bc639045c0
Merge pull request #16874 from frederic34/patch-24
...
fix doxygen
2021-03-20 11:15:12 +01:00
Laurent Destailleur
810b15f73a
Merge pull request #16875 from frederic34/patch-25
...
fix doxygen
2021-03-20 11:14:57 +01:00
Laurent Destailleur
1d2b3a0967
Merge pull request #16876 from frederic34/patch-26
...
fix doxygen
2021-03-20 11:12:46 +01:00
Laurent Destailleur
11a7420b59
Merge pull request #16877 from frederic34/patch-27
...
fix doxygen
2021-03-20 11:12:33 +01:00
Laurent Destailleur
a510b52441
Merge pull request #16878 from frederic34/patch-29
...
fix doxygen
2021-03-20 11:12:22 +01:00
Laurent Destailleur
007dcce447
Merge pull request #16879 from frederic34/patch-30
...
fix php8 warnings
2021-03-20 11:12:10 +01:00
Frédéric FRANCE
8142d76394
fix php8 warnings
2021-03-20 10:50:02 +01:00
Frédéric FRANCE
3d3715f55d
fix doxygen
2021-03-20 10:37:51 +01:00
Frédéric FRANCE
81c885dbf1
fix doxygen
2021-03-20 10:36:53 +01:00
Frédéric FRANCE
65c3dced1c
fix doxygen
2021-03-20 10:34:23 +01:00
Frédéric FRANCE
5da597d947
fix doxygen
2021-03-20 10:32:18 +01:00
Frédéric FRANCE
a8d8775328
fix doxygen
2021-03-20 10:30:26 +01:00
Frédéric FRANCE
dad7038a0d
fix doxygen
2021-03-20 10:22:34 +01:00
Frédéric FRANCE
49ff44e414
fix doxygen
2021-03-20 10:21:23 +01:00
Frédéric FRANCE
8af1f278ae
fix doxygen
2021-03-20 10:19:03 +01:00
Laurent Destailleur
5c3b7a249e
Merge pull request #16868 from frederic34/patch-19
...
Create index.html
2021-03-20 10:14:51 +01:00
Laurent Destailleur
b5264e978b
Merge pull request #16776 from frederic34/boxticket
...
fix php8 warnings
2021-03-20 10:14:34 +01:00
Frédéric FRANCE
0cacdf3320
fix doxygen
2021-03-20 10:11:56 +01:00
Frédéric FRANCE
1bc3301a7f
fix doxygen
2021-03-20 10:10:41 +01:00
Frédéric FRANCE
283cf9b8d2
Create index.html
2021-03-20 10:08:57 +01:00
Frédéric FRANCE
1552c16dd3
fix doxygen
2021-03-20 10:08:22 +01:00
Frédéric FRANCE
a872f6ebd3
fix doxygen
2021-03-20 10:06:59 +01:00
Frédéric FRANCE
434f5821f7
fix nested comments
2021-03-20 09:38:21 +01:00
Frédéric FRANCE
ed341197ea
fix nested comments
2021-03-20 09:30:09 +01:00
Frédéric FRANCE
3b673d0acd
fix nested comments
2021-03-20 09:28:21 +01:00
Frédéric FRANCE
53ff22d625
fix doxygen
2021-03-20 09:18:40 +01:00
Frédéric FRANCE
2de2f1ce4d
fix nested comments for doxygen
2021-03-20 09:02:29 +01:00
Alexandre SPANGARO
0b23ea072b
FIX SQL Error on fresh install
2021-03-20 08:15:16 +01:00
Alexandre SPANGARO
74c4f97040
FIX SQL Error on fresh install
2021-03-20 08:15:05 +01:00
Laurent Destailleur
85b76cc4df
Fix title
2021-03-20 01:22:09 +01:00
Laurent Destailleur
3414511d7f
Code position
2021-03-19 15:09:06 +01:00
Laurent Destailleur
7056cf7614
FIX #yogosha5675
2021-03-19 15:05:28 +01:00
