Frédéric FRANCE
|
5fa13533ee
|
make choice required
|
2020-10-30 21:41:41 +01:00 |
|
Frédéric FRANCE
|
e0184f66d3
|
zapier on ticket create
|
2020-10-30 21:09:39 +01:00 |
|
Frédéric FRANCE
|
24ace56110
|
zapier on ticket create
|
2020-10-30 21:03:00 +01:00 |
|
Frédéric FRANCE
|
5afab4ba90
|
zapier on ticket create
|
2020-10-30 20:57:43 +01:00 |
|
Frédéric FRANCE
|
41e8f0085c
|
zapier on ticket create
|
2020-10-30 20:37:23 +01:00 |
|
Frédéric FRANCE
|
2cbbf86a5b
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-10-30 17:48:00 +01:00 |
|
Laurent Destailleur
|
1ffb7eb2f4
|
Merge pull request #15222 from frederic34/patch-6
doxygen
|
2020-10-30 17:43:05 +01:00 |
|
Frédéric FRANCE
|
28adc985b0
|
Update api_setup.class.php
|
2020-10-30 17:31:57 +01:00 |
|
Frédéric FRANCE
|
b431d99996
|
Update api_memberstypes.class.php
|
2020-10-30 16:10:23 +01:00 |
|
Frédéric FRANCE
|
782e062ec7
|
Update api_thirdparties.class.php
|
2020-10-30 15:24:29 +01:00 |
|
Frédéric FRANCE
|
a317d71413
|
Update api_users.class.php
|
2020-10-30 15:23:05 +01:00 |
|
Frédéric FRANCE
|
38c2fea849
|
Update api_members.class.php
|
2020-10-30 15:21:28 +01:00 |
|
Frédéric FRANCE
|
ace1dc16f1
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-10-30 14:47:09 +01:00 |
|
Laurent Destailleur
|
2614a951cd
|
Merge pull request #15220 from frederic34/patch-6
doxygen
|
2020-10-30 14:35:38 +01:00 |
|
Laurent Destailleur
|
64b9afc509
|
Fix bad column name
|
2020-10-30 14:33:16 +01:00 |
|
Frédéric FRANCE
|
3e9812bc00
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-10-30 14:31:24 +01:00 |
|
Frédéric FRANCE
|
29faf681e6
|
work on members
|
2020-10-30 14:30:25 +01:00 |
|
Laurent Destailleur
|
e5c683ebb7
|
Comment
|
2020-10-30 14:29:41 +01:00 |
|
Laurent Destailleur
|
cb3e204281
|
Fix use of dolibarr_main_distrib
|
2020-10-30 13:06:55 +01:00 |
|
Laurent Destailleur
|
2668efa132
|
Fix missing global
|
2020-10-30 12:44:29 +01:00 |
|
Frédéric FRANCE
|
5c71b7e24c
|
work on members
|
2020-10-30 09:25:14 +01:00 |
|
Frédéric FRANCE
|
412077ab51
|
doxygen
|
2020-10-30 08:24:02 +01:00 |
|
Frédéric FRANCE
|
e4af61a587
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-10-30 08:17:53 +01:00 |
|
Frédéric FRANCE
|
6fe4f85eec
|
work on members
|
2020-10-30 08:15:37 +01:00 |
|
Frédéric FRANCE
|
1c9cd484ad
|
work on members
|
2020-10-30 08:10:28 +01:00 |
|
Frédéric FRANCE
|
ec6568ffbe
|
work on members
|
2020-10-30 08:01:58 +01:00 |
|
Frédéric FRANCE
|
f721338bd8
|
work on members
|
2020-10-30 07:57:53 +01:00 |
|
Laurent Destailleur
|
d4daf8b9ce
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/security2.lib.php
|
2020-10-30 05:59:45 +01:00 |
|
Laurent Destailleur
|
5504e3b236
|
Fix phpcs
|
2020-10-30 05:58:40 +01:00 |
|
Laurent Destailleur
|
a24071492e
|
Start fix for php8 compatibility
|
2020-10-30 05:56:07 +01:00 |
|
Laurent Destailleur
|
b3333da5c1
|
Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/security2.lib.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/main.inc.php
|
2020-10-30 04:39:41 +01:00 |
|
Laurent Destailleur
|
1a02504792
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/core/lib/security2.lib.php
|
2020-10-30 04:26:09 +01:00 |
|
Laurent Destailleur
|
f51b02026c
|
Fix regression
|
2020-10-30 04:24:06 +01:00 |
|
Laurent Destailleur
|
840ca73464
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/class/hookmanager.class.php
htdocs/main.inc.php
htdocs/theme/eldy/info-box.inc.php
htdocs/theme/eldy/style.css.php
|
2020-10-30 04:21:07 +01:00 |
|
Laurent Destailleur
|
f5a156ee06
|
Fix regression
|
2020-10-30 04:17:02 +01:00 |
|
Laurent Destailleur
|
1b5bcaccc6
|
Fix remove warnings
|
2020-10-30 04:13:31 +01:00 |
|
Laurent Destailleur
|
ec0c8e0c79
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0
Conflicts:
htdocs/core/lib/security2.lib.php
htdocs/core/modules/livraison/doc/pdf_typhon.modules.php
htdocs/core/tpl/advtarget.tpl.php
|
2020-10-30 03:35:40 +01:00 |
|
Laurent Destailleur
|
263b679af4
|
Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
Conflicts:
htdocs/core/tpl/advtarget.tpl.php
|
2020-10-30 03:31:04 +01:00 |
|
Laurent Destailleur
|
925669ee33
|
Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 11.0
|
2020-10-30 03:25:52 +01:00 |
|
Laurent Destailleur
|
f22017080d
|
Fix for php8
|
2020-10-30 03:25:33 +01:00 |
|
Laurent Destailleur
|
d4db10a9e5
|
Merge pull request #15219 from frederic34/patch-8
phpcs
|
2020-10-30 02:55:12 +01:00 |
|
Laurent Destailleur
|
35224a673b
|
Merge pull request #15218 from frederic34/patch-6
fix undefined variable
|
2020-10-30 02:48:07 +01:00 |
|
Frédéric FRANCE
|
72a725a9e2
|
get thirdparty specimen with api
|
2020-10-30 00:04:52 +01:00 |
|
Frédéric FRANCE
|
30b67aaa4f
|
get thirdparty specimen with api
|
2020-10-29 23:56:42 +01:00 |
|
Frédéric FRANCE
|
c41459abe4
|
fields
|
2020-10-29 23:42:51 +01:00 |
|
Frédéric FRANCE
|
e049eb960d
|
add trigger user create
|
2020-10-29 20:53:28 +01:00 |
|
Frédéric FRANCE
|
0507e71586
|
phpcs
|
2020-10-29 18:44:15 +01:00 |
|
Frédéric FRANCE
|
317ffc65c9
|
Merge remote-tracking branch 'upstream/develop' into zapieruser
|
2020-10-29 18:41:22 +01:00 |
|
Frédéric FRANCE
|
9e70d7ca65
|
fix undefined variable
|
2020-10-29 18:37:52 +01:00 |
|
Laurent Destailleur
|
8c646cdf4f
|
Merge pull request #15207 from frederic34/patch-11
Mutualise code, introduce MAIN_ALL_TOWN_TO_UPPER
|
2020-10-29 17:49:16 +01:00 |
|