Laurent Destailleur
|
f97ecd0a45
|
The css files is also parsed with function to clean images
|
2017-07-21 20:16:53 +02:00 |
|
Laurent Destailleur
|
2514c02817
|
Fix when there is several php part in same page
|
2017-07-21 19:01:06 +02:00 |
|
Laurent Destailleur
|
f3271791f8
|
Work on website module
|
2017-07-21 18:33:45 +02:00 |
|
Laurent Destailleur
|
c83ab91052
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-21 17:55:55 +02:00 |
|
Laurent Destailleur
|
b9df364fbe
|
Fix include
|
2017-07-21 17:55:43 +02:00 |
|
Laurent Destailleur
|
a2b450a2a1
|
Merge pull request #7123 from defrance/patch-21
Adding Hook for tooltip on project
|
2017-07-21 15:18:27 +02:00 |
|
Laurent Destailleur
|
874e96fc38
|
Merge branch 'develop' into patch-21
|
2017-07-21 15:18:18 +02:00 |
|
Laurent Destailleur
|
929d14c816
|
Merge pull request #7078 from atm-florian/dev_prodlist
NEW : filter on extrafield on product list (as in company list)
|
2017-07-21 15:15:11 +02:00 |
|
Laurent Destailleur
|
6d97deb1c3
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-21 15:13:14 +02:00 |
|
Laurent Destailleur
|
1851080b31
|
Merge pull request #7152 from dolibarr95/patch-14
'int' for $rate variable
|
2017-07-21 15:07:00 +02:00 |
|
Laurent Destailleur
|
5965bec501
|
Update multicurrency.php
|
2017-07-21 15:06:53 +02:00 |
|
Laurent Destailleur
|
3716645b8b
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-21 15:03:21 +02:00 |
|
Laurent Destailleur
|
dc7e00ccc6
|
Merge pull request #7178 from atm-florian/fix_save_attachement_in_event_sendbymail
fix missing line into PR #6012
|
2017-07-21 15:00:56 +02:00 |
|
Laurent Destailleur
|
5f4dd26303
|
Merge pull request #7182 from hregis/develop_trad
NEW add specific translation for title of documents (Invoice, Order, Proposal)
|
2017-07-21 14:59:58 +02:00 |
|
Laurent Destailleur
|
094e55f326
|
Merge pull request #7179 from camlafit/patch-rib
Allow RUM on creation
|
2017-07-21 14:58:56 +02:00 |
|
Laurent Destailleur
|
d07741ada1
|
Merge branch 'develop' into patch-rib
|
2017-07-21 14:58:33 +02:00 |
|
Laurent Destailleur
|
27682d9ef3
|
Update rib.php
|
2017-07-21 14:52:54 +02:00 |
|
Laurent Destailleur
|
aacef21cb8
|
Can clone a page
|
2017-07-21 13:38:13 +02:00 |
|
Laurent Destailleur
|
0d15bf5de1
|
Fix ducplicate code
|
2017-07-21 12:55:50 +02:00 |
|
Laurent Destailleur
|
374e46af00
|
Fix ducplicate code
|
2017-07-21 12:53:15 +02:00 |
|
Laurent Destailleur
|
168f167934
|
Tooltip
|
2017-07-21 12:42:21 +02:00 |
|
Laurent Destailleur
|
058e88c6f3
|
Fix title in html header
|
2017-07-21 12:26:11 +02:00 |
|
Laurent Destailleur
|
23d9353a3d
|
Fix title in html header
|
2017-07-21 12:21:48 +02:00 |
|
Laurent Destailleur
|
a6960187f4
|
Fix missing css
|
2017-07-21 12:01:16 +02:00 |
|
Laurent Destailleur
|
827e04f130
|
Fix missing css
|
2017-07-21 11:58:55 +02:00 |
|
Regis Houssin
|
48d79357a0
|
New: add specific translation for title of documents
|
2017-07-21 10:03:09 +02:00 |
|
Laurent Destailleur
|
302ee97d31
|
Debug module website
|
2017-07-21 02:51:56 +02:00 |
|
Laurent Destailleur
|
522f21e528
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/public/websites/index.php
|
2017-07-21 02:32:01 +02:00 |
|
Laurent Destailleur
|
28254655e9
|
Debug module website
|
2017-07-21 02:30:02 +02:00 |
|
Laurent Destailleur
|
5318e513c1
|
Debug module website
|
2017-07-21 02:29:24 +02:00 |
|
Laurent Destailleur
|
1fd3ab56a8
|
Fix edit of css and htmlheader
|
2017-07-21 00:01:27 +02:00 |
|
Laurent Destailleur
|
df61a5f045
|
Debug module website
|
2017-07-20 20:05:49 +02:00 |
|
Laurent Destailleur
|
dfb49fc47b
|
Fix update tms
|
2017-07-20 18:36:18 +02:00 |
|
Laurent Destailleur
|
7760594643
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/langs/en_US/website.lang
htdocs/theme/eldy/style.css.php
htdocs/websites/class/website.class.php
htdocs/websites/index.php
|
2017-07-20 18:31:58 +02:00 |
|
Laurent Destailleur
|
fa3ed50f3a
|
Fix sql syntax
|
2017-07-20 18:23:42 +02:00 |
|
Laurent Destailleur
|
2f3128410b
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-20 16:49:56 +02:00 |
|
Laurent Destailleur
|
3b8f60f90e
|
Fix pb of recursive include in website module
|
2017-07-20 16:49:20 +02:00 |
|
Laurent Destailleur
|
2621c55bf4
|
Link of preview is enabled only if setup is correct.
|
2017-07-20 11:51:30 +02:00 |
|
Laurent Destailleur
|
1e7aa4d9b4
|
Work on module website
|
2017-07-19 16:38:00 +02:00 |
|
Laurent Destailleur
|
84f621fde3
|
Fix migration on pgsql
|
2017-07-19 16:31:15 +02:00 |
|
cam.lafit
|
f0d95fcbd9
|
fixup! Allow RUM on creation step
|
2017-07-19 16:29:56 +02:00 |
|
cam.lafit
|
69aed8ac7f
|
Allow RUM on creation step
* close #4932
|
2017-07-19 16:27:34 +02:00 |
|
Laurent Destailleur
|
74db61ce15
|
Fix translation
|
2017-07-19 15:50:57 +02:00 |
|
florian HENRY
|
f701a52d2d
|
fix missing line into PR 6012
|
2017-07-18 19:33:25 +02:00 |
|
Laurent Destailleur
|
1bc2bba953
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-18 15:15:50 +02:00 |
|
Laurent Destailleur
|
6665416d97
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2017-07-18 15:15:31 +02:00 |
|
Laurent Destailleur
|
1c5148bb1e
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0
|
2017-07-18 15:13:46 +02:00 |
|
Laurent Destailleur
|
6e77dab832
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0
|
2017-07-18 15:13:15 +02:00 |
|
Laurent Destailleur
|
7e1d282b1b
|
Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-07-18 15:12:28 +02:00 |
|
Laurent Destailleur
|
e41b98b5d4
|
Merge branch '3.9' of git@github.com:Dolibarr/dolibarr.git into 4.0
|
2017-07-18 15:12:03 +02:00 |
|