Commit Graph

3155 Commits

Author SHA1 Message Date
Laurent Destailleur
210effc742 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-08-30 04:18:23 +02:00
Laurent Destailleur
906506b74c Fix alignement of legend 2019-08-30 04:14:45 +02:00
Laurent Destailleur
9fd4f839ec Use css "pictomodule" for picto of modules 2019-08-28 19:28:50 +02:00
Laurent Destailleur
99fcab80d8 Fix icon size 2019-08-19 12:52:41 +02:00
Laurent Destailleur
cc3fd0f1f6
Merge pull request #11679 from atm-john/develop_new_task_progress_bar
FIX/NEW task widget and add task progress bar
2019-08-19 10:05:16 +02:00
Laurent Destailleur
6abfd8b145 Fix use short labels for workboard 2019-08-19 10:01:42 +02:00
Laurent Destailleur
2587dc041f Minor CSS fix 2019-08-19 09:46:22 +02:00
Laurent Destailleur
40f5bbc4bb Fix css 2019-08-18 07:05:49 +02:00
Laurent Destailleur
58573632ab Fix css 2019-08-18 06:00:33 +02:00
Laurent Destailleur
7e4cf224ec
Merge branch 'develop' into develop_new_task_progress_bar 2019-08-18 05:38:45 +02:00
Laurent Destailleur
75792ea42c Fix css 2019-08-18 05:33:40 +02:00
Laurent Destailleur
3f105a97bf Debug the new workboard 2019-08-18 04:56:48 +02:00
Laurent Destailleur
b8e1cc8d16 Enhance #11643 2019-08-18 03:42:38 +02:00
Laurent Destailleur
2285e0d780 Make colors less aggressive 2019-08-18 02:07:40 +02:00
Laurent Destailleur
5351d78a96
Merge branch 'develop' into develop_new_dashboard 2019-08-18 01:26:56 +02:00
Laurent Destailleur
d850b8a262 More neutral color 2019-08-16 07:02:10 +02:00
Laurent Destailleur
63e590810b Still too agressive 2019-08-16 06:51:32 +02:00
Laurent Destailleur
b8cc00eb66 Colors for graph are same by defaul than flashy, but less flashy. 2019-08-16 06:43:36 +02:00
Laurent Destailleur
e61f883561 Color 2019-08-16 06:25:58 +02:00
Laurent Destailleur
386f929fe3 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/comm/propal/class/propal.class.php
	htdocs/core/lib/website.lib.php
	htdocs/core/modules/facture/doc/pdf_sponge.modules.php
2019-08-15 23:39:02 +02:00
Laurent Destailleur
17f1962c34 Support theme colors for theme MD 2019-08-15 20:19:18 +02:00
Laurent Destailleur
c0ac8daa61 Introduce the color theme "flashy" to use the high contrast color as an
option because colors seems too agressive for sensible eyes.
2019-08-15 20:18:12 +02:00
Laurent Destailleur
91461cddd4
Merge pull request #11587 from atm-john/develop_theme
FIX Little css and images change
2019-08-15 20:05:44 +02:00
Laurent Destailleur
056626b8e3 Nicer toolbar for website menu 2019-08-15 18:59:08 +02:00
Laurent Destailleur
ca256a6635 Add shadow style 2019-08-15 01:58:22 +02:00
ATM john
4ccabca101 Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar 2019-08-13 16:04:10 +02:00
ATM john
717ea523e9 Fix lang and add size control 2019-08-13 15:54:32 +02:00
Regis Houssin
056f51bfc5 FIX duplicate css tag, decrease padding-bottom for boxes in eldy theme 2019-08-13 07:14:42 +02:00
ATM john
b193f1b34e Fix travis 2019-08-12 23:33:00 +02:00
ATM john
22c4a1b49e Merge branch 'develop_new_dashboard' of github.com:atm-john/dolibarr into develop_new_task_progress_bar 2019-08-11 09:57:13 +02:00
ATM john
3a21805a02 add style to md 2019-08-11 09:46:40 +02:00
ATM john
09c1289802 Fix task widget and improve its display 2019-08-10 22:48:07 +02:00
ATM john
527e4dcf46 Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop_new_task_progress_bar 2019-08-10 15:41:49 +02:00
ATM john
3f0f7e2ad5 Add progress bar for task list and visual status badges 2019-08-10 15:41:21 +02:00
John Botella
af4d5aa549 Fix color badges and status for color blind 2019-08-07 17:22:59 +02:00
John Botella
450878cd92 Fix color deuteranopia 2019-08-07 15:13:59 +02:00
John Botella
401dc12b93 Add color blind option in body for css impact 2019-08-07 12:15:55 +02:00
John Botella
63191dab7d Add user color blind option 2019-08-07 12:03:19 +02:00
John Botella
7866c2c0d3 change color 2019-08-06 15:42:12 +02:00
John Botella
cafd4fc599 New living color for chart 2019-08-06 15:24:42 +02:00
John Botella
a59ee48bc9 Fix position 2019-08-06 11:27:36 +02:00
John Botella
4ae818f7a6 Fix md theme missing style 2019-08-06 10:58:18 +02:00
John Botella
690d09be3e Fix md theme missing style 2019-08-06 10:36:24 +02:00
John Botella
83d0f1f27f Add weather 2019-08-02 12:22:26 +02:00
John Botella
6973e29b2c fix flex last line 2019-08-01 17:40:14 +02:00
John Botella
40ac24fc26 top dashboard info first result 2019-08-01 15:18:42 +02:00
John Botella
9b84987cc1 prepare new dashboard 2019-08-01 12:33:19 +02:00
John Botella
8b56ca8cd0 Little css and images change 2019-07-29 17:14:52 +02:00
Laurent Destailleur
db461792a0 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-29 01:36:35 +02:00
Laurent Destailleur
a63a6a5853 FIX Online payment 2019-07-28 23:49:05 +02:00
Laurent Destailleur
9f7d118f6f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-27 02:40:56 +02:00
Laurent Destailleur
2867e31a63 Fix CSS 2019-07-27 01:13:39 +02:00
Laurent Destailleur
865ebb9de2 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/ticket/class/ticket.class.php
2019-07-20 13:29:10 +02:00
Laurent Destailleur
220f8300c1 FIX Responsive of public interface of ticket 2019-07-20 00:14:14 +02:00
Laurent Destailleur
ee109ac568 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-05 17:44:50 +02:00
Laurent Destailleur
e3359c6f0f FIX Can't submit a ticket from public interface 2019-07-05 11:21:04 +02:00
Laurent Destailleur
9405ce335e Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-07-04 15:43:43 +02:00
Laurent Destailleur
512b832c77 CSS 2019-07-04 13:26:20 +02:00
Laurent Destailleur
06b3f6a62f Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/adherents/subscription/list.php
2019-06-25 13:03:54 +02:00
Laurent Destailleur
560f145a32 Fix css 2019-06-25 11:35:40 +02:00
Laurent Destailleur
cc64e0fe52 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-24 16:36:26 +02:00
Laurent Destailleur
293b3987e8 CSS 2019-06-24 16:28:54 +02:00
Laurent Destailleur
22b91f3693 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-06-22 13:28:44 +02:00
Laurent Destailleur
0f808114e5 Sync transifex
Fix CSS for Left To Right Languages
2019-06-22 13:18:33 +02:00
Laurent Destailleur
e64a4510d1
Merge pull request #11211 from atm-john/New_look_and_feel_form_validation
NEW: look and feel -> css for html5 ::invalid pseudo element
2019-06-20 03:48:56 +02:00
Laurent Destailleur
08d5ca4ddb Debug page to export accounting documents 2019-06-17 17:53:43 +02:00
Laurent Destailleur
1520ca9646 Fix buttons for payments 2019-06-07 13:51:53 +02:00
Laurent Destailleur
1415ad5b53 Debug website module 2019-06-02 17:27:00 +02:00
Laurent Destailleur
42306835d2 Fix CSS 2019-05-29 09:38:19 +02:00
Laurent Destailleur
d3318e6d60 CSS 2019-05-26 11:21:08 +02:00
Laurent Destailleur
cbb20a3587 CSS 2019-05-26 02:08:44 +02:00
Laurent Destailleur
d6aef89719 Fix css 2019-05-25 12:42:12 +02:00
Laurent Destailleur
728e270307 Fix css 2019-05-24 23:11:05 +02:00
Laurent Destailleur
4d8aba6963 Fix CSS 2019-05-22 11:48:31 +02:00
Laurent Destailleur
c3b9c08219 CSS 2019-05-21 21:36:48 +02:00
Laurent Destailleur
eafc35b00f Look and feel v10 2019-05-21 13:27:45 +02:00
Laurent Destailleur
54441a1abd Fix css 2019-05-21 12:36:18 +02:00
Laurent Destailleur
3c1b860da4 Fix css 2019-05-20 12:16:39 +02:00
Laurent Destailleur
6780befb2d Fix css 2019-05-19 21:59:03 +02:00
Laurent Destailleur
5f23cf7e2a CSS 2019-05-19 13:51:47 +02:00
Laurent Destailleur
d86fc28aba Fix CSS 2019-05-19 13:01:11 +02:00
ATM John BOTELLA
bdd4f3e297 add css for html5 ::invalid pseudo element 2019-05-18 18:59:55 +02:00
ATM John BOTELLA
584100807a Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_look_and_feel_appli 2019-05-18 16:18:21 +02:00
Laurent Destailleur
11fea03074
Merge pull request #11026 from atm-john/new_look_and_feel_title_button
NEW : look and feel title button
2019-05-18 16:04:47 +02:00
Laurent Destailleur
04f7261bfc Fix field date was not visible 2019-05-13 21:34:30 +02:00
Laurent Destailleur
278d4fdb8e Fix css 2019-05-13 20:55:05 +02:00
John BOTELLA
b0e780fab0 Fix travis 2019-05-13 09:39:45 +02:00
John BOTELLA
65252cd035 Merge branch 'develop' of github.com:Dolibarr/dolibarr into New_look_and_feel_appli 2019-05-10 15:58:28 +02:00
Laurent Destailleur
c3d80b217b Fix css 2019-05-09 18:00:40 +02:00
Laurent Destailleur
e42caf1dd9 CSS 2019-05-04 14:54:25 +02:00
Laurent Destailleur
e01476e10b CSS 2019-05-04 13:03:18 +02:00
Laurent Destailleur
5caae1f50d css 2019-05-04 12:42:16 +02:00
Laurent Destailleur
eab49d4300 NEW Update Stripe library to 6.34.3 2019-05-03 02:22:27 +02:00
Laurent Destailleur
9c45b781af Fix balance of colspan 2019-04-30 16:44:11 +02:00
Laurent Destailleur
c90dc13a21 CSS 2019-04-27 13:02:52 +02:00
Laurent Destailleur
ab1f371ea5 Fix encoding on expense report PDF 2019-04-24 20:58:27 +02:00
Laurent Destailleur
72025f6d5d Fix CSS 2019-04-23 15:54:24 +02:00
Laurent Destailleur
4d92d7731c Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/core/lib/sendings.lib.php
	htdocs/langs/en_US/admin.lang
	htdocs/theme/eldy/style.css.php
2019-04-23 12:32:08 +02:00
ATM john
965c973bda Change class name 2019-04-16 22:02:23 +02:00
ATM john
684879d73c apply appli btn to more elements 2019-04-16 21:49:26 +02:00
ATM john
07e6ce5460 Appli function to links 2019-04-15 21:33:31 +02:00
Laurent Destailleur
8e8fc7e557 Fix css 2019-04-13 12:48:44 +02:00
Laurent Destailleur
ebe8f27c16 Fix on smartphone 2019-04-13 10:29:09 +02:00
Laurent Destailleur
c787ed1793 FIX Upgrade ckeditor manually. Fix regression introduced by composer
past upgrade that download a bugged non official code of ckeditor.
2019-04-12 17:01:25 +02:00
Laurent Destailleur
76567b1d07 NEW Can filter on the date of period for social contributions 2019-04-12 12:51:48 +02:00
atm-arnaud
3d5006f8fc FIX Cursor pointer in payment screen for autofill 2019-04-12 09:51:01 +02:00
ATM john
bc4db54722 add more class 2019-04-11 21:29:01 +02:00
ATM john
3390ba0e77 Merge branch 'develop' of github.com:Dolibarr/dolibarr into new_look_and_feel_title_button 2019-04-11 21:16:42 +02:00
Laurent Destailleur
64759e4116 CSS 2019-04-11 13:04:54 +02:00
ATM john
29b31bd7ab New title button first step 2019-04-11 00:38:44 +02:00
Laurent Destailleur
bb4da33fac Add picto for BOM 2019-04-10 11:49:43 +02:00
Laurent Destailleur
ac25003d33 Dolibarize module ticket 2019-04-10 11:39:54 +02:00
Laurent Destailleur
861c1b412c CSS 2019-04-09 19:23:34 +02:00
Laurent Destailleur
ff629b2355 NEW Color for hover and for checked line is on by default 2019-04-09 15:57:26 +02:00
Laurent Destailleur
1ffb5a72d5 Replace image with font awesome 2019-04-05 14:45:54 +02:00
Laurent Destailleur
9e98421333 CSS 2019-04-05 11:09:58 +02:00
John BOTELLA
788e7a40a8 remove space 2019-04-04 11:47:07 +02:00
John BOTELLA
8a786758b7 NEW browser mobil app support 2019-04-04 11:45:54 +02:00
Laurent Destailleur
c5f5abc67d Fix css for MD theme 2019-04-03 14:37:38 +02:00
Laurent Destailleur
d7510016da Include files are named .inc.php 2019-04-03 13:29:49 +02:00
Laurent Destailleur
7120078b0f NEW Simplification of styles architcture: Showing or not the menuhider
is completely decided by CSS and screen size instead of PHP+CSS.
2019-04-03 13:26:50 +02:00
Laurent Destailleur
37b8796f3c NEW Add line total on list of payments 2019-04-02 17:54:34 +02:00
Laurent Destailleur
c07159fee9 Fix regression in timesheet. Keep extrafield of task for the moment. 2019-03-31 22:06:41 +02:00
Laurent Destailleur
c1157679e8 Show a chevron top/down after login 2019-03-30 14:30:06 +01:00
Laurent Destailleur
26e3f41f73 Translation 2019-03-29 16:18:47 +01:00
Laurent Destailleur
f27f65e8bf Responsive 2019-03-25 10:09:02 +01:00
Laurent Destailleur
82381533dd Better responsive 2019-03-25 09:14:28 +01:00
Laurent Destailleur
41223702d7 Use radio button to select file on expense report line 2019-03-24 15:02:53 +01:00
Laurent Destailleur
c1df84a165 Fix phpcs 2019-03-22 13:17:26 +01:00
Laurent Destailleur
3b4ea82741 Some fix on MAIN_TOP_MENU_DROPDOWN option 2019-03-22 11:49:10 +01:00
Laurent Destailleur
c43cf843a9 Merge branch 'theme_top_menu_login' of https://github.com/atm-john/dolibarr into atm-john-theme_top_menu_login 2019-03-22 11:15:02 +01:00
Laurent Destailleur
23ce97fb2d NEW Introduce css "nobottomiftotal" 2019-03-19 16:01:03 +01:00
Laurent Destailleur
70c2ffc816 FIX toggle of login_block was ko with eldy theme 2019-03-19 14:22:57 +01:00
Laurent Destailleur
c2badb57d7 NEW: Add module debugbar 2019-03-16 16:27:14 +01:00
Laurent Destailleur
e5567c7ee4 Fix typo 2019-03-16 14:48:41 +01:00
Laurent Destailleur
3b4bcc67c9
Merge pull request #10780 from atm-john/theme_sidebarr_toggle
NEW/FIX Theme sidebarr toggle
2019-03-15 19:41:39 +01:00
Laurent Destailleur
a2d6723ff3 WIP Link files to expense report lines 2019-03-15 15:07:52 +01:00
Frédéric FRANCE
9be780f47d
Update style.css.php 2019-03-14 09:18:51 +01:00
Frédéric FRANCE
bb14562f7b
Update global.inc.php 2019-03-14 09:17:40 +01:00
Laurent Destailleur
68cc7f0e89 Fix css 2019-03-13 13:53:29 +01:00
John BOTELLA
4495f0a755 Fix decoration 2019-03-12 16:43:09 +01:00
John BOTELLA
0d631a932c change filename 2019-03-12 14:09:43 +01:00
John BOTELLA
240162b347 Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu_login 2019-03-12 14:00:52 +01:00
John BOTELLA
288ce5c553 add more info 2019-03-12 14:00:26 +01:00
John BOTELLA
ef241f70e7 Add action open close top dropdown menu 2019-03-12 11:49:56 +01:00
Laurent Destailleur
73b6ad733f Make font awesome 5.7 used by default 2019-03-12 10:34:19 +01:00
Laurent Destailleur
d762766a56 Font awesome 5 by default 2019-03-12 10:11:34 +01:00
John BOTELLA
be2885c75b Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_sidebarr_toggle 2019-03-12 09:24:42 +01:00
Laurent Destailleur
47e3fa2bbf Upgrade font awesome to 5.7.2 2019-03-12 09:13:16 +01:00
Laurent Destailleur
6daa262779 Files for variables of themes were renamed from graph-color.php into
theme_vars.inc.php to match naming convention of extension .inc.php for
files to be included.
2019-03-11 20:32:25 +01:00
Laurent Destailleur
c6a269e4c4 Fix select of menu entry 2019-03-11 19:53:27 +01:00
Laurent Destailleur
0480b7ee4a CSS 2019-03-11 18:29:01 +01:00
John BOTELLA
d8223bfe98 init dropdown 2019-03-11 18:03:39 +01:00
John BOTELLA
5d7118340b Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-11 14:40:19 +01:00
Laurent Destailleur
d3479bebbc CSS 2019-03-10 23:47:27 +01:00
Laurent Destailleur
1bd422b8b9 CSS 2019-03-10 14:45:16 +01:00
John BOTELLA
03724c7ba4 Fix travis errors 2019-03-08 14:41:47 +01:00
John BOTELLA
56a40c7de8 Fix sidebar collapse behavior 2019-03-08 14:06:37 +01:00
John BOTELLA
1127716abf add support for md theme 2019-03-07 17:50:26 +01:00
John BOTELLA
218690db00 add css behavior 2019-03-07 17:05:27 +01:00
John BOTELLA
74c8754092 fix travis 2019-03-07 15:49:16 +01:00
Laurent Destailleur
8d0a8d8263
Merge pull request #10758 from altatof/lf
NEW : add constant MAIN_DEFAULT_LANGUAGE_FILTER
2019-03-07 14:18:26 +01:00
John BOTELLA
89157234b7 Merge branch 'develop' of github.com:Dolibarr/dolibarr into theme_top_menu 2019-03-07 09:33:11 +01:00
Laurent Destailleur
9ffac1ca4a
Merge pull request #10750 from altatof/themefix
FIX : allow eldy theme stylesheet to be included in custom themes
2019-03-06 18:10:41 +01:00
Christophe Battarel
b4397806fc bad branching 2 2019-03-06 17:14:05 +01:00
Christophe Battarel
0f8f4fbc15 bad branching 2019-03-06 17:12:39 +01:00
John BOTELLA
efed7ae6aa Fix tabs badges 2019-03-06 16:00:09 +01:00
Laurent Destailleur
d4409ffb08 Restore menu MRP on new eldy code 2019-03-06 14:18:58 +01:00
Christophe Battarel
6c6a1a02f0 allow this script to be included in custom themes 2019-03-06 11:06:35 +01:00
Frédéric FRANCE
0c2a77cb53
Merge remote-tracking branch 'upstream/develop' into patch-2 2019-03-05 18:14:15 +01:00
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
Laurent Destailleur
0fbf578edb
Merge pull request #10425 from tarrsalah/fix-css-on-disable-topmenu-images
FIX css in the case of not showing topmenu images.
2019-01-30 16:15:40 +01:00
Laurent Destailleur
648eea3a70
Merge branch 'develop' into nospaceaftercomma 2019-01-30 16:00:11 +01:00
Alexandre SPANGARO
cc88c4f8ff Move my email to the new one 2019-01-28 21:39:22 +01:00
Frédéric FRANCE
496fa9b0fb
PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
tarrsalah
88da5f25d8 FIX css in the case of not showing topmenu images. 2019-01-27 13:18:50 +01:00
Frédéric FRANCE
7ee086b402
PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Laurent Destailleur
f9686c47af Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	htdocs/langs/fr_FR/members.lang
	htdocs/langs/fr_FR/stocks.lang
	htdocs/website/index.php
2019-01-23 19:22:42 +01:00
Laurent Destailleur
278b3e0b08 Fix css 2019-01-23 15:30:54 +01:00
Laurent Destailleur
c372b56a3a CSS 2019-01-17 17:23:37 +01:00
Laurent Destailleur
00706a5ad4 css 2019-01-17 12:58:15 +01:00
ATM-Nicolas
2a7b3c7d7d FIX : Check for old picture name if the new one was not found 2019-01-14 10:48:34 +01:00
Laurent Destailleur
db593bf45d CSS v10 2019-01-14 00:32:52 +01:00
ldestailleur
ab9fe1a757 Add option to use fontawesome 5 with fontawesome 4 2019-01-03 21:14:59 +01:00
Laurent Destailleur
af6a7446ee
Merge pull request #9871 from laudeco/feature/fontawesome_migration
migrate font awesome to 5.4.1
2018-12-22 19:52:39 +01:00
Laurent Destailleur
44a6644969 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-12-18 21:55:53 +01:00
Laurent Destailleur
2d2b95a082 Fix calculation of top menu entry of user 2018-12-18 17:01:57 +01:00
Laurent Destailleur
90e87fc4d9 Fix cache 2018-12-18 15:15:33 +01:00
Laurent Destailleur
57c41bac56 Fix parameter session_cache_limiter 2018-12-18 15:07:32 +01:00
Laurent Destailleur
16496218d3 css 2018-12-18 13:21:00 +01:00
Laurent Destailleur
f55db6dd84 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
	dev/resources/dbmodel/dolibarr_schema.mwb
2018-12-15 14:09:16 +01:00
Laurent Destailleur
2a3b808da6 CSS 2018-12-15 14:05:23 +01:00
Laurent Destailleur
e069da69ba Revert "Fix screen size fall"
This reverts commit abb6b41f91.
2018-12-15 12:35:37 +01:00
John BOTELLA
4fa10296f4 Fix screen size fall 2018-12-15 12:34:41 +01:00
Laurent Destailleur
dbe5d285e8
Merge pull request #9965 from atm-john/fix_responsive
FIX screen size fall
2018-12-15 12:33:35 +01:00
Laurent Destailleur
98c14efa78 Fix missing picto 2018-12-11 14:10:20 +01:00
Laurent Destailleur
250725663d FIX Missing generic css 2018-12-11 13:48:12 +01:00
Laurent Destailleur
e2e22f95d1 FIX Workaround for flex bug 2018-12-10 13:18:34 +01:00
Laurent Destailleur
9e20d9e847 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-11-29 11:03:16 +01:00
Laurent Destailleur
10fc0149d8 responsive 2018-11-29 11:03:02 +01:00
Laurent Destailleur
ef3a280f40
Merge pull request #10082 from grandoc/new_branch_26_11_2018
fix typo error
2018-11-29 10:57:48 +01:00