Wavyzz/dolibarr
2
0
Fork 1
mirror of https://github.com/Dolibarr/dolibarr.git synced 2026-01-04 08:02:22 +01:00
Code Issues Packages Projects Releases Wiki Activity
73,828 Commits 37 Branches 191 Tags
69bfac7eef97abd49f8efcd805c1937d7828a8c7
Commit Graph

2047 Commits

Author SHA1 Message Date
Laurent Destailleur
014c199173 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 
Conflicts:
	htdocs/core/class/html.form.class.php
	htdocs/core/tpl/extrafields_list_print_fields.tpl.php
 2019-02-27 01:28:12 +01:00
Laurent Destailleur
3ec2338c2d Look and feel v10 2019-02-26 19:37:32 +01:00
atm-quentin
35762c0d4e add data elem on task list 2019-02-26 11:25:40 +01:00
Frédéric FRANCE
ec956e1c72 replace html code by html5 in project 2019-02-23 22:24:26 +01:00
Sof
a47a9d8a65 Typo 2019-02-17 20:08:52 +01:00
Sof
69f1d9825c Typo 2019-02-17 20:08:03 +01:00
florian HENRY
dd9896516b Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into 
dev_importproduct_measuringunit

Conflicts:
	htdocs/margin/agentMargins.php
	htdocs/product/stock/movement_card.php
	htdocs/projet/tasks/time.php
	htdocs/resource/class/html.formresource.class.php
 2019-02-13 12:52:07 +01:00
Laurent Destailleur
ced386fdca Fix phpcs 2019-02-13 11:32:00 +01:00
florian HENRY
5c059c897d fix travis (mosty for dev no conerne by my changes) 2019-02-13 09:21:14 +01:00
Frédéric FRANCE
1e43f8e54a PEAR FunctionCallSignature 2019-02-10 10:45:49 +01:00
Laurent Destailleur
af92303319 Merge pull request #10487 from frederic34/psr2squizwhite 
psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent
 2019-02-08 09:30:25 +01:00
Frédéric FRANCE
970392adb8 Merge remote-tracking branch 'upstream/develop' into psr2squizwhite 2019-02-03 22:41:57 +01:00
Laurent Destailleur
5a6e46a9c3 Doc 2019-02-03 21:40:23 +01:00
Laurent Destailleur
695a681c14 NEW Can generate invoices from timespent of a project 2019-02-03 21:35:30 +01:00
Laurent Destailleur
a6dde3d6bd Merge branch 'develop' into nospaceaftercomma 2019-02-03 19:27:16 +01:00
Laurent Destailleur
9f7dfe2921 Merge pull request #10481 from frederic34/psr2forloop 
psr2 Squiz.ControlStructures.ForEachLoopDeclaration
 2019-02-03 19:11:07 +01:00
Frédéric FRANCE
80a12fcd1c psr2 Squiz.WhiteSpace.ScopeClosingBrace.Indent 2019-02-03 14:29:45 +01:00
Frédéric FRANCE
03701fa091 psr2 2019-02-02 18:25:01 +01:00
Frédéric FRANCE
80b48680f6 clean missing spaces in the last merge 2019-02-02 09:49:07 +01:00
Frédéric FRANCE
2f40443b46 Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-02-02 09:46:14 +01:00
Laurent Destailleur
28c1b1ce58 Work on billing time spent 2019-02-01 22:39:36 +01:00
Frédéric FRANCE
f83ee43a19 Merge branch 'develop' into nospaceaftercomma 2019-01-30 22:15:22 +01:00
Laurent Destailleur
b197ad72d3 Work on billing projects 2019-01-30 20:02:41 +01:00
Laurent Destailleur
e18bd6f986 Merge branch 'develop' into nospaceaftercomma 2019-01-30 18:27:35 +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
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
b10558bacd Merge remote-tracking branch 'upstream/develop' into nospaceaftercomma 2019-01-27 23:23:38 +01:00
Laurent Destailleur
f30a3d59ba Merge branch 'develop' into toomanylines 2019-01-27 17:59:13 +01:00
Laurent Destailleur
4f9f0fd7b5 Merge branch 'develop' into elseif 2019-01-27 17:54:06 +01:00
Frédéric FRANCE
f0cdf300d1 Squiz.Functions.FunctionDeclarationArgumentSpacing 2019-01-27 15:20:16 +01:00
Frédéric FRANCE
496fa9b0fb PSR2.Files.EndFileNewline.TooMany 2019-01-27 14:10:35 +01:00
Frédéric FRANCE
7ee086b402 PSR2 space after comma in function call 2019-01-27 11:55:16 +01:00
Frédéric FRANCE
6e91b3cefc PSR2 usage of else if is discouraged 2019-01-27 10:49:34 +01:00
Laurent Destailleur
cc574852d2 Fix phpcs 2019-01-26 15:20:36 +01:00
Laurent Destailleur
e42fe4022a Uniformize lenght of small list 2019-01-25 15:22:36 +01:00
Laurent Destailleur
a5daa25707 Move common code to get sell price into a method 2019-01-24 19:45:17 +01:00
Laurent Destailleur
2c8557e2e0 Work on invoicing of time spent 2019-01-24 18:16:14 +01:00
Philippe GRAND
af36883d72 update with html5 compliant code 2019-01-21 10:04:43 +01:00
Laurent Destailleur
5c825310a3 Fix bad link and css 2019-01-19 14:49:44 +01:00
Laurent Destailleur
b1e51835f5 Fix bad link and css 2019-01-19 14:49:26 +01:00
Laurent Destailleur
2db0f84f29 NEW Pagination into list of time spent 2019-01-18 20:06:33 +01:00
Laurent Destailleur
e3d53867f4 WIP Billing task time 2019-01-18 18:11:10 +01:00
Laurent Destailleur
5130019003 css 2019-01-17 19:27:26 +01:00
Laurent Destailleur
adc6c1d2d1 Work on invoicing time spent 2019-01-15 20:59:56 +01:00
Laurent Destailleur
0f2406c202 Merge branch '9.0' of git@github.com:Dolibarr/dolibarr.git into develop 2019-01-15 10:55:28 +01:00
Laurent Destailleur
e0d11edb6b FIX Sql error on filter of project preview with date 2019-01-13 14:09:40 +01:00
ldestailleur
5094b6bcfc WIP Work on split of timespent 2019-01-04 16:24:56 +01:00
ldestailleur
2c474de61e FIX Update of timespent when date is empty 2019-01-04 15:44:39 +01:00
ldestailleur
b928a49b1b FIX Update of timespent when date is empty 2019-01-04 15:44:09 +01:00