Laurent Destailleur
|
86cf289f14
|
Merge pull request #9430 from grandoc/new_branch_07_09_2018
New branch 07 09 2018
|
2018-09-07 19:38:57 +02:00 |
|
Laurent Destailleur
|
bcfb5fc42e
|
Merge pull request #9425 from atm-maxime/8.0
FIX : Homepage links were using wrong topmenus
|
2018-09-07 19:35:10 +02:00 |
|
Laurent Destailleur
|
e2df3fd4ad
|
Merge pull request #9423 from ptibogxiv/patch-55
Fix error when delete stripe customer
|
2018-09-07 19:34:45 +02:00 |
|
Laurent Destailleur
|
aa562c9c69
|
Merge pull request #9420 from frederic34/patch-5
Update holiday.class.php
|
2018-09-07 19:32:36 +02:00 |
|
Laurent Destailleur
|
33f71be6ef
|
Fix gradient ok for webview
|
2018-09-07 19:03:53 +02:00 |
|
Laurent Destailleur
|
7c5ceff569
|
Fix search on project
|
2018-09-07 15:01:34 +02:00 |
|
Philippe GRAND
|
035b2be2eb
|
Standardize and update call to langs
|
2018-09-07 14:58:22 +02:00 |
|
Philippe GRAND
|
af37b08da3
|
Merge remote-tracking branch 'upstream/develop' into new_branch_07_09_2018
|
2018-09-07 14:48:43 +02:00 |
|
Philippe GRAND
|
4e9447cbed
|
Merge branch 'develop' of github.com:Dolibarr/dolibarr into develop
|
2018-09-07 14:46:31 +02:00 |
|
Laurent Destailleur
|
0ef17fe581
|
FIX Problems with permissions of module to record payment of salaries
|
2018-09-07 13:32:56 +02:00 |
|
Laurent Destailleur
|
e5058a251d
|
Use colored gradient background on login page
|
2018-09-07 12:27:08 +02:00 |
|
Philippe GRAND
|
a6d13b06b0
|
Standardize and update call to
|
2018-09-07 10:40:36 +02:00 |
|
Frédéric FRANCE
|
7e0ef3ad7e
|
Update fiscalyear_card.php
|
2018-09-06 22:10:19 +02:00 |
|
Frédéric FRANCE
|
ab4ae0f7bb
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-06 21:28:30 +02:00 |
|
Frédéric FRANCE
|
70ba223788
|
move phpcs:ignore
|
2018-09-06 21:27:18 +02:00 |
|
Philippe GRAND
|
97c740f510
|
Merge branch 'develop' of github.com:grandoc/dolibarr into develop
|
2018-09-06 19:28:10 +02:00 |
|
Philippe GRAND
|
e9c2a475bc
|
fix merge
|
2018-09-06 19:27:28 +02:00 |
|
Frédéric FRANCE
|
cbf4a20a13
|
move phpcs:ignore
|
2018-09-06 19:03:09 +02:00 |
|
Frédéric FRANCE
|
3ecf788438
|
move phpcs:ignore
|
2018-09-06 18:29:01 +02:00 |
|
Laurent Destailleur
|
ff05997f0a
|
FIX Several fixes on the management of minimal amount for orders
|
2018-09-06 17:37:02 +02:00 |
|
Maxime Kohlhaas
|
a5f4a74ecc
|
FIX : Homepage links were using wrong topmenus
|
2018-09-06 14:49:48 +02:00 |
|
ptibogxiv
|
da4e902645
|
Fix error when delete stripe customer
|
2018-09-06 11:35:19 +02:00 |
|
Laurent Destailleur
|
c5695db3e4
|
NEW Can disable meteo on smartphone only
|
2018-09-06 11:09:51 +02:00 |
|
Philippe GRAND
|
3c06527a7b
|
Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018
|
2018-09-06 09:50:12 +02:00 |
|
Laurent Destailleur
|
b25a0ca672
|
Fix no need of thumb when upload image for email
|
2018-09-05 23:25:17 +02:00 |
|
Laurent Destailleur
|
f7c87a9ad3
|
Clean cron init
|
2018-09-05 22:46:08 +02:00 |
|
Frédéric FRANCE
|
5a618c6808
|
Update holiday.class.php
|
2018-09-05 21:14:15 +02:00 |
|
Frédéric FRANCE
|
4cbfa2073a
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-05 21:02:16 +02:00 |
|
Laurent Destailleur
|
2a471df828
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-05 20:42:55 +02:00 |
|
Laurent Destailleur
|
ed31eec5ee
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-09-05 20:40:19 +02:00 |
|
Laurent Destailleur
|
dfea391c88
|
Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
Conflicts:
htdocs/core/lib/pdf.lib.php
|
2018-09-05 20:39:38 +02:00 |
|
Frédéric FRANCE
|
85df267a5b
|
move phpcs:ignore
|
2018-09-05 20:36:44 +02:00 |
|
Laurent Destailleur
|
4ac67e6409
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-05 20:31:10 +02:00 |
|
Laurent Destailleur
|
e3339f5f95
|
Fix trad
|
2018-09-05 19:01:00 +02:00 |
|
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 |
|
ptibogxiv
|
b630a97215
|
add payment link on admin gateway
|
2018-09-05 17:41:37 +02:00 |
|
ptibogxiv
|
6e209b550b
|
add payment link for donation
|
2018-09-05 17:40:26 +02:00 |
|
ptibogxiv
|
639f24a95b
|
Add online payment link
|
2018-09-05 17:36:28 +02:00 |
|
Laurent Destailleur
|
0bd4bc39dd
|
Fix responsive
|
2018-09-05 16:03:43 +02:00 |
|
Laurent Destailleur
|
ad92556a31
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-05 16:03:21 +02:00 |
|
Laurent Destailleur
|
cb89942bfb
|
Add option capture on input file for photo
|
2018-09-05 16:03:10 +02:00 |
|
Philippe GRAND
|
056b0b26cc
|
fix : Public member variable _fetched must not be prefixed with an underscore
|
2018-09-05 15:39:04 +02:00 |
|
Philippe GRAND
|
36e837207b
|
Merge remote-tracking branch 'upstream/develop' into new_branch_03_09_2018
|
2018-09-05 15:35:42 +02:00 |
|
Laurent Destailleur
|
3650dc3ec9
|
FIX #8452
|
2018-09-05 15:25:47 +02:00 |
|
Laurent Destailleur
|
f1cb13634b
|
FIX Entering negative price on order
|
2018-09-05 14:55:45 +02:00 |
|
Laurent Destailleur
|
19431a94ba
|
Code style
|
2018-09-05 14:37:44 +02:00 |
|
Laurent Destailleur
|
1882043f19
|
Merge branch '8.0' of git@github.com:Dolibarr/dolibarr.git into 8.0
|
2018-09-05 14:26:24 +02:00 |
|
Laurent Destailleur
|
51901108ad
|
FIX #9412
|
2018-09-05 14:26:12 +02:00 |
|
Laurent Destailleur
|
49b568f73f
|
Merge pull request #9413 from fmarcet/8.0
FIX Expedition not showing extrafields on creation
|
2018-09-05 14:16:28 +02:00 |
|