Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
113,852 Commits 36 Branches 189 Tags
8e61f77f4df34b6789c2f3f0c2f5f9f0af7f901b
Commit Graph

802 Commits

Author SHA1 Message Date
Laurent Destailleur
767897595b Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-09-10 02:46:10 +02:00
Laurent Destailleur
c1b6d6eb11 FIX warning 2022-09-10 01:21:41 +02:00
Laurent Destailleur
6b38b89c3b NEW Add a way to enter LICENSE file content in property of website 2022-09-03 19:05:25 +02:00
Laurent Destailleur
6406fbdc7e NEW Add a way to enter LICENSE file content in property of website 2022-09-03 19:02:42 +02:00
Laurent Destailleur
027e597776 Merge branch 'develop' into productbatch 2022-09-02 10:11:47 +02:00
Laurent Destailleur
3d9b57ac3f Clean code 2022-09-02 09:35:10 +02:00
Frédéric France
8e66b7207e replace ! empty by !empty 2022-08-31 22:14:20 +02:00
Frédéric France
00da52ef8c fix php8 warnings 2022-08-31 22:12:25 +02:00
Frédéric France
e71692e745 fix php8 warnings 2022-08-31 22:02:31 +02:00
Laurent Destailleur
5b45bd5df3 Merge pull request #21947 from dolibit-ut/patch-458 
Update index.php
 2022-08-30 00:58:03 +02:00
UT from dolibit
b81ae90088 Update index.php 2022-08-29 17:40:32 +02:00
UT from dolibit
525b662b24 Update websiteaccount_card.php 2022-08-29 17:35:23 +02:00
Laurent Destailleur
e575abfa94 NEW Can delete a website 2022-08-17 01:07:45 +02:00
Laurent Destailleur
2d8b544ace Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
 2022-08-12 12:19:20 +02:00
Laurent Destailleur
01484757aa Debug v16 2022-08-12 11:31:40 +02:00
Laurent Destailleur
0f3ed254fd Add version and date of website template generation in the sql. 2022-08-11 23:36:13 +02:00
Laurent Destailleur
95b1b3f990 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/propal/card.php
	htdocs/commande/card.php
	htdocs/emailcollector/class/emailcollector.class.php
	htdocs/index.php
	htdocs/website/index.php
 2022-08-10 13:16:02 +02:00
Laurent Destailleur
3108cd12fb Fix export of website 2022-08-03 21:30:40 +02:00
Laurent Destailleur
7544c26b95 Fix link to delete website 2022-08-03 19:10:38 +02:00
Laurent Destailleur
630dced71c Look and feel v17 2022-07-27 23:09:29 +02:00
Laurent Destailleur
37c725fc6c NEW Can delete a website even if not empty 2022-07-27 23:01:33 +02:00
Laurent Destailleur
5e94e46461 Trans 2022-07-27 20:11:57 +02:00
Laurent Destailleur
c5e5f2915e Look and feel v17 2022-07-27 19:01:26 +02:00
Laurent Destailleur
ab81492fa4 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formwebsite.class.php
	htdocs/core/lib/cron.lib.php
 2022-07-24 22:17:25 +02:00
Laurent Destailleur
432468950b CSS 2022-07-24 17:16:39 +02:00
Laurent Destailleur
89f7e5ad30 Fix export of website. allowed_in_frames must be an int 2022-07-24 16:08:27 +02:00
Laurent Destailleur
57c5de5f9a Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 11:43:58 +02:00
Laurent Destailleur
9d249bd56d Fix phpunit 2022-07-12 11:37:17 +02:00
Laurent Destailleur
c804469082 FIX Export of website must not export .old and .back files 2022-07-12 11:20:34 +02:00
Laurent Destailleur
9abff2ff07 Merge branch '16.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-07-12 10:57:11 +02:00
Laurent Destailleur
cf5825687e Debug v16 2022-07-12 10:56:03 +02:00
Laurent Destailleur
7ac00bfec9 Bad param 2022-07-12 10:09:01 +02:00
Laurent Destailleur
b1d762eb18 Fix php8.1 2022-07-12 09:37:15 +02:00
Laurent Destailleur
24dc936000 Revert "default to create on card.php if $action is empty" 
This reverts commit e0b664066b.
 2022-07-11 00:05:50 +02:00
Christian Foellmann
e0b664066b default to create on card.php if $action is empty 2022-07-11 00:01:42 +02:00
Laurent Destailleur
4e46c3f7a2 Clean code 2022-06-27 10:17:14 +02:00
Laurent Destailleur
2a32ebbf6c Fix token 2022-06-24 11:26:26 +02:00
Laurent Destailleur
8ee30e067f Rename var 2022-06-20 02:23:37 +02:00
Laurent Destailleur
e97f021380 Fix #yogosha11295 2022-06-19 19:02:16 +02:00
Laurent Destailleur
dd392143e1 Fix conf->projet conf->project 2022-06-14 17:53:17 +02:00
Laurent Destailleur
bc11cf62f8 FIX #hunterdev2acfc8fe-247c-4f88-aeaa-042b6b8690a0 2022-06-13 10:44:20 +02:00
Laurent Destailleur
a9440c934d FIX #yogosha10825 2022-06-07 16:05:01 +02:00
Laurent Destailleur
d9dbfd063b Debug v16 2022-05-20 23:34:58 +02:00
Laurent Destailleur
ee6131612a Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 15.0 
Conflicts:
	htdocs/accountancy/class/bookkeeping.class.php
 2022-05-20 23:28:01 +02:00
Laurent Destailleur
180d94b43c More log 2022-05-17 20:31:50 +02:00
Laurent Destailleur
4de50da0dd Repare code to forbidden var_dump() into code 2022-05-17 14:55:38 +02:00
Laurent Destailleur
dd02c0607a Removed unexpected plugins 2022-05-16 20:44:58 +02:00
Laurent Destailleur
049799c2e6 Update to ckeditor 4.18 2022-05-16 20:28:00 +02:00
Laurent Destailleur
775a8c5334 Look and feel v16 2022-05-12 20:18:58 +02:00
Laurent Destailleur
dc6f90c4a7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-05-12 10:38:26 +02:00