Commit Graph

69299 Commits

Author SHA1 Message Date
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
Laurent Destailleur
f3b0e16f27
Merge pull request #9411 from frederic34/patch-11
Update api_agendaevents.class.php
2018-09-05 14:16:05 +02:00
Laurent Destailleur
f7d5172a74
Merge pull request #9410 from frederic34/patch-10
Create index.html
2018-09-05 14:15:22 +02:00
Laurent Destailleur
ead2a764c7
Merge pull request #9409 from frederic34/patch-9
Create index.html
2018-09-05 14:15:12 +02:00
Philippe GRAND
11d75573be Standardize and update code 2018-09-05 12:21:13 +02:00
Philippe GRAND
38ca6096b2 Standardize and update code 2018-09-05 10:31:12 +02:00
Ferran Marcet
57be6a752e Fix: Expedition not showing extrafields on creation 2018-09-05 10:00:33 +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
2015268b7e
Create index.html 2018-09-04 22:06:24 +02:00
Frédéric FRANCE
e4afd4af00
Create index.html 2018-09-04 22:05:06 +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
Philippe Grand
c32c67ca57
Merge branch 'develop' into develop 2018-09-04 16:58:59 +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
50a26aaf16 fix merge 2018-09-04 14:33:34 +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
Ferran Marcet
ba68a6373c Merge remote-tracking branch 'upstream/develop' into develop 2018-09-04 11:57:33 +02:00
Ferran Marcet
b658626e21 NEW: Highlight lines on lists when they are checked 2018-09-04 11:54:13 +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