Frédéric FRANCE
|
4e619dd0ed
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-05 18:51:21 +02:00 |
|
Frédéric FRANCE
|
f7c3ca9d20
|
move phpcs:ignore
|
2018-09-05 18:49:06 +02:00 |
|
Laurent Destailleur
|
f3b0e16f27
|
Merge pull request #9411 from frederic34/patch-11
Update api_agendaevents.class.php
|
2018-09-05 14:16:05 +02:00 |
|
Frédéric FRANCE
|
aa74d2ac38
|
Update api_agendaevents.class.php
|
2018-09-04 23:53:37 +02:00 |
|
Frédéric FRANCE
|
ecc6c118a6
|
move phpcs:ignore
|
2018-09-04 23:26:37 +02:00 |
|
Frédéric FRANCE
|
7799774ca1
|
move phpcs:ignore
|
2018-09-04 22:52:55 +02:00 |
|
Frédéric FRANCE
|
3847df1de6
|
move phpcs:ignore
|
2018-09-04 21:53:53 +02:00 |
|
Laurent Destailleur
|
ab8155f170
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/commande/class/commande.class.php
htdocs/compta/facture/card.php
htdocs/filefunc.inc.php
|
2018-09-04 21:35:43 +02:00 |
|
Frédéric FRANCE
|
c6cef85ccd
|
move phpcs:ignore
|
2018-09-04 21:16:17 +02:00 |
|
Frédéric FRANCE
|
48d8a444e0
|
correct merge
|
2018-09-04 20:58:05 +02:00 |
|
Frédéric FRANCE
|
65b74ad30f
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 20:48:35 +02:00 |
|
Frédéric FRANCE
|
fd6281b364
|
move phpcs:ignore
|
2018-09-04 20:00:09 +02:00 |
|
Laurent Destailleur
|
aec0d4022b
|
Fix responsive
|
2018-09-04 19:59:20 +02:00 |
|
Laurent Destailleur
|
154e44e761
|
Fix responsive
|
2018-09-04 19:57:20 +02:00 |
|
Laurent Destailleur
|
b3e6d4a943
|
Merge pull request #9399 from grandoc/new_branch_03_09_2018
New branch 03 09 2018
|
2018-09-04 15:59:00 +02:00 |
|
Frédéric FRANCE
|
bdcac95761
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-04 15:15:23 +02:00 |
|
Philippe GRAND
|
fada93574d
|
Merge branch 'new_branch_03_09_2018' of github.com:grandoc/dolibarr into new_branch_03_09_2018
|
2018-09-04 14:51:44 +02:00 |
|
Philippe GRAND
|
707f8b7312
|
fix merge
|
2018-09-04 14:49:56 +02:00 |
|
Philippe GRAND
|
d357031719
|
fix merge
|
2018-09-04 14:46:10 +02:00 |
|
Philippe GRAND
|
47b6374abc
|
Standardize and update code
|
2018-09-04 13:45:20 +02:00 |
|
Philippe GRAND
|
42565e722e
|
Standardize and update code
|
2018-09-04 13:37:00 +02:00 |
|
Philippe GRAND
|
0492492df1
|
fix merge
|
2018-09-04 12:30:06 +02:00 |
|
Laurent Destailleur
|
203c925c5b
|
Fix look and feel v8
|
2018-09-04 12:03:21 +02:00 |
|
Laurent Destailleur
|
23f4e7cc36
|
FIX #9251
|
2018-09-04 11:49:11 +02:00 |
|
Laurent Destailleur
|
c7fdd8686b
|
NEW Add civility in list of members. Close #9251
|
2018-09-04 11:41:28 +02:00 |
|
Laurent Destailleur
|
8c2eac4c93
|
FIX #9317
|
2018-09-04 11:34:23 +02:00 |
|
Laurent Destailleur
|
69cf7026eb
|
NEW Close #9296 Add field ref_ext into llx_categorie
|
2018-09-04 11:29:52 +02:00 |
|
Laurent Destailleur
|
3ef808cb9b
|
Fix #9302 MAIN_ENABLE_IMPORT_LINKED_OBJECT_LINES broken
|
2018-09-04 11:23:28 +02:00 |
|
Laurent Destailleur
|
9042d341f0
|
FIX #9316 Error when listing invoices
|
2018-09-04 11:19:31 +02:00 |
|
Laurent Destailleur
|
e7d2bcc34c
|
FIX #9316 Error when listing invoices
|
2018-09-04 11:17:08 +02:00 |
|
Laurent Destailleur
|
f2ec94e9fd
|
FIX #9353 Bug: html error - div inside span on graphs
|
2018-09-04 11:13:54 +02:00 |
|
Laurent Destailleur
|
76703972ed
|
FIX #9355
|
2018-09-04 10:53:42 +02:00 |
|
Laurent Destailleur
|
37afd79ec0
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-09-04 10:38:19 +02:00 |
|
Laurent Destailleur
|
9697bdf3b0
|
FIX #9393 inconsistency behaviour. option FACTURE_ENABLE_NEGATIVE_LINES
|
2018-09-04 10:38:09 +02:00 |
|
Laurent Destailleur
|
38c8d9d008
|
FIX inconsistency behaviour on option FACTURE_ENABLE_NEGATIVE_LINES
|
2018-09-04 10:37:29 +02:00 |
|
Laurent Destailleur
|
15b3fa73f4
|
FIX #9394
|
2018-09-04 10:16:16 +02:00 |
|
Laurent Destailleur
|
6b3ccddb65
|
FIX #9396
|
2018-09-04 10:14:45 +02:00 |
|
Laurent Destailleur
|
c59b0f95e6
|
FIX #9403
|
2018-09-04 10:10:47 +02:00 |
|
Laurent Destailleur
|
4a7bec2c04
|
Fix fax not required as visible by default on list
|
2018-09-04 09:48:30 +02:00 |
|
Laurent Destailleur
|
739c2822af
|
Fix look and feel v8
|
2018-09-04 09:42:28 +02:00 |
|
Laurent Destailleur
|
cdc1e1fc76
|
Fix responsive
|
2018-09-04 09:37:51 +02:00 |
|
Frédéric FRANCE
|
1ae1afe843
|
move phpcs:ignore
|
2018-09-04 08:09:48 +02:00 |
|
Laurent Destailleur
|
dc5d1432b1
|
Fix code not reachable
|
2018-09-04 01:23:46 +02:00 |
|
Laurent Destailleur
|
db6f80e2ff
|
FIX invoice popup hide localtax2 and 3 if not defined
|
2018-09-04 00:42:15 +02:00 |
|
Laurent Destailleur
|
94c05fbd84
|
Look and feel v8
|
2018-09-04 00:29:31 +02:00 |
|
Laurent Destailleur
|
6ce37e588d
|
Prepare 8.0.2
|
2018-09-04 00:22:14 +02:00 |
|
Laurent Destailleur
|
392f31abbd
|
FIX invert mime type and name
|
2018-09-04 00:21:48 +02:00 |
|
Frédéric FRANCE
|
d08b68e8ed
|
move phpcs:ignore
|
2018-09-03 20:38:52 +02:00 |
|
Frédéric FRANCE
|
7288335c6d
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-03 19:01:11 +02:00 |
|
Frédéric FRANCE
|
5f4a922c1d
|
move phpcs:ignore
|
2018-09-03 19:00:37 +02:00 |
|