lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
121,269 Commits 43 Branches 150 Tags 886 MiB
add_rest_api_region
Commit Graph

842 Commits

Author SHA1 Message Date
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
Laurent Destailleur
23b1658081 Fix null object 2022-05-12 01:37:20 +02:00
Laurent Destailleur
bf8ba511cb Fix missing index.php file on "regenerate all files" button for alt lang 2022-05-12 01:28:20 +02:00
Laurent Destailleur
82b65f3517
Merge pull request #20707 from hregis/fix_wrong_data_root_with_multicompany 
NEW Module website now supports the multicompany module
 2022-05-01 12:33:07 +02:00
Regis Houssin
8a2cc52b5c FIX wrong website data root with multicompany 2022-04-25 10:14:30 +02:00
Laurent Destailleur
9ff4903608 css 2022-04-02 19:52:12 +02:00
Laurent Destailleur
e2a957c738 Clean some trigger names 2022-04-02 16:08:04 +02:00
Laurent Destailleur
d91db3fe55 Fix: when cloning a website page, the page has the status draft. 2022-03-24 15:42:01 +01:00
Laurent Destailleur
e9aab2188e css 2022-03-24 15:39:02 +01:00
lmarcouiller
43c39d833a Fix bug preview on closed status page 2022-03-16 15:56:39 +01:00
Laurent Destailleur
9bda7ba8c7 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/doleditor.class.php
 2022-03-03 00:16:55 +01:00
Laurent Destailleur
d15c303590 Fix missing button 2022-03-02 11:57:19 +01:00
Laurent Destailleur
b598671484 NEW ACE Editor is restored at same cursor position after a save 2022-02-27 14:46:40 +01:00
Laurent Destailleur
98da84f9b2 FIX #yogosha9086 2022-02-24 18:15:04 +01:00
Laurent Destailleur
77e2969411 Merge branch '15.0' of git@github.com:Dolibarr/dolibarr.git into develop 2022-02-22 22:27:32 +01:00
Laurent Destailleur
fb58b7e930 FIX #yogosha9048 2022-02-22 18:49:16 +01:00
Laurent Destailleur
2d841d5b99 Fix param 2022-02-22 18:48:25 +01:00
Laurent Destailleur
1c0ef23316 FIX #yogosha9048 2022-02-22 18:46:46 +01:00
Laurent Destailleur
eede3aaf17 Fix #yogosha9033 2022-02-21 22:50:32 +01:00
Laurent Destailleur
856b83a202 CSS 2022-02-07 09:26:03 +01:00
Laurent Destailleur
3b36465210 Fix missing allowed_in_frames 2022-02-06 12:17:42 +01:00
Laurent Destailleur
840e3b5bc3 Fix url 2022-02-03 19:21:59 +01:00
Laurent Destailleur
b1728a2129 css 2022-01-30 01:58:29 +01:00
Laurent Destailleur
9e86e5ce93 Fix creation of page 2022-01-30 01:46:14 +01:00
Laurent Destailleur
ed2ca6af79 CSS 2022-01-19 14:32:15 +01:00
Laurent Destailleur
13510b9929 Clean sortfield, sortorder 2022-01-13 11:17:25 +01:00
Laurent Destailleur
8bace4c64e Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2021-11-30 16:24:42 +01:00
Laurent Destailleur
a298a845f1 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/accountancy/bookkeeping/list.php
	htdocs/core/actions_massactions.inc.php
	htdocs/core/lib/functions.lib.php
	htdocs/core/lib/memory.lib.php
	htdocs/langs/en_US/holiday.lang
	htdocs/ticket/card.php
 2021-11-30 16:24:18 +01:00
Christian Foellmann
6608f5f0d8 update all script tags to be uniform. language="javascript" removed 
https://developer.mozilla.org/en-US/docs/web/html/element/script#attr-language
 2021-11-29 15:09:18 +01:00
Laurent Destailleur
2ba5f1369f Fix alternate 2021-11-28 15:53:55 +01:00
Laurent Destailleur
ad2e567571 Fix bug huntr.dev 2021-10-25 15:32:10 +02:00
Laurent Destailleur
8604f9b153 Clean DOM (remove ficheaddleft div) 2021-10-23 17:18:35 +02:00
Laurent Destailleur
e8e63e85f1 NEW: Editing a page in website module keep old page with name .back 2021-10-20 17:08:33 +02:00
Laurent Destailleur
dd0809b528 Fix trans labels status 2021-10-16 19:37:57 +02:00
Laurent Destailleur
874731af84 The 'action=delete&file=...' has been replaced with 
'action=deletefile&file=...' to avoid confusion with deletion of object
lines.
 2021-10-10 21:11:48 +02:00
Laurent Destailleur
ff5f371428 Fix add protection to avoid deletion of page when deleting a file 2021-10-10 20:46:06 +02:00
Laurent Destailleur
17d2c3cb08 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/website/class/websitepage.class.php
 2021-10-07 16:10:48 +02:00
Laurent Destailleur
b905b1b4bc FIX missing filter status=1 on rss feeds 2021-10-07 16:09:32 +02:00
Laurent Destailleur
3d4bb66853 Clean code 2021-09-30 15:59:47 +02:00
Laurent Destailleur
37603b451a Fix token in url 2021-09-27 12:24:01 +02:00
Laurent Destailleur
deb1965cd5 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/comm/action/card.php
	htdocs/compta/paiement/list.php
	htdocs/core/class/commonobject.class.php
	htdocs/mrp/mo_list.php
	htdocs/projet/tasks/task.php
	htdocs/public/payment/newpayment.php
 2021-09-20 17:15:12 +02:00
Laurent Destailleur
96436cac3d FIX unprivileged user can attach agenda with leave. 2021-09-19 00:50:23 +02:00
Laurent Destailleur
d760686239 Fix case of newtoken() 2021-09-18 22:24:00 +02:00
Laurent Destailleur
8bdc53f469 Fix Add action classify as sensitive actions 2021-09-18 20:49:24 +02:00
Laurent Destailleur
0168a9860b Fix tooltip on website syntax disappear 
Fix backard compatibility of getLabelStatus
 2021-09-18 12:09:08 +02:00
Laurent Destailleur
4e0ae972f1 Fix css 2021-09-07 17:26:31 +02:00
Laurent Destailleur
b04ea59a51 More sql sanitizing 2021-09-02 13:58:42 +02:00
Laurent Destailleur
38c0e93285 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/adherents/card.php
	htdocs/core/class/commonobjectline.class.php
	htdocs/core/triggers/interface_20_modWorkflow_WorkflowManager.class.php
	htdocs/public/project/index.php
 2021-09-01 17:52:04 +02:00
Laurent Destailleur
3e4d7dfaba Fix $_SERVER["PHP_SEFL"] into $_SERVER["PHP_SELF"] 2021-09-01 17:44:54 +02:00
Laurent Destailleur
0aa4868c34 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into develop 2021-08-31 13:14:01 +02:00
Laurent Destailleur
bbf219fd7b FIX Export of website generates a package that contains a sql error 2021-08-31 13:09:52 +02:00
Laurent Destailleur
fb8723d884
Merge pull request #18487 from cfoellmann/PR/fix-remaining-buttons 
replace remaining SubmitCancel buttons
 2021-08-28 18:39:06 +02:00
Laurent Destailleur
3d72a21396 Clean code 2021-08-28 03:09:41 +02:00
Laurent Destailleur
29abbbe2fb Clean code 2021-08-28 01:45:53 +02:00
Laurent Destailleur
2dd91bf312 Clean code 2021-08-27 23:36:06 +02:00
Laurent Destailleur
46d993c9a6 Clean code 2021-08-27 22:42:04 +02:00
Christian Foellmann
f094b4c70c fix up most of the remaining submit inputs 2021-08-24 17:04:17 +02:00
Christian Foellmann
d706c3b1ec use Forms::buttonsSaveCreate() to generate most of the Save|Cancel forms combination 2021-08-20 14:41:30 +02:00
Laurent Destailleur
5e0aaeb6e4 Fix warning 2021-08-10 16:40:33 +02:00
lmarcouiller
0d70c81897 ix error in website module -> sitemap 2021-07-30 15:16:38 +02:00
Laurent Destailleur
24fccc2b72 Merge branch '14.0' of git@github.com:Dolibarr/dolibarr.git into 14.0 2021-06-29 15:53:22 +02:00