Laurent Destailleur
|
dfd4d36bdf
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-01-30 15:58:11 +01:00 |
|
Laurent Destailleur
|
c9661ee20e
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-30 15:57:09 +01:00 |
|
Laurent Destailleur
|
3591f51918
|
Merge pull request #4480 from hregis/3.8_bug
Fix: for avoid conflict with "global $m" in memory.lib.php
|
2016-01-30 12:22:47 +01:00 |
|
Laurent Destailleur
|
b27e31b3ae
|
Merge pull request #4483 from marcosgdf/bug-4440-3
Corrected typo of PR #4444
|
2016-01-30 12:20:50 +01:00 |
|
Laurent Destailleur
|
2e7d88dffb
|
Merge pull request #4499 from fmarcet/3.7
FIX: Contrat card don't consider user permissions to show active/unactive service button
|
2016-01-30 12:12:42 +01:00 |
|
Laurent Destailleur
|
e574ebe34c
|
Merge pull request #4514 from hregis/3.8_bug2
Fix: missing field "label"
|
2016-01-30 11:57:28 +01:00 |
|
Laurent Destailleur
|
f5a4b9db31
|
Merge pull request #4520 from atm-ph/fix_3.8_show_all_shipping_by_socid
FIX filter by socid if from customer card
|
2016-01-30 11:56:40 +01:00 |
|
Laurent Destailleur
|
cd58c93de6
|
FIX If option to hide automatic ECM is on, dont show menu.
|
2016-01-28 12:51:34 +01:00 |
|
phf
|
6eecf2f29a
|
FIX filter by socid if from customer card
|
2016-01-28 12:30:49 +01:00 |
|
Regis Houssin
|
8a80e06580
|
Fix: missing field "label"
|
2016-01-28 11:42:00 +01:00 |
|
Laurent Destailleur
|
20e110a882
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-01-27 18:48:06 +01:00 |
|
Laurent Destailleur
|
45656c18e8
|
Fix hover css
|
2016-01-27 18:47:52 +01:00 |
|
Laurent Destailleur
|
fccecc902d
|
Merge branch '3.8' of github.com:Dolibarr/dolibarr into 3.8
|
2016-01-26 18:30:08 +01:00 |
|
Laurent Destailleur
|
e0683681ff
|
Merge
|
2016-01-26 18:28:47 +01:00 |
|
Laurent Destailleur
|
5fd6057c6c
|
FIX Deadlock situation. Can't edit anymore contract.
FIX List of automatic events was not visible.
|
2016-01-26 18:22:37 +01:00 |
|
Laurent Destailleur
|
25924f31ad
|
Bad translation
|
2016-01-26 17:57:57 +01:00 |
|
Laurent Destailleur
|
33355c613a
|
FIX When we make a direct assignement on a task to a user, we must check
he is also assigned to project (and if not assign it)
|
2016-01-26 17:50:57 +01:00 |
|
fmarcet
|
c2efee8a29
|
FIX: Contrat card don't consider user permissions to show active/unactive service button
|
2016-01-26 13:02:21 +01:00 |
|
Laurent Destailleur
|
b690a2a860
|
Merge remote-tracking branch 'origin/3.7' into 3.8
|
2016-01-25 15:38:49 +01:00 |
|
Laurent Destailleur
|
feb114625d
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-25 15:37:55 +01:00 |
|
Laurent Destailleur
|
c1b6630c16
|
Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
htdocs/main.inc.php
|
2016-01-25 15:37:04 +01:00 |
|
Raphaël Doursenaud
|
ed16699de6
|
FIX #4291 Correctly filter external calendar GETPOSTs
|
2016-01-25 15:32:08 +01:00 |
|
Laurent Destailleur
|
0814fa76f8
|
FIX CVE CVE-2015-8685
|
2016-01-25 15:26:52 +01:00 |
|
Laurent Destailleur
|
667651860d
|
Fix sql injection #4341
|
2016-01-25 15:24:31 +01:00 |
|
Marcos García de La Fuente
|
83263e242e
|
Corrected typo of PR #4444
|
2016-01-23 20:32:22 +01:00 |
|
Laurent Destailleur
|
c0e5fdee0e
|
Update demo
|
2016-01-23 14:55:05 +01:00 |
|
Laurent Destailleur
|
200a6d3c3b
|
Update demo data
|
2016-01-23 12:27:49 +01:00 |
|
Laurent Destailleur
|
a841db1eeb
|
FIX Purge of temp files was broken
|
2016-01-23 12:24:46 +01:00 |
|
Laurent Destailleur
|
a3c273aec8
|
Update demo datas
|
2016-01-23 12:07:57 +01:00 |
|
Laurent Destailleur
|
f8cd4eb166
|
Update demo
|
2016-01-23 12:04:09 +01:00 |
|
Laurent Destailleur
|
dc438792f4
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/fourn/commande/card.php
|
2016-01-23 11:39:37 +01:00 |
|
Laurent Destailleur
|
9be246baa5
|
Merge remote-tracking branch 'origin/3.6' into 3.7
|
2016-01-23 11:32:06 +01:00 |
|
Laurent Destailleur
|
627f606c4d
|
Fix list of leave request was not showing label correctly.
|
2016-01-23 11:17:20 +01:00 |
|
Laurent Destailleur
|
2b96c8f205
|
FIX Noway to validate a leave request for some uer even if they have
permission for.
|
2016-01-23 11:05:06 +01:00 |
|
Laurent Destailleur
|
1012fb8be1
|
Update demo data
|
2016-01-22 19:11:46 +01:00 |
|
Laurent Destailleur
|
b09d3663d6
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-01-22 18:10:35 +01:00 |
|
Laurent Destailleur
|
4c3f9db2a1
|
Add demo data
|
2016-01-22 18:10:19 +01:00 |
|
Laurent Destailleur
|
fac38db2bf
|
Merge pull request #4457 from atm-arnaud/3.8_fix_bookmarks_user_update
FIX bookmark's user change after update if the user isn't superadmin
|
2016-01-22 16:42:59 +01:00 |
|
Laurent Destailleur
|
540bb04cac
|
Update demo init data
|
2016-01-22 14:29:44 +01:00 |
|
Laurent Destailleur
|
dadc24462a
|
Fix: We must ue the "small" size of imge to show on card pages.
|
2016-01-22 14:14:39 +01:00 |
|
Laurent Destailleur
|
49a325e7ae
|
Fix: We must ue the "small" size of imge to show on card pages.
|
2016-01-22 14:10:27 +01:00 |
|
Laurent Destailleur
|
fedf1f3288
|
Fix view of product image when using old path
Fix size of image uploaded on user.
|
2016-01-22 14:02:48 +01:00 |
|
Regis Houssin
|
2b7b7e014d
|
Fix: for avoid conflict with "global $m" in memory.lib.php
|
2016-01-22 13:20:21 +01:00 |
|
Laurent Destailleur
|
50b0019ead
|
A protection to avoid situation loosing all admin accounts
|
2016-01-22 11:54:14 +01:00 |
|
Laurent Destailleur
|
9fd56df03f
|
Merge pull request #4444 from marcosgdf/bug-4440-2
FIX #4440 Wrong price is filled by Product::fetch into multiprices arrays
|
2016-01-22 03:47:22 +01:00 |
|
Laurent Destailleur
|
9d63cb0156
|
Merge pull request #4452 from hregis/3.7_bug
Fix: $outputlangs is not defined (dolibarr 3.7, 3.8, 3.9)
|
2016-01-22 03:45:35 +01:00 |
|
Laurent Destailleur
|
cbd01bae49
|
Merge remote-tracking branch 'origin/3.7' into 3.8
Conflicts:
htdocs/admin/dict.php
htdocs/core/tpl/objectline_edit.tpl.php
htdocs/societe/index.php
|
2016-01-22 03:18:51 +01:00 |
|
Laurent Destailleur
|
56a4466b5b
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2016-01-22 03:04:22 +01:00 |
|
Laurent Destailleur
|
34c648b351
|
FIX #4418
|
2016-01-22 03:04:07 +01:00 |
|
Laurent Destailleur
|
219ce73ea2
|
Merge pull request #4417 from atm-arnaud/3.8_fix_factures_nblignes_after_hook
FIX nblignes not calculated after hook and hook can't modify this val...
|
2016-01-22 02:10:36 +01:00 |
|