Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity
82,240 Commits 36 Branches 189 Tags
f94b3e55b980e9bec05352cb15a2bc338fb746e4
Commit Graph

3135 Commits

Author SHA1 Message Date
John BOTELLA
6b98eecd32 fix compatibility status 2019-03-05 16:58:05 +01:00
John BOTELLA
7a4540088a Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-05 15:37:17 +01:00
John BOTELLA
95981ca14c PR feedback 2019-03-05 15:26:19 +01:00
Laurent Destailleur
7d37b4c46d CSS 2019-03-05 13:04:54 +01:00
Frédéric FRANCE
bdba88a6d5 remove warning 2019-03-04 18:23:52 +01:00
Frédéric FRANCE
5dc3cbcdfc remove warning 2019-03-04 18:22:59 +01:00
Laurent Destailleur
27402f432a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/product/stock/card.php
	htdocs/theme/eldy/style.css.php
 2019-03-04 16:29:16 +01:00
Laurent Destailleur
07dca25b96 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 9.0 2019-03-04 16:20:49 +01:00
John BOTELLA
7cadaca8fc Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-04 11:37:16 +01:00
John BOTELLA
e70ca9f67e fix travis errors 2019-03-04 11:21:26 +01:00
Laurent Destailleur
d502d10da4 CSS 2019-03-03 21:05:33 +01:00
Laurent Destailleur
83fc10e917 css 2019-03-03 13:38:45 +01:00
Laurent Destailleur
03237d1730 NEW Look and feel v10 - Add CSS tabBarNoTop 2019-03-02 18:20:13 +01:00
Laurent Destailleur
5f6ca1119a Replace arrow picto with fontawesome 2019-03-02 14:07:13 +01:00
Laurent Destailleur
56d921ea52 CSS 2019-03-02 12:57:07 +01:00
John BOTELLA
421c009e58 Standardise new function name 2019-03-01 15:33:23 +01:00
John BOTELLA
162c3249cf Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-01 13:49:42 +01:00
John BOTELLA
8ca3049382 update badge doc 2019-03-01 12:06:25 +01:00
John BOTELLA
b222c44bb9 Add helper functions and little review size of badges 2019-03-01 12:01:25 +01:00
John BOTELLA
237bc23463 fix doc 2019-02-28 16:15:08 +01:00
John BOTELLA
2658e9d85e fix doc 2019-02-28 16:08:21 +01:00
John BOTELLA
3e30b9c03c add badge status generator and doc 2019-02-28 16:04:26 +01:00
John BOTELLA
51af399e82 Add color vars 2019-02-28 12:31:57 +01:00
Laurent Destailleur
fb726b99c7 Fix css 2019-02-27 14:28:46 +01:00
Laurent Destailleur
70744a8ca0 CSS 2019-02-27 13:58:26 +01:00
John BOTELLA
9f0a93f68f Add color lib for color automation 2019-02-26 17:44:16 +01:00
Laurent Destailleur
3a2a1b4a56 Debug module ticket 2019-02-26 13:43:09 +01:00
John BOTELLA
3ff94fa5fc Fix travis 2019-02-26 10:14:15 +01:00
John BOTELLA
3e4983f073 Prepare badge standard 2019-02-25 17:38:04 +01:00
John BOTELLA
81aab86a67 Add fontawesome support for menu top btn 2019-02-25 15:21:59 +01:00
John BOTELLA
1da6a2bcee clean tooltip : remove drooling edge 2019-02-22 14:06:01 +01:00
John BOTELLA
1457b5d6d7 Add svg menu bg support for main feature level 2 only 2019-02-22 11:43:52 +01:00
John BOTELLA
f3f9fcbb1b Split style.css 2019-02-21 17:50:37 +01:00
John BOTELLA
0fa6b9cd6d factor css and allow use vars 2019-02-21 16:55:17 +01:00
Laurent Destailleur
e42487ae4e CSS 2019-02-20 05:26:27 +01:00
Laurent Destailleur
4296f959ca Invert option MAIN_HIDE_VERSION into ! MAIN_SHOW_VERSION 
Reorganize levels of menu accountancy
 2019-02-20 04:55:35 +01:00
Laurent Destailleur
72ec437447 Remove unwanted files 2019-02-15 16:42:51 +01:00
Laurent Destailleur
a40d4ddbaa Fix phpcs 2019-02-08 12:23:04 +01:00
Laurent Destailleur
5043aa7b35 Fix regression for icon of external menus 2019-02-08 12:17:11 +01:00
Laurent Destailleur
78fbeeaa62 Fix syntax error 2019-02-08 11:57:39 +01:00
Laurent Destailleur
b3f955e9a5 Fix syntax error 2019-02-08 11:55:27 +01:00
Laurent Destailleur
fbd2d368e4 Update style.css.php 2019-02-08 10:19:59 +01:00
Laurent Destailleur
8143acbadf Merge branch 'develop' into feature/9429_top_menu_icons 2019-02-08 10:15:09 +01:00
Laurent De Coninck
48eba7c71b use font awesome for the top menu icons 2019-02-08 08:41:26 +01:00
Frédéric FRANCE
f5b2cf75f2 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-01 18:31:44 +01:00
Laurent Destailleur
eb3621839a Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/langs/en_US/members.lang
	htdocs/langs/fr_FR/members.lang
 2019-02-01 15:14:19 +01:00
Laurent Destailleur
189323ad58 Fix when using image into description 2019-01-31 18:12:34 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +01:00
Laurent Destailleur
408609e0ec Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/core/tpl/objectline_edit.tpl.php
 2019-01-30 16:54:38 +01:00
Laurent Destailleur
e72d6c50e6 Merge pull request #10428 from frederic34/toomanylines 
PSR2.Files.EndFileNewline.TooMany
 2019-01-30 16:17:09 +01:00