Commit Graph

69110 Commits

Author SHA1 Message Date
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
e03d7eba8c
Merge pull request #9254 from frederic34/patch-17
Build Badge by branch
2018-08-21 12:48:23 +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
Laurent Destailleur
36c7007aaa Add control to avoid duplicate aliases 2018-08-20 19:10:33 +02:00
Laurent Destailleur
27e2810e10 Fix date format 2018-08-20 17:14:03 +02:00
ptibogxiv
d5aed3394d
fix duration display for service in list.php 2018-08-20 09:52:59 +02:00
Laurent Destailleur
26d34422b0 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-19 03:01:26 +02:00
Laurent Destailleur
795b2f3d58 FIX Delete file on smartphone 2018-08-19 03:00:11 +02:00
Laurent Destailleur
547a0aaac7 FIX Look and feel v8 2018-08-19 02:43:45 +02:00
Laurent Destailleur
116f4a1a09 Fix responsive 2018-08-19 02:22:12 +02:00
Laurent Destailleur
d8365e9260 Module DAV 2018-08-19 02:17:12 +02:00
Laurent Destailleur
cca0f4bf22 Fix translation 2018-08-19 02:01:18 +02:00
Laurent Destailleur
38f3452f0c Fix trans 2018-08-19 01:51:45 +02:00
torvista
710ce6a9f7 Add description to database prefix field to avoid confusion when not specifying a database prefix. 2018-08-19 00:09:34 +02:00
torvista
8426f0e6cb Main url auto-filled field was hardcoded as http: easy to overlook this when running installer via https.
This sets protocol to be the same as the installer page.
2018-08-18 23:45:20 +02:00
Philippe Grand
ccdae4c597
Update html.formadvtargetemailing.class.php 2018-08-18 19:15:25 +02:00
Frédéric FRANCE
391995c09b
Update propal.lib.php 2018-08-18 17:26:42 +02:00
Philippe GRAND
c8c8af55a0 Typo 2018-08-18 15:56:23 +02:00
Laurent Destailleur
9a82cc3261 Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop 2018-08-18 02:55:49 +02:00
Laurent Destailleur
dedfd6d493 Fix missing translation 2018-08-18 02:55:22 +02:00
Philippe GRAND
da951e61f2 Update and standardize code 2018-08-17 22:29:21 +02:00
Philippe GRAND
c48211ad70 Update and standardize code 2018-08-17 19:31:22 +02:00
Philippe GRAND
edb566501d Update and standardize code 2018-08-17 18:54:41 +02:00