Commit Graph

68865 Commits

Author SHA1 Message Date
Philippe GRAND
d91b1fd895 Update and standardize code 2018-08-22 11:06:34 +02:00
Philippe GRAND
29f15b4ae6 Update and standardize code 2018-08-22 10:51:55 +02:00
Philippe GRAND
a669830427 Update and standardize code 2018-08-22 10:37:16 +02:00
Frédéric FRANCE
6b6daf178f Merge remote-tracking branch 'upstream/develop' into camelCaps 2018-08-21 20:57:58 +02:00
Frédéric FRANCE
c76a33fb4f remove superfluous spaces 2018-08-21 20:12:27 +02:00
Frédéric FRANCE
0fbccce9a7 Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 19:59:07 +02:00
Laurent Destailleur
db3c17668e Fix coding style 2018-08-21 19:08:11 +02:00
Laurent Destailleur
3f4714416d Clean comment 2018-08-21 18:58:10 +02:00
Laurent Destailleur
f8b3ec7b87 Fix PHPCS 2018-08-21 18:57:34 +02:00
Frédéric FRANCE
41ac5dfd29 Merge branch 'develop' into patch-18 2018-08-21 16:02:43 +02:00
Laurent Destailleur
4d8e5ab0e6 Fix PHPCS 2018-08-21 14:58:20 +02:00
Laurent Destailleur
cd09052e80 FIX badge on time spent on project and tasks 2018-08-21 14:52:22 +02:00
Laurent Destailleur
3cfc47a732 Fix urls in project module 2018-08-21 14:41:59 +02:00
Frédéric FRANCE
ca6461ea2d align parameters 2018-08-21 14:30:06 +02:00
Frédéric FRANCE
b1a3238c94 Build badge for 5.0 2018-08-21 14:22:29 +02:00
Laurent Destailleur
21a9fd625f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 14:15:22 +02:00
Laurent Destailleur
4379d6b49d Prepare 9.0 2018-08-21 14:15:01 +02:00
Laurent Destailleur
5f6c165fb6 Module builder is stable 2018-08-21 14:14:27 +02:00
Laurent Destailleur
b86d54cab3 Trad 2018-08-21 14:05:53 +02:00
Frédéric FRANCE
aba69b94b2 Merge remote-tracking branch 'upstream/develop' into trimtrailing 2018-08-21 14:03:02 +02:00
Laurent Destailleur
9dbb0eaab0 Fix cron task label 2018-08-21 14:01:03 +02:00
Laurent Destailleur
243cbbc11d Fix missing trans 2018-08-21 13:58:24 +02:00
Laurent Destailleur
0799970804 Merge pull request #9248 from frederic34/FunctionDeclaration
function declaration
2018-08-21 13:41:56 +02:00
Laurent Destailleur
85eed6cf80 Merge branch 'develop' into trimtrailing 2018-08-21 13:40:04 +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
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
Laurent Destailleur
39f7d4a011 Merge pull request #8975 from atm-greg/Add_hook_on_replenish
add hooks on stock replenish
2018-08-21 13:28:18 +02:00
Laurent Destailleur
0ee7befa19 Update replenish.php 2018-08-21 13:27:49 +02:00
Laurent Destailleur
5effcd222f Merge pull request #9150 from frederic34/variant
code cleaning
2018-08-21 13:21:11 +02:00
Laurent Destailleur
5e09d5160f Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 13:17:20 +02:00
Laurent Destailleur
0f1e5a78c6 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-21 13:17:11 +02:00
Laurent Destailleur
7103bfd7aa Merge pull request #9253 from frederic34/patch-11
Update list.php
2018-08-21 13:11:26 +02:00
Laurent Destailleur
009424cd67 Merge pull request #9226 from atm-greg/Fix_project_delete_tasks
Fix project delete tasks
2018-08-21 13:11:00 +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
Frédéric FRANCE
fb3754af59 Update fichinter.class.php 2018-08-21 12:54:25 +02:00
Frédéric FRANCE
9a5f839e63 Update actions_printing.inc.php 2018-08-21 12:54:02 +02:00
Laurent Destailleur
a414aeb29e Merge pull request #9266 from frederic34/patch-21
Update propal.lib.php
2018-08-21 12:53:37 +02:00
Laurent Destailleur
f5e82365c3 Merge pull request #9263 from frederic34/patch-20
Update fichinter.class.php
2018-08-21 12:53:10 +02:00
Laurent Destailleur
866f9c4cf7 Merge pull request #9259 from frederic34/patch-18
Update actions_printing.inc.php
2018-08-21 12:52:54 +02:00
Laurent Destailleur
b40e32b8c3 Merge pull request #9264 from grandoc/new_branch_17_08_2018
standardize code
2018-08-21 12:52:34 +02:00
Laurent Destailleur
8032c314d4 Merge pull request #9252 from bugness-chl/8.0-2
FIX adding GROUP BY for PostgreSQL
2018-08-21 12:51:56 +02:00
Laurent Destailleur
cd7c46794a Merge pull request #9260 from frederic34/patch-19
FIX propal.class.php
2018-08-21 12:49:25 +02:00
Laurent Destailleur
58b668e74f Merge pull request #9256 from c3do/patch-2
Fix : Erreur de syntaxe ( + au lieu de . )
2018-08-21 12:48:58 +02:00
Laurent Destailleur
93be5fe7c0 Merge pull request #9270 from ptibogxiv/patch-37
fix duration display for service in list.php
2018-08-21 12:15:57 +02:00
Laurent Destailleur
c25a968c72 Update list.php 2018-08-21 12:15:47 +02:00
Laurent Destailleur
a10b4da6ac Update list.php 2018-08-21 12:13:07 +02:00
Laurent Destailleur
a73d2447d9 Update list.php 2018-08-21 12:10:05 +02:00
Laurent Destailleur
a369822e5a Fix export/import web site 2018-08-20 21:00:45 +02:00