Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-12-06 01:28:19 +01:00
Code Issues Packages Projects Releases Wiki Activity
77,891 Commits 36 Branches 190 Tags
f51a68ceb10fe32d67e6c47c0ea74f9fe114ea2d
Commit Graph

418 Commits

Author SHA1 Message Date
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00
Laurent Destailleur
2bbb04085e Merge branch '9.0' of https://github.com/dolibarr/dolibarr into develop 
Conflicts:
	htdocs/core/menus/standard/eldy.lib.php
	htdocs/modulebuilder/template/class/myobject.class.php
 2019-05-19 02:15:01 +02:00
Maxime Kohlhaas
ea1efa5e88 Fix missing dashboard stats for holidays 2019-05-18 17:06:33 +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
8442c86436 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.formmail.class.php
	htdocs/core/lib/functions.lib.php
	htdocs/index.php
 2019-05-02 17:40:41 +02:00
Laurent Destailleur
4899d03ff8 FIX Confusion between expired and late 2019-05-02 17:15:24 +02:00
Laurent Destailleur
7c7c4f0d93 Removed warnings 2019-04-23 10:24:16 +02:00
Laurent Destailleur
a3a89b755f NEW Gain space by moving the meteo on title line 2019-02-20 06:01:13 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +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
c4bf0f0e03 CSS Flex 2018-11-03 18:57:18 +01:00
Regis Houssin
569d59d251 FIX change my deprecated email 2018-10-27 14:43:12 +02:00
Frédéric FRANCE
c15ccb0498 reduce complexity of showWeather 2018-09-15 22:38:16 +02:00
Laurent Destailleur
fcabe67e4b Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-09-12 13:30:28 +02:00
Maxime Kohlhaas
a5f4a74ecc FIX : Homepage links were using wrong topmenus 2018-09-06 14:49:48 +02:00
Laurent Destailleur
c5695db3e4 NEW Can disable meteo on smartphone only 2018-09-06 11:09:51 +02:00
Frédéric FRANCE
c76a33fb4f remove superfluous spaces 2018-08-21 20:12:27 +02:00
Laurent Destailleur
289f194641 Merge pull request #9058 from defrance/patch-123 
New : Add total price on dashboard
 2018-08-21 13:33:33 +02:00
Laurent Destailleur
edb210d7cc Update index.php 2018-08-21 13:33:07 +02:00
Philippe GRAND
59cd0a5e5e uniformize 2018-08-04 15:58:05 +02:00
BENKE Charlene
9539adfffb Update index.php 2018-07-05 12:02:38 +02:00
Laurent Destailleur
da7b433cd0 Trans 2018-07-03 12:46:22 +02:00
Laurent Destailleur
7bf33b1bac Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0 
Conflicts:
	htdocs/hrm/index.php
	htdocs/install/mysql/tables/llx_website_account.key.sql
	htdocs/modulebuilder/template/myobject_card.php
 2018-07-02 12:16:51 +02:00
Maxime Kohlhaas
7ebf54fbea Fix : division by 0 on homepage if nothing to do 2018-06-28 12:54:19 +02:00
Frédéric FRANCE
9cd7bb3f58 loadlangs 2018-05-26 16:03:19 +02:00
Frédéric FRANCE
cbed5c8349 loadlangs 2018-05-26 15:41:32 +02:00
Laurent Destailleur
2524a699eb Standardize file name of lists 2018-04-06 00:36:52 +02:00
Laurent Destailleur
5839cedb4c CSS 2018-03-04 10:47:35 +01:00
Laurent Destailleur
b56da9c11e Better balance css columns in dashboard 2018-02-08 15:11:05 +01:00
Laurent Destailleur
bee64962fe Fix css 2018-01-27 19:40:11 +01:00
Laurent Destailleur
a61b420759 Fix css 2018-01-26 23:29:49 +01:00
Laurent Destailleur
1e9ddf153c Fix workboard not visible on smartphone, so i invert position with stats 2018-01-17 13:55:53 +01:00
Laurent Destailleur
1c3fb7f94b Fix responsive of boxes 2018-01-16 16:15:49 +01:00
Laurent Destailleur
bb7c03906e Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/lib/files.lib.php
	htdocs/societe/list.php
 2017-12-11 15:25:09 +01:00
Laurent Destailleur
48499fb506 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 6.0 2017-12-11 15:21:22 +01:00
Laurent Destailleur
dbd96d1ac7 Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/actions_sendmails.inc.php
	htdocs/loan/card.php
	htdocs/loan/class/loan.class.php
 2017-12-10 21:46:23 +01:00
Laurent Destailleur
09d3db145b Merge 2017-12-08 13:10:13 +01:00
Laurent Destailleur
e526162e8e Merge branch '4.0' of git@github.com:Dolibarr/dolibarr.git into 5.0 2017-12-08 12:42:22 +01:00
atm-ph
c90ece1188 Fix include class WorkboardResponse 2017-12-06 14:22:37 +01:00
Marc de Lima Lucio
d43acefac4 Merge branch 'develop' of github.com:Dolibarr/dolibarr into NEW_hook_openelements_dashboard 2017-12-06 12:39:50 +01:00
Marc de Lima Lucio
32d911b1df NEW: hook to enrich homepage open elements dashboard 2017-12-06 12:31:00 +01:00
atm-ph
c70dff89dd Fix $boad instead of $board 2017-12-06 12:13:15 +01:00
Laurent Destailleur
cf274a7e3f Fix CSS 2017-11-26 22:23:21 +01:00
Laurent Destailleur
b8cbb84e7c Clean code 2017-11-11 00:28:00 +01:00
Laurent Destailleur
5f5cbec1cf Debug module website 2017-10-26 13:09:11 +02:00