Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
74,307 Commits 36 Branches 189 Tags
4495f0a755c52c76456b51a3347ea42f4fc101a1
Commit Graph

254 Commits

Author SHA1 Message Date
Laurent Destailleur
5719a38ea7 Work on website module. Support now links to company logos. 2018-09-09 14:05:23 +02:00
Frédéric FRANCE
7e0b1055db Merge remote-tracking branch 'upstream/develop' into camelCaps2 2018-09-09 13:36:53 +02:00
Frédéric FRANCE
f02b2f0239 Merge remote-tracking branch 'upstream/develop' into patch-6 2018-09-09 13:35:58 +02:00
Frédéric FRANCE
e73bd6da6b completly comment unused code 2018-09-09 13:29:58 +02:00
Laurent Destailleur
a5edd530d2 Fix delete of website 2018-09-08 14:10:07 +02:00
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