Laurent Destailleur
|
ac143b28ae
|
Work on multilang
|
2018-10-14 20:54:28 +02:00 |
|
Laurent Destailleur
|
45860b2494
|
Work on multilang
|
2018-10-14 20:04:25 +02:00 |
|
Laurent Destailleur
|
b0569de166
|
Work on multilang support
|
2018-10-14 18:44:29 +02:00 |
|
Laurent Destailleur
|
96d2950051
|
Better tooltip
|
2018-10-14 16:10:02 +02:00 |
|
Laurent Destailleur
|
278910b66b
|
Fix website
|
2018-10-14 14:26:18 +02:00 |
|
Philippe GRAND
|
ba40ad4aab
|
Standardize and update code
|
2018-10-12 12:23:45 +02:00 |
|
Philippe GRAND
|
073ec85208
|
Standardize code
|
2018-10-05 15:51:08 +02:00 |
|
Laurent Destailleur
|
f6099fba15
|
Fix phpcs
|
2018-10-04 16:58:34 +02:00 |
|
Laurent Destailleur
|
378013b863
|
Better select language component
|
2018-10-03 20:58:45 +02:00 |
|
Laurent Destailleur
|
83be1759b1
|
Work on multilang website
|
2018-10-03 20:00:52 +02:00 |
|
Laurent Destailleur
|
fd859d3162
|
Add a component to select lang into a web site
|
2018-10-03 18:40:54 +02:00 |
|
Laurent Destailleur
|
957d5958a4
|
Work on website
|
2018-10-01 13:09:12 +02:00 |
|
Laurent Destailleur
|
33130853c8
|
Fix website
|
2018-09-28 00:59:02 +02:00 |
|
Laurent Destailleur
|
0987db765c
|
Work on export/import
|
2018-09-26 11:28:41 +02:00 |
|
Laurent Destailleur
|
0a4d80012a
|
Support export/import of logo site in web site templates
|
2018-09-26 11:15:11 +02:00 |
|
Laurent Destailleur
|
2ef0cb8d9b
|
Fix cloning
|
2018-09-25 20:34:05 +02:00 |
|
Laurent Destailleur
|
eff1d1c89e
|
Work on website module
|
2018-09-25 16:35:59 +02:00 |
|
Laurent Destailleur
|
e6be047178
|
Work on new management for website module
|
2018-09-25 15:00:37 +02:00 |
|
Laurent Destailleur
|
f04b8eea6d
|
Work on website module
|
2018-09-24 19:21:21 +02:00 |
|
Laurent Destailleur
|
9dc4ad4cc3
|
Add warning when using editinline
|
2018-09-24 15:38:13 +02:00 |
|
Laurent Destailleur
|
ea517da85c
|
Work on filemanager for websites
|
2018-09-24 15:14:32 +02:00 |
|
Laurent Destailleur
|
6e95fb5f05
|
Warning in website module
|
2018-09-20 14:36:13 +02:00 |
|
Frédéric FRANCE
|
987fdbe73c
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 21:29:41 +02:00 |
|
Frédéric FRANCE
|
3e71f4e6b0
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 18:36:49 +02:00 |
|
Frédéric FRANCE
|
998b67fa98
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-12 18:32:15 +02:00 |
|
Laurent Destailleur
|
3bf296c9cf
|
Merge pull request #9448 from frederic34/loadfichetitre
remove deprecated
|
2018-09-12 18:23:24 +02:00 |
|
Laurent Destailleur
|
45e769243d
|
Fix import web site
|
2018-09-11 00:11:14 +02:00 |
|
Laurent Destailleur
|
a4a4b8ddff
|
Fix error management
|
2018-09-10 23:23:44 +02:00 |
|
Laurent Destailleur
|
b0be1ddadb
|
Fix files generated
|
2018-09-10 23:20:31 +02:00 |
|
Laurent Destailleur
|
9e982e05df
|
Fix import
|
2018-09-10 22:58:20 +02:00 |
|
Laurent Destailleur
|
280f15e8bf
|
Fix fk_user
|
2018-09-10 21:55:03 +02:00 |
|
Laurent Destailleur
|
98c3657d45
|
Fix default status of website
|
2018-09-10 21:43:21 +02:00 |
|
Laurent Destailleur
|
5a279bfce0
|
Fix import
|
2018-09-10 21:25:30 +02:00 |
|
Laurent Destailleur
|
3de8381c20
|
Website module
|
2018-09-10 19:36:46 +02:00 |
|
Laurent Destailleur
|
47cfda6734
|
Webiste
|
2018-09-10 09:09:51 +02:00 |
|
Frédéric FRANCE
|
0e0db9d1ee
|
remove deprecated
|
2018-09-09 15:52:55 +02:00 |
|
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 |
|
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 |
|