Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-10 03:28:18 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,821 Commits 36 Branches 190 Tags
e83bb0f50c1b0b51a587a423183563f07f46a982
Commit Graph

44 Commits

Author SHA1 Message Date
Laurent Destailleur
16ce156631 Fix responsive design 2016-11-25 18:32:52 +01:00
Laurent Destailleur
348e004da6 Minor fixes in css 2016-11-12 16:39:08 +01:00
Laurent Destailleur
220d81b350 Fix duplicate tooltips 2016-10-28 17:43:29 +02:00
Laurent Destailleur
97e396af69 Work on module website 2016-09-17 21:03:20 +02:00
Laurent Destailleur
d0136f5c85 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/websites/index.php
 2016-09-16 01:23:54 +02:00
Laurent Destailleur
72aacb81ae NEW Can use native php and dolibarr object on pages of module website. 2016-09-16 01:13:52 +02:00
Laurent Destailleur
a97161b044 NEW Can use native php and dolibarr object on pages of module website. 2016-09-16 01:00:24 +02:00
Laurent Destailleur
68b3de5b37 NEW ckeditor accept a parameter to disable all html filtering 2016-09-15 23:23:10 +02:00
Laurent Destailleur
8a32391171 Work on website module 2016-09-15 19:27:04 +02:00
Laurent Destailleur
621ba7b76f Work on module website 2016-09-15 09:33:00 +02:00
Laurent Destailleur
22df7d7a68 Work on module website 2016-09-14 23:42:17 +02:00
Laurent Destailleur
4228a51f18 Work on module website 2016-09-14 23:23:22 +02:00
Laurent Destailleur
4d4fc87e2b Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/fourn/commande/dispatch.php
	htdocs/product/stock/productlot_list.php
	htdocs/websites/index.php
 2016-08-09 13:26:08 +02:00
Laurent Destailleur
54b47d7f4f Fix edit of page in module website 
Conflicts:
	htdocs/websites/class/website.class.php
 2016-08-08 19:09:37 +02:00
Laurent Destailleur
fb3f6972eb Work on module website 
Conflicts:
	htdocs/websites/index.php
 2016-08-08 18:29:24 +02:00
Laurent Destailleur
50a7046bd4 Fix edit of page in module website 2016-08-08 18:25:37 +02:00
Laurent Destailleur
13bbd5059b Work on module website 2016-08-08 14:21:43 +02:00
Laurent Destailleur
7e9dbb4d2a Fix bad encoding of param 2016-07-15 10:23:53 +02:00
Laurent Destailleur
a5123c06db Save the virtualhost so we can test without entering it each time. 2016-07-14 19:42:04 +02:00
Laurent Destailleur
ec6640af63 Add field virtualhost for website module 2016-07-14 15:54:46 +02:00
Laurent Destailleur
f256de323e Fix management of preview for website module 2016-07-14 13:03:37 +02:00
Laurent Destailleur
9a75d40d56 Fix switching between web sites 2016-07-02 12:21:47 +02:00
Laurent Destailleur
25dfa0c5b9 Work on website 2016-05-07 16:38:32 +02:00
Laurent Destailleur
bf09e4a0b9 PHPdoc 2016-05-06 21:28:06 +02:00
Florian HENRY
fda5e6002f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/websites/index.php
 2016-05-02 20:27:34 +02:00
Laurent Destailleur
d69904c14d Can set the home page of web sites 2016-05-02 15:51:18 +02:00
Laurent Destailleur
5823055cdf Work on website module. 2016-05-01 21:19:29 +02:00
Laurent Destailleur
170dc467ff Better code for website edition 2016-05-01 19:49:03 +02:00
Laurent Destailleur
3045449dbb Work on website module. Can delete a page. 2016-05-01 17:01:38 +02:00
Laurent Destailleur
f59f3032c6 NEW: Rename path for generic medias files into '/medias' instead of 
fckeditor. Add location of medias into title of media browser of
ckeditor.
Work on website module
 2016-05-01 16:34:50 +02:00
Laurent Destailleur
3c927fbe0e Debug website module 2016-04-29 20:35:38 +02:00
Florian HENRY
b01c7572f7 FIX travis 2016-04-29 10:21:39 +02:00
Florian HENRY
717eaa3d81 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/websites/class/websitepage.class.php
 2016-04-28 10:32:31 +02:00
Laurent Destailleur
7770d95b18 FIX PHPCS 2016-04-27 16:56:09 +02:00
Florian HENRY
1d75c5f720 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into 
develop

Conflicts:
	htdocs/core/class/commonobject.class.php
 2016-04-27 09:41:42 +02:00
Laurent Destailleur
bcb4b2b607 Work on website module 2016-04-23 21:34:10 +02:00
Laurent Destailleur
c939273fd5 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2016-04-22 13:38:56 +02:00
Laurent Destailleur
78d18185e4 Several css enhancements 2016-04-22 11:11:08 +02:00
Laurent Destailleur
c2de7adb32 Minor PHPCS fixes 2016-04-21 03:18:42 +02:00
Laurent Destailleur
4619040983 Work on website module 2016-04-19 18:41:05 +02:00
Laurent Destailleur
87702f89fc Work on website module 2016-04-12 19:17:50 +02:00
Laurent Destailleur
c28c8d5d18 Add more info into log 2016-02-02 16:32:47 +01:00
Laurent Destailleur
1fb1da5be4 Work on website module 2016-02-02 16:24:12 +01:00
Laurent Destailleur
ba833dc412 Work on CMS module 2016-01-24 21:35:41 +01:00