lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
78,597 Commits 43 Branches 150 Tags 886 MiB
10.5
Commit Graph

2908 Commits

Author SHA1 Message Date
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
Laurent Destailleur
c5bd11951f Fix bar not visible on some screen 2018-11-29 02:09:07 +01:00
Laurent Destailleur
af2150a427 CSS 2018-11-29 00:45:15 +01:00
Laurent Destailleur
3650543749 CSS 2018-11-28 22:51:24 +01:00
Laurent Destailleur
23126fe49a CSS 2018-11-28 17:14:13 +01:00
Laurent Destailleur
ca1f9c7e60 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/don/class/don.class.php
	htdocs/langs/es_ES/admin.lang
	htdocs/langs/es_ES/sendings.lang
	htdocs/langs/es_ES/stocks.lang
 2018-11-28 16:57:39 +01:00
Laurent Destailleur
b9c08853be CSS 2018-11-28 16:54:21 +01:00
Laurent Destailleur
28902e18ee Fix for screen with antiblue system 2018-11-28 16:32:53 +01:00
Philippe GRAND
a59a4c60e0 FIX : Typo errors 2018-11-26 16:09:05 +01:00
Regis Houssin
89389baeac Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into develop_email 2018-11-09 15:37:29 +01:00
Laurent Destailleur
6401a7ab06 Fix css 2018-11-08 16:03:10 +01:00
Laurent Destailleur
5bbf7e8f1d Fix look and feel v8 2018-11-08 10:21:43 +01:00
John BOTELLA
abb6b41f91 Fix screen size fall 2018-11-07 11:25:13 +01:00
Laurent Destailleur
1e801c7c8a Fix css 2018-11-06 16:50:31 +01:00
Laurent Destailleur
f4346c1469 Fix css 2018-11-03 19:24:28 +01:00
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