Laurent Destailleur
|
6159703116
|
Fix warning and date
|
2019-01-15 11:14:01 +01:00 |
|
Laurent Destailleur
|
0f2406c202
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2019-01-15 10:55:28 +01:00 |
|
Laurent Destailleur
|
2ec2daa18d
|
FIX Edit blog meta post
|
2019-01-15 10:53:28 +01:00 |
|
Laurent Destailleur
|
2040ca1141
|
FIX Warning
|
2019-01-11 18:17:51 +01:00 |
|
ldestailleur
|
451b3e30cc
|
Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/core/lib/company.lib.php
htdocs/core/lib/functions.lib.php
htdocs/langs/en_US/cashdesk.lang
|
2019-01-04 19:36:20 +01:00 |
|
ldestailleur
|
e47cf24fa1
|
Try to fix chrome xss protection
|
2019-01-04 19:10:25 +01:00 |
|
ldestailleur
|
89f24f6fe8
|
Fix cache not working on css files
|
2019-01-04 18:58:36 +01:00 |
|
ldestailleur
|
3485d0b4e5
|
Fix regression when editing html source
|
2019-01-04 18:39:02 +01:00 |
|
ldestailleur
|
3b6d6eec9a
|
Fix cach on image for website
|
2019-01-04 18:06:54 +01:00 |
|
ldestailleur
|
082b126c06
|
FIX Can't switch page when html editing without save or cancel
|
2019-01-03 22:39:51 +01:00 |
|
Regis Houssin
|
483c6ef257
|
FIX wrong field name for WEBSITE_VIRTUALHOST
Signed-off-by: Regis Houssin <regis.houssin@inodbox.com>
|
2019-01-02 14:43:54 +01:00 |
|
Laurent Destailleur
|
3ae03d619d
|
Fix tooltip
|
2018-12-18 11:03:23 +01:00 |
|
Laurent Destailleur
|
c444ef3b4d
|
FIX wrapper could not download shared files
|
2018-12-17 19:37:17 +01:00 |
|
Laurent Destailleur
|
ffaff4dc7f
|
Debug website module
|
2018-12-17 17:29:04 +01:00 |
|
Laurent Destailleur
|
4a873917ce
|
Fix import
|
2018-12-04 12:40:36 +01:00 |
|
Laurent Destailleur
|
2dc6351593
|
Fix website import
|
2018-11-30 15:16:17 +01:00 |
|
Laurent Destailleur
|
7a4c1cddc8
|
Fix save master file of a website
|
2018-11-30 14:46:44 +01:00 |
|
Laurent Destailleur
|
e8d29c644b
|
Fix grab web site
|
2018-11-30 14:30:00 +01:00 |
|
Laurent Destailleur
|
a4fc564048
|
css
|
2018-11-27 18:04:45 +01:00 |
|
Laurent Destailleur
|
780a538fe0
|
Fix multicompany not accessible from website.
|
2018-11-27 17:37:39 +01:00 |
|
Laurent Destailleur
|
70bd931d08
|
FIX empty page due to preg_replace JIT error on large strings
|
2018-11-27 16:20:31 +01:00 |
|
Laurent Destailleur
|
62e39f5a31
|
Fix title
|
2018-11-26 14:37:19 +01:00 |
|
Laurent Destailleur
|
a06b032c23
|
fix trans
|
2018-11-23 10:53:04 +01:00 |
|
Laurent Destailleur
|
61fddadc3f
|
Complete the fetchAll of modulebuilder + websitepage
|
2018-11-20 18:29:29 +01:00 |
|
Laurent Destailleur
|
200de22807
|
Missing image in container
|
2018-11-20 16:48:34 +01:00 |
|
Laurent Destailleur
|
8ecd5ffa3b
|
FIX Missing button cancel
|
2018-11-20 13:41:38 +01:00 |
|
Laurent Destailleur
|
1f6ccd4a66
|
Fix permission to edit websites
|
2018-11-14 13:58:00 +01:00 |
|
Laurent Destailleur
|
224d37cfeb
|
Add bootstrap-iso class
|
2018-11-08 12:12:08 +01:00 |
|
Laurent Destailleur
|
66ffcf287a
|
Fix filter on extrafields
|
2018-11-07 12:49:17 +01:00 |
|
Laurent Destailleur
|
4a25317f10
|
Fix security on GETPOST('action'). Param must be sanitized.
|
2018-11-05 20:29:07 +01:00 |
|
Laurent Destailleur
|
c0f4ec5a3e
|
FIX sanitize param $action
|
2018-11-05 17:53:31 +01:00 |
|
Frédéric FRANCE
|
86d854f3f4
|
Squiz.WhiteSpace.ControlStructureSpacing.SpacingBeforeClose
|
2018-10-24 23:04:26 +02:00 |
|
Laurent Destailleur
|
985ab1efda
|
FIX delete of a file in file_manager return to same dir
|
2018-10-19 10:59:34 +02:00 |
|
Philippe GRAND
|
729ff0b9bb
|
Merge remote-tracking branch 'upstream/develop' into new_branch_10_10_2018
|
2018-10-16 14:20:11 +02:00 |
|
Laurent Destailleur
|
96ddebad4a
|
Set canonical tag
|
2018-10-15 17:48:39 +02:00 |
|
Laurent Destailleur
|
a20498126a
|
Fix init var
|
2018-10-15 13:40:22 +02:00 |
|
Laurent Destailleur
|
ab807ada07
|
Work on translation
|
2018-10-14 23:26:57 +02:00 |
|
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 |
|