Commit Graph

3991 Commits

Author SHA1 Message Date
Laurent Destailleur
67fbb3dbb6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/class/notify.class.php
	htdocs/core/modules/project/doc/doc_generic_project_odt.modules.php
2018-11-03 19:15:52 +01:00
Laurent Destailleur
1140735554 Fix css 2018-11-01 15:20:05 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Laurent Destailleur
5d249d71ca Fix menu at wrong place 2018-10-26 14:38:26 +02:00
De Coninck Laurent
35bf07bab6 migrate fontawesome to 5.4.1
migrate the fontawesome to the latest library in the idea to use the last one (more complete) to use fontawesome icons instead of images.

Font awesome 5.4.1 is leighter than the previous loaded version.
2018-10-25 17:54:29 +02:00
Laurent Destailleur
65a39269d9 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop

Conflicts:
	htdocs/core/class/commondocgenerator.class.php
2018-10-24 03:39:33 +02:00
Laurent Destailleur
01adaf253c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/product/list.php
2018-10-24 03:35:44 +02:00
Laurent Destailleur
f8316abfc0 Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
	htdocs/compta/bank/class/account.class.php
	htdocs/theme/md/style.css.php
2018-10-24 02:58:29 +02:00
Laurent Destailleur
919c4fc5bc Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
	htdocs/theme/md/style.css.php
2018-10-24 02:40:57 +02:00
Laurent Destailleur
2ba6f96765 Update style.css.php 2018-10-24 02:27:59 +02:00
Frédéric FRANCE
83e2951107 Update style.css.php 2018-10-21 09:59:14 +02:00
Frédéric FRANCE
28c86a613d Update style.css.php 2018-10-21 09:39:07 +02:00
Frédéric FRANCE
c4029f5e5f Update style.css.php 2018-10-21 09:23:33 +02:00
ias-ceo
cce2e2414f missing simicolon 2018-10-21 07:41:40 +03:00
Laurent Destailleur
66cb06eca9 NEW Top menu is always on screen with MD theme. 2018-10-18 17:33:14 +02:00
Laurent Destailleur
8779d3043f css 2018-10-13 14:22:26 +02:00
Laurent Destailleur
1ca3a41f4f Fix login 2018-10-13 14:16:42 +02:00
Laurent Destailleur
ded5c4c3dd Social network module 2018-10-12 11:02:03 +02:00
Laurent Destailleur
f154139a0e Reduce length of tab title "Bank" 2018-10-04 20:22:25 +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
5f897eb7ee Clean code 2018-10-01 00:40:02 +02:00
Laurent Destailleur
f32ccf935a CSS 2018-09-28 23:06:57 +02:00
Laurent Destailleur
aaa5efc77e Clean Take pos module 2018-09-28 22:06:04 +02:00
Laurent Destailleur
f990719daa Add experimental module TakePOS 2018-09-28 13:31:41 +02:00
Laurent Destailleur
b4b6e900f9 css 2018-09-25 11:42:19 +02:00
Laurent Destailleur
ea517da85c Work on filemanager for websites 2018-09-24 15:14:32 +02:00
Laurent Destailleur
5bd538fb2c Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	ChangeLog
	htdocs/core/modules/modStripe.class.php
	htdocs/filefunc.inc.php
	htdocs/projet/element.php
2018-09-20 23:43:34 +02:00
Laurent Destailleur
df395847d3 FIX #9567 2018-09-20 19:14:32 +02:00
Laurent Destailleur
497ab37204 css 2018-09-20 15:11:26 +02:00
Laurent Destailleur
8793b9e26a css 2018-09-20 15:07:42 +02:00
Laurent Destailleur
9e01ea9180 css 2018-09-20 12:04:27 +02:00
Laurent Destailleur
d4ffc5e088 css 2018-09-20 00:48:00 +02:00
Laurent Destailleur
19ec5103ad css 2018-09-19 18:06:36 +02:00
Laurent Destailleur
22053e0f4d CSS 2018-09-19 17:53:24 +02:00
Laurent Destailleur
09a41fd757 Look and feel v8 2018-09-19 17:33:50 +02:00
Laurent Destailleur
12b449fe49 It's easier to select fields to show on list 2018-09-19 16:41:33 +02:00
Laurent Destailleur
a8ecec68e7 css 2018-09-18 11:58:26 +02:00
Laurent Destailleur
2f06e58237 css 2018-09-17 16:31:58 +02:00
Laurent Destailleur
d872beb499 Fix css 2018-09-17 12:59:43 +02:00
Laurent Destailleur
a75629e8e9 CSS 2018-09-17 12:25:49 +02:00
Laurent Destailleur
bbfe4462dc NEW Add lib for multiselect with checkboxes
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
2018-09-15 13:31:25 +02:00
Laurent Destailleur
78e983a1f5 CSS v9 2018-09-13 16:39:50 +02:00
Laurent Destailleur
b4264ee0a0 Use font awesome for sort image 2018-09-12 21:57:32 +02:00
Laurent Destailleur
9d9e2bc3e3 Merge pull request #9405 from fmarcet/develop
NEW: Highlight lines on lists when they are checked
2018-09-12 20:50:42 +02:00
Laurent Destailleur
47cfda6734 Webiste 2018-09-10 09:09:51 +02:00
Laurent Destailleur
f9e2fb7a36 Style 2018-09-10 01:16:32 +02:00
Ferran Marcet
b658626e21 NEW: Highlight lines on lists when they are checked 2018-09-04 11:54:13 +02:00
Frédéric FRANCE
6f74ecceaf Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-12 18:21:59 +02:00
Laurent Destailleur
61d7629ab1 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/list.php
2018-08-08 17:44:22 +02:00
Laurent Destailleur
63898b205e Clean ckeditor menu 2018-08-08 17:09:51 +02:00