Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
89,109 Commits 35 Branches 179 Tags 1.7 GiB
9165ea9e67
Commit Graph

551 Commits

Author SHA1 Message Date
Laurent Destailleur
a2b71d9a7a NEW Can delete a website in experimental website module 2018-09-08 12:04:40 +02:00
Frédéric FRANCE
65b74ad30f
Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-04 20:48:35 +02:00
Frédéric FRANCE
2a9ef8dc05
move phpcs:ignore 2018-09-02 22:05:19 +02:00
Frédéric FRANCE
35232b753a
move phpcs:ignore 2018-09-02 20:37:12 +02:00
Philippe GRAND
5d273960dc fix conflict 2018-09-01 22:40:38 +02:00
Laurent Destailleur
c8912d6a4f
Merge pull request #9242 from frederic34/camelCaps 
mark non camelCaps function
 2018-09-01 15:37:56 +02:00
Philippe GRAND
c013f9cf3d Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop 2018-09-01 15:13:04 +02:00
Laurent Destailleur
c2548b8b39
Merge pull request #9298 from ksar-ksar/Upd_hook_formConfirm 
NEW hook formConfirm always called if hooked
 2018-09-01 14:50:08 +02:00
Frédéric FRANCE
57fb3dc2f4
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-09-01 13:52:51 +02:00
Philippe GRAND
1944ef0dc3 conflict resolution 2018-09-01 12:38:22 +02:00
Philippe GRAND
3a8bde227b Standardize and update code 2018-08-31 19:26:08 +02:00
Philippe GRAND
70ae8c6081 Standardize and update code 2018-08-31 18:27:16 +02:00
ksar-ksar
49d3bea192 Remove the test 
After discussion with Frederic, the best solution is to remove the test
 2018-08-30 11:27:48 +02:00
Frédéric FRANCE
6aee680a4f
PSR2 ClassDeclaration 2018-08-29 22:06:05 +02:00
Frédéric FRANCE
b03f4004ea
PSR2 FunctionClosingBrace 2018-08-29 21:25:22 +02:00
Frédéric FRANCE
fe4260a014
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-28 09:34:53 +02:00
Laurent Destailleur
1842a4bb41
Merge pull request #9278 from grandoc/new_branch_21_08_2018 
Update and standardize code
 2018-08-28 02:13:28 +02:00
Laurent Destailleur
f8811f1b6d
Merge pull request #9275 from frederic34/patch-18 
align parameters
 2018-08-28 01:44:55 +02:00
Frédéric FRANCE
d8bf4a0ecf
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-25 09:07:04 +02:00
ksar-ksar
a844855ade Update hook formConfirm 
The hook should be called when the $formconfirm is not empty
 2018-08-24 16:40:26 +02:00
Laurent Destailleur
a896fb419f Fix preselected language 2018-08-24 15:28:53 +02:00
Laurent Destailleur
e67e32c023 Add forcecombo on select language 2018-08-24 15:25:18 +02:00
Laurent Destailleur
4885e61240 Fix tdclass 2018-08-24 15:16:03 +02:00
Laurent Destailleur
32bde2c375 Add tdclass to form confirm for more control 2018-08-24 15:12:47 +02:00
Philippe GRAND
0c75c41e7b Update and standardize code 2018-08-22 19:56:24 +02:00
Frédéric FRANCE
6b6daf178f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
41ac5dfd29
Merge branch 'develop' into patch-18 2018-08-21 16:02:43 +02:00
Laurent Destailleur
4d8e5ab0e6 Fix PHPCS 2018-08-21 14:58:20 +02:00
Frédéric FRANCE
ca6461ea2d
align parameters 2018-08-21 14:30:06 +02:00
Laurent Destailleur
b40e32b8c3
Merge pull request #9264 from grandoc/new_branch_17_08_2018 
standardize code
 2018-08-21 12:52:34 +02:00
Laurent Destailleur
a369822e5a Fix export/import web site 2018-08-20 21:00:45 +02:00
Laurent Destailleur
36c7007aaa Add control to avoid duplicate aliases 2018-08-20 19:10:33 +02:00
Philippe GRAND
a31ad5af3d standardize code 2018-08-17 17:55:00 +02:00
Laurent Destailleur
8ac3b01f04 NEW Can export/import a website template 2018-08-16 23:57:19 +02:00
Laurent Destailleur
ab22c9d0de Work on import 2018-08-16 21:48:16 +02:00
Frédéric FRANCE
39462742e2
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-16 08:17:55 +02:00
Laurent Destailleur
ae9867eead Work on website import 2018-08-16 00:03:19 +02:00
Laurent Destailleur
b88c657a4a Work on website import 2018-08-15 14:24:33 +02:00
Frédéric FRANCE
d30874750f
Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-14 09:02:12 +02:00
Laurent Destailleur
5e762fe712 Fix cloning website switch on new web site 2018-08-13 23:22:20 +02:00
Frédéric FRANCE
850ac34020
mark non camelCaps function 2018-08-13 17:26:32 +02:00
Philippe GRAND
59cd0a5e5e uniformize 2018-08-04 15:58:05 +02:00
Frédéric FRANCE
a0a5d33641
test include 2018-07-26 17:30:53 +02:00
Laurent Destailleur
a1bdc6022d Website module 2018-07-24 01:10:38 +02:00
Laurent Destailleur
174394c476 Work on website module 2018-07-23 14:08:20 +02:00
Laurent Destailleur
45c7a47d7f Module website 2018-07-22 17:18:35 +02:00
Laurent Destailleur
e9fccec055 Fix website deletion 2018-07-22 16:56:11 +02:00
Laurent Destailleur
f419964c76 Fix Debug website module 2018-07-20 15:01:50 +02:00
Laurent Destailleur
8247bb683c Debug website module 2018-07-19 21:35:21 +02:00
Laurent Destailleur
445db58966 FIX website in inline edit mode 2018-07-19 16:06:48 +02:00
Laurent Destailleur
e362a0e9df FIX website in inline edit mode 2018-07-19 16:06:06 +02:00
Laurent Destailleur
5883899bc7 Little debug of option WEBSITE_USE_WEBSITE_ACCOUNTS 2018-07-05 02:33:39 +02:00
Laurent Destailleur
da138db528 FIX combo into popup become crazy with IE10 
Conflicts:
	htdocs/asset/card.php
	htdocs/modulebuilder/template/myobject_card.php
 2018-06-28 12:16:12 +02:00
Laurent Destailleur
3ea2d81279 FIX combo into popup become crazy with IE10 2018-06-28 12:05:02 +02:00
Laurent Destailleur
edd7499375 Fix clone with new architecture 2018-06-19 09:21:23 +02:00
Laurent Destailleur
e402f68593 Clean code 2018-06-19 08:51:25 +02:00
Laurent Destailleur
f5c08c4b9f Doc website 2018-06-14 16:38:20 +02:00
Laurent Destailleur
25d656025a Fix use of alternative aliases is ok now 2018-06-14 16:33:11 +02:00
Laurent Destailleur
e28aca6244 Fix workaround against p insertion by ckeditor 2018-06-14 16:15:06 +02:00
Laurent Destailleur
eb8d67483b Fix message error 2018-06-11 10:40:57 +02:00
Laurent Destailleur
b5586af56e Fix js error 2018-06-11 10:38:04 +02:00
Laurent Destailleur
ab93909402 Fix url test 2018-06-11 10:36:50 +02:00
Laurent Destailleur
8978208080 Check url 2018-06-11 10:34:54 +02:00
Laurent Destailleur
b67a86843b Fix sql error 2018-06-11 09:22:50 +02:00
Laurent Destailleur
df7e9fccdd Autofill alias 2018-06-07 19:12:18 +02:00
Laurent Destailleur
76f0236bb6 Fix empty page 2018-06-06 23:13:49 +02:00
Frédéric FRANCE
f53f7bbf40
loadlangs 2018-05-26 18:41:16 +02:00
Laurent Destailleur
894f16c5ee Fix navifation 2018-05-25 18:11:24 +02:00
Laurent Destailleur
b44717e706 Fix navifation 2018-05-25 18:06:13 +02:00
Laurent Destailleur
c78b1f1154 Fix navigation into page containers 2018-05-25 17:59:58 +02:00
Laurent Destailleur
d41b395a6d Fix edition of type of container 2018-05-25 17:52:24 +02:00
Laurent Destailleur
bfa9850211 NEW Add arrows to navigate into containers in website module 2018-05-25 17:47:03 +02:00
Frédéric FRANCE
1b69c2357f
typo 2018-05-23 17:16:58 +02:00
Laurent Destailleur
f342c5c6b3 Page title first 2018-05-15 11:36:39 +02:00
Laurent Destailleur
cef9782179 Clean defined constant at begin of pages 2018-04-21 12:00:55 +02:00
Laurent Destailleur
944ba69cd8 Add unique key. Dolibarrize view of stripe card. 2018-03-13 17:32:49 +01:00
Laurent Destailleur
6338328c90 Fix scrutinizer errors 2018-03-04 11:09:53 +01:00
Laurent Destailleur
c2420aa5d9 Fix import alternative alias 2018-02-28 19:20:02 +01:00
Laurent Destailleur
e2c7585ae7 NEW Support alternative aliases of page name in website 2018-02-28 14:36:22 +01:00
Laurent Destailleur
b4446764f8 Clean code of deprecated usage 2018-02-21 14:48:25 +01:00
Laurent Destailleur
71cbcce3a2 NEW Can select sample to use when creating a new page 2018-02-20 18:10:11 +01:00
Laurent Destailleur
17c210ca98 Normalize links href to Dolibarr internal naming 2018-02-20 11:16:13 +01:00
Laurent Destailleur
bfbe03d55d Fix tooltip doc 2018-02-19 21:57:30 +01:00
Laurent Destailleur
3eef9fd57a Fix doc 2018-02-19 21:31:03 +01:00
Laurent Destailleur
1ee128ff13 NEW Add type of website container/page into dictionary 2018-02-19 19:48:53 +01:00
Laurent Destailleur
576fda9c4a Sort 2018-02-19 18:17:42 +01:00
Laurent Destailleur
a0078baeb6 Fix webpage 2018-02-19 18:07:59 +01:00
Laurent Destailleur
f3114765a3 Work on website module 2018-02-19 16:46:29 +01:00
Laurent Destailleur
60a77a6d85 Add option to grab images into same dir or subdir 2018-02-19 14:56:37 +01:00
Laurent Destailleur
18acff5e57 Fix avoid error when homepage not set 2018-02-15 01:29:51 +01:00
Laurent Destailleur
b515448bbd Fix delete when no extrafields used 2018-02-15 00:01:25 +01:00
Laurent Destailleur
8783857aa5 Fix tooltip of website editor 2018-02-14 20:33:48 +01:00
Laurent Destailleur
5ebba6fead Fix example 2018-01-08 12:41:22 +01:00
Laurent Destailleur
40f2644520 Fix example 2018-01-08 12:31:11 +01:00
Laurent Destailleur
9254782ad7 Fix init template of non page 2018-01-07 22:04:31 +01:00
Laurent Destailleur
2812dae3b3 Fix website in multicompany mode 2018-01-07 18:28:47 +01:00
Laurent Destailleur
ca14dd790b Fix module website 2018-01-02 22:58:37 +01:00
Laurent Destailleur
c98b5c7ec7 Fix css background 2018-01-02 17:27:05 +01:00
Laurent Destailleur
fcf42802a3 More example for website 2017-12-27 21:13:42 +01:00
Laurent Destailleur
5264aec853 Add js into export of website 2017-12-27 20:21:19 +01:00
Laurent Destailleur
8388858715 Fix filemanager 2017-12-27 20:17:08 +01:00
Laurent Destailleur
f504716501 Fix sync contact - external user 2017-12-19 16:16:31 +01:00
Laurent Destailleur
feaff433b8 Debug module website 2017-12-19 12:54:10 +01:00
Laurent Destailleur
89a62103ca Debug module website 2017-12-19 11:40:29 +01:00
Laurent Destailleur
713af7f6df Debug module website 2017-12-17 20:25:45 +01:00
Laurent Destailleur
d6fb3aecba Clean code 2017-12-17 16:26:34 +01:00
Laurent Destailleur
8d671b2b26 Debug website module 2017-12-17 16:24:47 +01:00
Laurent Destailleur
118b6ce140 Code comment 2017-12-12 03:10:54 +01:00
Laurent Destailleur
9880ef7364 Fix module website 2017-12-12 01:40:34 +01:00
Laurent Destailleur
48aada6090 Export of website 2017-12-11 21:27:43 +01:00
Laurent Destailleur
6f3c839d65 Fix error management 2017-12-11 18:58:08 +01:00
Laurent Destailleur
dbefb93e0f Error management 2017-12-11 18:25:23 +01:00
Laurent Destailleur
7d553f58f5 Debug website module 2017-12-10 20:34:35 +01:00
Laurent Destailleur
748aee9a54 Fix javascript error 2017-12-10 19:54:04 +01:00
Laurent Destailleur
2dae21259e Fix the switch show more/less 2017-12-10 19:03:18 +01:00
Laurent Destailleur
e1f0483b23 Fix grabber of url when url is on second level dir. More phpunits 2017-12-10 17:59:19 +01:00
Laurent Destailleur
dc04ab3164 Missing field in website module 2017-12-02 13:24:21 +01:00
Laurent Destailleur
9b8011f75b Fix class not found 2017-11-25 16:52:04 +01:00
Laurent Destailleur
47afe470eb Merge small js into lib_header.js.php 
Move filemanager.tpl.php
CSS enhancement
 2017-11-19 12:22:01 +01:00
Laurent Destailleur
9f5b73f4e2 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/actions_linkedfiles.inc.php
	htdocs/core/ajax/ajaxdirpreview.php
	htdocs/website/index.php
 2017-11-18 22:19:15 +01:00
Laurent Destailleur
9b1470dab5 Work on generic filemanager component 2017-11-18 22:13:19 +01:00
Laurent Destailleur
7288c18574 Work on generic filemanager component 2017-11-18 15:41:30 +01:00
Laurent Destailleur
90684750c1 CSS 2017-11-18 13:09:12 +01:00
Laurent Destailleur
bcaccb1829 Add layout into link of sub resources to solve undesired cache effect 2017-11-18 12:35:25 +01:00
Laurent Destailleur
5c3d8acfbb Work on website 2017-11-15 19:47:07 +01:00
Laurent Destailleur
beacf4225f Work on filemanager 2017-11-10 15:44:43 +01:00
Laurent Destailleur
ab78007a54 Work on filemanager generic component 2017-11-10 13:45:38 +01:00
Laurent Destailleur
c78c06776b Fix bug reported by scrutinizer 2017-11-05 03:39:27 +01:00
Laurent Destailleur
ef6fcbbc67 Clean code to have the filemanager beeing a reusable component 2017-11-05 02:04:05 +01:00
Laurent Destailleur
cd70e1506b Work on common core code 2017-11-03 17:20:08 +01:00
Laurent Destailleur
a346a1a5e9 Work on website module 2017-11-03 15:56:16 +01:00
Laurent Destailleur
458be3c814 Clean translation files 2017-11-03 14:38:00 +01:00
Laurent Destailleur
55386a3ae2 Work on website module 2017-11-03 13:52:03 +01:00
Laurent Destailleur
fa1fbe7db7 Work on websiteaccounts 2017-11-03 13:25:49 +01:00
Laurent Destailleur
013ab9405e Work on website module 2017-10-27 17:58:38 +02:00
Laurent Destailleur
89baa0b307 Work on website 2017-10-26 14:49:30 +02:00
Laurent Destailleur
8282c17803 Fix clone page of website 2017-10-26 14:16:59 +02:00
Laurent Destailleur
82b333e423 Fix migration to select2 4.0.5 2017-10-26 14:06:23 +02:00
Laurent Destailleur
5f5cbec1cf Debug module website 2017-10-26 13:09:11 +02:00
Laurent Destailleur
e865f41b86 NEW Extrafields "link to object" now use a combo selection and getNomUrl 2017-10-26 02:55:43 +02:00
Laurent Destailleur
66d2c29fe1 Work on modulebuilder and website module 2017-10-26 01:02:13 +02:00
Laurent Destailleur
ff9a6ca01b Work on module builder 2017-10-25 22:23:54 +02:00
Laurent Destailleur
b64d60d381 Fix dos file 2017-10-25 22:06:24 +02:00
Laurent Destailleur
202712be94 Work on module builder 2017-10-25 22:02:07 +02:00
Laurent Destailleur
bb996019c2 NEW Support visibility on extrafields 2017-10-25 11:42:14 +02:00
Laurent Destailleur
f381361c8b Work on modulebuilder 2017-10-24 19:57:36 +02:00
Laurent Destailleur
9f0f5eb5e8 Fix translation of extrafields type 2017-10-24 18:05:43 +02:00
Laurent Destailleur
d2f723045c Work on website and modulebuilder 2017-10-24 17:30:05 +02:00
Laurent Destailleur
36ad17cc95 Work on module builder 2017-10-22 16:45:18 +02:00
Laurent Destailleur
19a5780f7f Clean code 2017-10-20 23:49:20 +02:00
Laurent Destailleur
3bca0ad07d More modern picto for switch on/off 
Work on website module
 2017-10-20 21:39:19 +02:00