Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
54,329 Commits 36 Branches 189 Tags
9b1caefbf9c68ba433333efbeb125cb15d4b10dd
Commit Graph

22 Commits

Author SHA1 Message Date
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