Philippe GRAND
|
d8e6492e93
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2018-09-01 13:07:30 +02:00 |
|
Laurent Destailleur
|
5604f3b0c3
|
Merge pull request #9376 from frederic34/functionCommentMissing
function Comment Missing
|
2018-09-01 12:59:32 +02:00 |
|
Philippe GRAND
|
1944ef0dc3
|
conflict resolution
|
2018-09-01 12:38:22 +02:00 |
|
Frédéric FRANCE
|
02b74afe5f
|
function Comment Missing
|
2018-08-31 22:41:51 +02:00 |
|
Frédéric FRANCE
|
a676f4f64f
|
function Comment Missing
|
2018-08-31 21:54:40 +02:00 |
|
Philippe GRAND
|
3a8bde227b
|
Standardize and update code
|
2018-08-31 19:26:08 +02:00 |
|
Frédéric FRANCE
|
6aee680a4f
|
PSR2 ClassDeclaration
|
2018-08-29 22:06:05 +02:00 |
|
Frédéric FRANCE
|
b03f4004ea
|
PSR2 FunctionClosingBrace
|
2018-08-29 21:25:22 +02:00 |
|
Frédéric FRANCE
|
0e512cbc36
|
Merge remote-tracking branch 'upstream/develop' into trimtrailing2
|
2018-08-29 15:47:55 +02:00 |
|
Laurent Destailleur
|
ee204e2e64
|
Fix regression in php style
|
2018-08-29 15:37:35 +02:00 |
|
Frédéric FRANCE
|
1182f29864
|
trimtrailing
|
2018-08-28 08:33:02 +02:00 |
|
Laurent Destailleur
|
1842a4bb41
|
Merge pull request #9278 from grandoc/new_branch_21_08_2018
Update and standardize code
|
2018-08-28 02:13:28 +02:00 |
|
Laurent Destailleur
|
7a35b560a6
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-08-23 19:51:52 +02:00 |
|
Laurent Destailleur
|
499d93b8c4
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/core/class/html.formmail.class.php
htdocs/projet/class/task.class.php
htdocs/projet/tasks/task.php
|
2018-08-23 19:50:58 +02:00 |
|
Laurent Destailleur
|
62b2981e42
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-08-23 19:47:31 +02:00 |
|
Philippe GRAND
|
30992f2730
|
Standardize and update code
|
2018-08-23 18:52:47 +02:00 |
|
Philippe GRAND
|
0c75c41e7b
|
Update and standardize code
|
2018-08-22 19:56:24 +02:00 |
|
Philippe GRAND
|
95349365ba
|
Update and standardize code
|
2018-08-22 11:39:37 +02:00 |
|
Laurent Destailleur
|
3cfc47a732
|
Fix urls in project module
|
2018-08-21 14:41:59 +02:00 |
|
Laurent Destailleur
|
0799970804
|
Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
|
2018-08-21 13:41:56 +02:00 |
|
Laurent Destailleur
|
4fdd521d61
|
Merge pull request #8671 from ATM-Nicolas/fix_comments_on_tasks
FIX : Fetch task will now fetch comments
|
2018-08-21 13:36:20 +02:00 |
|
Laurent Destailleur
|
91bfa4be6c
|
Update project.class.php
|
2018-08-21 13:10:20 +02:00 |
|
Laurent Destailleur
|
3523c2b3d2
|
Update project.class.php
|
2018-08-21 13:09:06 +02:00 |
|
Philippe GRAND
|
a31ad5af3d
|
standardize code
|
2018-08-17 17:55:00 +02:00 |
|
Laurent Destailleur
|
b515511ad6
|
Merge branch 'develop' into FunctionDeclaration
|
2018-08-16 00:52:55 +02:00 |
|
Laurent Destailleur
|
3b245f1b30
|
Merge pull request #9247 from frederic34/missingReturn
return comment
|
2018-08-16 00:35:39 +02:00 |
|
Frédéric FRANCE
|
7bb781eea8
|
function declaration
|
2018-08-15 14:28:34 +02:00 |
|
Philippe GRAND
|
57f51fda3e
|
Standardize
|
2018-08-15 12:48:13 +02:00 |
|
Frédéric FRANCE
|
a0a6afc224
|
return comment
|
2018-08-14 12:23:10 +02:00 |
|
atm-greg
|
ba6f7d4b0a
|
fix infinite loop
|
2018-08-14 09:32:43 +02:00 |
|
atm-greg
|
3d84adbd76
|
fix recurcivity
|
2018-08-09 12:21:48 +02:00 |
|
atm-greg
|
4e16f64af0
|
Fix project::delete to delete children tasks before parent tasks
|
2018-08-09 12:13:06 +02:00 |
|
Laurent Destailleur
|
b01f07efda
|
Merge branch 'develop' into FIX_project_overview
|
2018-08-02 18:43:55 +02:00 |
|
Juanjo Menent
|
788060aa28
|
Merge pull request #9178 from aspangaro/9.0_a3
NEW : Add project on salaries
|
2018-08-02 11:19:34 +02:00 |
|
Alexandre SPANGARO
|
ee61a88540
|
Small fix
|
2018-08-01 07:46:17 +02:00 |
|
atm-quentin
|
37a4a0c488
|
fix for travis
|
2018-07-31 10:02:36 +02:00 |
|
Alexandre SPANGARO
|
0509a176ca
|
Merge branch 'develop' into 9.0_a3
|
2018-07-31 07:47:43 +02:00 |
|
Alexandre SPANGARO
|
b0e2e69ed0
|
New : Add project on salaries
|
2018-07-31 07:45:03 +02:00 |
|
Frédéric FRANCE
|
a0a5d33641
|
test include
|
2018-07-26 17:30:53 +02:00 |
|
atm-quentin
|
1297470c99
|
FIX project overview (can use any fields as fk_projet)
|
2018-07-26 15:05:32 +02:00 |
|
Laurent Destailleur
|
9d1b7e25f7
|
Merge pull request #9127 from IAS-SYSTEMS-CSC/develop
Fix if time spent minutes was zero
|
2018-07-24 17:35:33 +02:00 |
|
ias-ceo
|
84bfe2965b
|
if time spent minutes zero
|
2018-07-20 16:16:27 +03:00 |
|
Philippe GRAND
|
010c5af245
|
Clean and update code
|
2018-07-19 16:48:20 +02:00 |
|
Laurent Destailleur
|
7ef6b16d31
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
Conflicts:
htdocs/install/step1.php
|
2018-07-03 10:04:25 +02:00 |
|
Laurent Destailleur
|
0138b0e0b7
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/class/html.form.class.php
|
2018-07-03 10:01:30 +02:00 |
|
Laurent Destailleur
|
5138a09db3
|
Fix sql of time spent per day
|
2018-07-02 15:54:21 +02:00 |
|
gauthier
|
d8ca9f2947
|
FIX : we must see number of all shared projects
|
2018-06-27 17:26:04 +02:00 |
|
gauthier
|
86a58def3b
|
FIX : getEntity project and not projet
|
2018-06-27 17:13:50 +02:00 |
|
Laurent Destailleur
|
27a27e02a1
|
Fix css
|
2018-06-22 22:53:53 +02:00 |
|
Laurent Destailleur
|
88d3bf0148
|
FIX creation of tasks must hide closed project
|
2018-06-21 18:47:02 +02:00 |
|