Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

386 Commits

Author SHA1 Message Date
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