Mirrors/dolibarr
1
0
Fork 0
mirror of https://github.com/Dolibarr/dolibarr.git synced 2025-02-20 13:46:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
112,767 Commits 35 Branches 179 Tags 1.7 GiB
e3a0220658
Commit Graph

546 Commits

Author SHA1 Message Date
Laurent Destailleur
d05c60baf0 Fix css 2020-06-23 14:33:34 +02:00
Laurent Destailleur
6f12488e30 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/compta/facture/card.php
	htdocs/filefunc.inc.php
 2020-06-07 19:55:48 +02:00
Laurent Destailleur
04f68d25cd css 2020-06-07 01:34:26 +02:00
Laurent Destailleur
2836368017 Merge branch '12.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/extrafields.class.php
	htdocs/filefunc.inc.php
	htdocs/takepos/css/phone.css
	htdocs/takepos/invoice.php
 2020-05-28 20:20:39 +02:00
Laurent Destailleur
2afcfa8463 Fix missing stat on products 2020-05-28 12:01:19 +02:00
Frédéric FRANCE
e5402988d9
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-24 17:58:18 +02:00
Laurent Destailleur
6056ed2755 Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-24 01:02:08 +02:00
Laurent Destailleur
7bfbf3c88b Merge branch '11.0' of git@github.com:Dolibarr/dolibarr.git into 12.0 
Conflicts:
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:20:53 +02:00
Laurent Destailleur
45ddde6940 Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into 11.0 
Conflicts:
	htdocs/expensereport/class/expensereport.class.php
	htdocs/holiday/class/holiday.class.php
	htdocs/index.php
 2020-05-23 20:18:10 +02:00
Frédéric FRANCE
5aa84c64d0
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-23 18:54:33 +02:00
Laurent Destailleur
b4223dbdec
Merge branch '12.0' into fix_board_expensereport_toapprove 2020-05-23 14:32:12 +02:00
Maxime Kohlhaas
6b1eef9827 Fix board exepense report to approve 2020-05-22 00:50:13 +02:00
Maxime Kohlhaas
6434f255c3 Fix load_state_board doesn't take parameters 2020-05-22 00:32:55 +02:00
Laurent Destailleur
76823d3e39 Clean CSS, clean code 2020-05-21 20:59:02 +02:00
Frédéric FRANCE
b58060f899
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-21 13:29:43 +02:00
Laurent Destailleur
8a481b297c Clean CSS, clean code 2020-05-21 13:06:36 +02:00
Frédéric FRANCE
416e6dd90d
Merge remote-tracking branch 'upstream/develop' into Squiz.ControlStructures.ControlSignature.SpaceAfterKeyword 2020-05-21 01:11:45 +02:00
Frédéric FRANCE
4be4f975b0
add new rule 2020-05-21 01:03:03 +02:00
Laurent Destailleur
d66f54d06d Clean home page 2020-05-20 22:45:43 +02:00
Laurent Destailleur
9a8e9bdc99 Position of fields 2020-05-14 14:30:43 +02:00
Laurent Destailleur
4a65b629ee Position of fields 2020-05-14 14:29:14 +02:00
Laurent Destailleur
4606b9fd9f Fix name of class Service (already used by APIs) 2020-05-02 03:29:33 +02:00
Laurent Destailleur
52fc149faa Fix permissions 2020-04-28 01:04:37 +02:00
Laurent Destailleur
99f445962b Fix regression 2020-04-25 03:38:12 +02:00
Laurent Destailleur
4dc8e59e7f Fix order of thumbs 2020-04-25 03:34:31 +02:00
Laurent Destailleur
3ed11f374a Look and feel v12 2020-04-24 23:56:57 +02:00
Laurent Destailleur
8d59ce2e03 Look and feel v12 2020-04-20 02:48:05 +02:00
Laurent Destailleur
fa056e59df Look and feel v12 2020-04-20 02:14:43 +02:00
Laurent Destailleur
72623f88df Fix phpcs 2020-04-12 22:54:39 +02:00
Laurent Destailleur
549b126eff Look and feel v12 2020-04-12 21:36:57 +02:00
Laurent Destailleur
7d430c08d0 Look and feel v12 2020-04-12 16:36:25 +02:00
Laurent Destailleur
5e71366ff2 css 2020-02-06 18:06:36 +01:00
Scrutinizer Auto-Fixer
9781c20f84 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2020-02-02 18:34:09 +00:00
Laurent Destailleur
a88e1ac605 Better translation 2020-01-28 21:35:03 +01:00
stickler-ci
1c26139789 Fixing style errors. 2020-01-28 20:29:17 +00:00
ptibogxiv
3a4ee6417c
NEW: add member to validate on dashboard 2020-01-28 21:25:32 +01:00
Laurent Destailleur
68f5aee432 Fix global stats for holiday 2020-01-26 19:38:19 +01:00
ptibogxiv
2db062a429
fix php error message 
check array before action in array
 2019-12-17 11:03:49 +01:00
Laurent Destailleur
c00bdca31b CSS Use var in theme for picto warning 2019-12-15 20:58:44 +01:00
Scrutinizer Auto-Fixer
f197196719 Scrutinizer Auto-Fixes 
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
 2019-11-14 11:09:46 +00:00
Frédéric FRANCE
e93aaa2a75
replace deprecated user->societe_id by user->socid 2019-10-31 20:46:31 +01:00
Frédéric FRANCE
8f6d38ee82
clean indent 2019-10-27 17:01:23 +01:00
Laurent Destailleur
fb3d20107c Merge branch '10.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	ChangeLog
	htdocs/exports/export.php
	htdocs/filefunc.inc.php
 2019-10-15 03:51:57 +02:00
Alexandre SPANGARO
499eb87173 lang file for holidays is holiday 2019-10-13 08:20:37 +02:00
Laurent Destailleur
ab2d21a550 Enable new top dashboard by default 2019-10-08 16:31:40 +02:00
Frédéric FRANCE
8a9f08d5a3
lang file for holidays is holiday 2019-10-06 11:29:24 +02:00
Alexandre SPANGARO
16c6c9ae75 Merge remote-tracking branch 'upstream/develop' into 11.0_https 2019-10-01 06:12:24 +02:00
Alexandre SPANGARO
91b3bf76fd Merge branch 'develop' into 11.0_https 2019-10-01 06:11:43 +02:00
Alexandre SPANGARO
288aea190b Merge remote-tracking branch 'upstream/develop' into 11.0_fa_icon 2019-09-28 06:09:40 +02:00
Alexandre SPANGARO
7f93f046e9 NEW Add fa_icon on load_fiche_titre 2019-09-28 06:02:25 +02:00
Laurent Destailleur
c0e7c558a1
Merge pull request #11860 from atm-john/new_box_supplier_orders_awaiting_reception 
NEW widget box for supplier orders awaiting reception
 2019-09-27 15:32:43 +02:00
Alexandre SPANGARO
02dbc11f98 Move Gnu.org to https 2019-09-23 21:55:30 +02:00
stickler-ci
cc5c6c0c76 Fixing style errors. 2019-09-22 19:09:02 +00:00
ATM john
913c298a91 Auto remove basic stats if in new opened dashboard 2019-09-22 20:59:28 +02:00
ATM john
65c48475dd Merge branch 'develop_dashboard_global_stat_basic' of github.com:atm-john/dolibarr into develop_dashboard_global_stat_basic 2019-09-22 13:47:40 +02:00
ATM john
9e55fee6e4 Prepare global stats replacement 2019-09-22 13:46:11 +02:00
stickler-ci
0660229602 Fixing style errors. 2019-09-22 10:05:13 +00:00
ATM john
98acfd6929 Add basic stats to new dashboard 2019-09-22 11:57:33 +02:00
ATM john
337194023a Add purchase orders awaiting reception to workboard 2019-09-10 22:10:20 +02:00
Laurent Destailleur
c8fd4a2385 Fix phpcs 2019-09-03 22:48:35 +02:00
Laurent Destailleur
1055582a28
Merge branch 'develop' into 11.0_workboard 2019-09-03 17:50:09 +02:00
Laurent Destailleur
3d5361832d Fix code style 2019-08-31 02:00:28 +02:00
Alexandre SPANGARO
66d21a5e8d NEW Add constant MAIN_DISABLE_GLOBAL_WORKBOARD to disable workboard in home 2019-08-29 14:12:07 +02:00
Laurent Destailleur
76ae0cebd6 We don't need anymore code to manage dol_use_jmobile = 3 or 4 2019-08-29 01:32:10 +02:00
Laurent Destailleur
6abfd8b145 Fix use short labels for workboard 2019-08-19 10:01:42 +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
ATM john
2a068030e5 Fix : foreach optimized 2019-08-13 16:01:15 +02:00
ATM john
717ea523e9 Fix lang and add size control 2019-08-13 15:54:32 +02:00
John Botella
c42beb23cd Fix travis 2019-08-06 17:32:02 +02:00
John Botella
df50bcd9d7 Fix add title to group name 2019-08-06 11:29:56 +02:00
John Botella
690d09be3e Fix md theme missing style 2019-08-06 10:36:24 +02:00
John Botella
25781bbeca add hidden conf to activate new dash board 2019-08-02 14:51:32 +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
9e92b73d4a Move open dashboard 2019-07-29 17:12:41 +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