Laurent Destailleur
|
8ceee52d97
|
Merge pull request #9507 from frederic34/stripetransac
clean code indentation completely broken
|
2018-09-15 17:27:20 +02:00 |
|
Laurent Destailleur
|
c587de4a3d
|
Merge branch 'develop' into stripetransac
|
2018-09-15 17:27:04 +02:00 |
|
Laurent Destailleur
|
4efab446d0
|
Merge pull request #9508 from frederic34/patch-15
reduce complexity of libstatut propal.class.php
|
2018-09-15 17:24:59 +02:00 |
|
Laurent Destailleur
|
1749c07ffe
|
Merge pull request #9496 from ptibogxiv/patch-61
Fix currency display in transaction.php
|
2018-09-15 17:07:27 +02:00 |
|
Laurent Destailleur
|
69a577f58d
|
Update transaction.php
|
2018-09-15 17:07:18 +02:00 |
|
Laurent Destailleur
|
ef2970a331
|
Merge pull request #9495 from ptibogxiv/patch-60
Fix currency display charge.php
|
2018-09-15 17:05:44 +02:00 |
|
Laurent Destailleur
|
2d0b4e5b5f
|
Merge pull request #9505 from frederic34/patch-14
Reduce complexity of libstatut asset.class.php
|
2018-09-15 17:02:16 +02:00 |
|
Laurent Destailleur
|
73f5e183d6
|
Merge pull request #9386 from frederic34/testsqlAndScript
deprecated test_sql_and_script_inject
|
2018-09-15 17:01:40 +02:00 |
|
Laurent Destailleur
|
76cdbc8bf1
|
Merge branch 'develop' into testsqlAndScript
|
2018-09-15 17:01:23 +02:00 |
|
Laurent Destailleur
|
aacf5a0c86
|
Merge pull request #9490 from frederic34/patch-10
reduce complexity of libstatut loan.class.php
|
2018-09-15 17:00:04 +02:00 |
|
Laurent Destailleur
|
5eff159e27
|
Merge pull request #9489 from frederic34/patch-9
Completely comment unused code
|
2018-09-15 16:59:49 +02:00 |
|
Laurent Destailleur
|
5224f9ce56
|
Merge pull request #9488 from frederic34/patch-6
reduce complexity of libstatut don.class.php
|
2018-09-15 16:58:28 +02:00 |
|
Laurent Destailleur
|
f88dba91ab
|
Trans
|
2018-09-15 14:15:21 +02:00 |
|
Laurent Destailleur
|
bbfe4462dc
|
NEW Add lib for multiselect with checkboxes
NEW Can select several prospect level in thirdparty filter.
Remove old multiselect lib that was not used by core.
|
2018-09-15 13:31:25 +02:00 |
|
ptibogxiv
|
e0eb43909d
|
fix var
|
2018-09-14 17:57:47 +02:00 |
|
ptibogxiv
|
e9fb2387b0
|
link to stripe customer
|
2018-09-14 17:46:02 +02:00 |
|
ptibogxiv
|
bf38f1a80f
|
fix url in connect mode
|
2018-09-14 15:27:43 +02:00 |
|
Laurent Destailleur
|
80fb1e0657
|
NEW Each user can set its prefered default calendar
|
2018-09-14 11:23:15 +02:00 |
|
ptibogxiv
|
5dcbfe0e56
|
fix $servicestatus
|
2018-09-14 11:18:37 +02:00 |
|
Laurent Destailleur
|
961505d510
|
NEW Add filter on staff range in list of thirdparties
|
2018-09-14 01:29:03 +02:00 |
|
Frédéric FRANCE
|
bcc9a3d259
|
reduce complexity of libstatut propal.class.php
|
2018-09-13 21:45:46 +02:00 |
|
Frédéric FRANCE
|
effde65e4e
|
Update asset.class.php
|
2018-09-13 20:42:06 +02:00 |
|
Laurent Destailleur
|
78e983a1f5
|
CSS v9
|
2018-09-13 16:39:50 +02:00 |
|
Frédéric FRANCE
|
79cb1f5699
|
clean code
|
2018-09-13 13:57:01 +02:00 |
|
ptibogxiv
|
c36ee72de0
|
Update transaction.php
|
2018-09-13 11:32:52 +02:00 |
|
ptibogxiv
|
fad2502525
|
Update transaction.php
|
2018-09-13 11:31:39 +02:00 |
|
ptibogxiv
|
2ed0a72db5
|
Fix currency display in transaction.php
|
2018-09-13 11:10:58 +02:00 |
|
ptibogxiv
|
c620c64391
|
Fix currency display charge.php
|
2018-09-13 11:06:18 +02:00 |
|
Frédéric FRANCE
|
05fc484d42
|
Update loan.class.php
|
2018-09-12 22:53:09 +02:00 |
|
Frédéric FRANCE
|
a128ea821e
|
Completely comment unused code
|
2018-09-12 22:49:32 +02:00 |
|
Frédéric FRANCE
|
c38239b6f9
|
Update don.class.php
|
2018-09-12 22:43:14 +02:00 |
|
Laurent Destailleur
|
ca85356b45
|
Merge pull request #9427 from frederic34/patch-6
deprecate Form::select_date
|
2018-09-12 22:07:23 +02:00 |
|
Laurent Destailleur
|
0b02673ba5
|
Merge pull request #9487 from frederic34/patch-5
Update categorie.class.php
|
2018-09-12 22:03:18 +02:00 |
|
Laurent Destailleur
|
b5b4410e75
|
Duplicate delete
|
2018-09-12 22:02:50 +02:00 |
|
Laurent Destailleur
|
b4264ee0a0
|
Use font awesome for sort image
|
2018-09-12 21:57:32 +02:00 |
|
Laurent Destailleur
|
765d8ec1fe
|
Better description
|
2018-09-12 21:33:48 +02:00 |
|
Laurent Destailleur
|
f46a137e25
|
Better description
|
2018-09-12 21:32:58 +02:00 |
|
Frédéric FRANCE
|
987fdbe73c
|
Merge remote-tracking branch 'upstream/develop' into patch-6
|
2018-09-12 21:29:41 +02:00 |
|
Laurent Destailleur
|
963d5eeddf
|
Merge pull request #9387 from frederic34/camelCaps2
start changing phpcs:ignore
|
2018-09-12 21:14:34 +02:00 |
|
Laurent Destailleur
|
b1d9846969
|
Merge pull request #9486 from grandoc/new_branch_12_09_2018
New branch 12 09 2018
|
2018-09-12 21:13:32 +02:00 |
|
Laurent Destailleur
|
b978c4114c
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-09-12 21:12:27 +02:00 |
|
Laurent Destailleur
|
b3dec042b5
|
Fix translation
|
2018-09-12 21:12:15 +02:00 |
|
Frédéric FRANCE
|
04d3c7f43b
|
Update categorie.class.php
|
2018-09-12 21:07:54 +02:00 |
|
Laurent Destailleur
|
9d9e2bc3e3
|
Merge pull request #9405 from fmarcet/develop
NEW: Highlight lines on lists when they are checked
|
2018-09-12 20:50:42 +02:00 |
|
Frédéric FRANCE
|
ce76a2e714
|
Merge remote-tracking branch 'upstream/develop' into camelCaps2
|
2018-09-12 20:21:35 +02:00 |
|
Laurent Destailleur
|
c7d7480395
|
Merge pull request #9312 from grandoc/develop
Update and standardize code
|
2018-09-12 19:51:34 +02:00 |
|
Laurent Destailleur
|
056ef802e4
|
Fix syntax error
|
2018-09-12 19:49:57 +02:00 |
|
ptibogxiv
|
ef4659c518
|
add capture option in payment function
Conflicts:
htdocs/stripe/class/stripe.class.php
|
2018-09-12 19:47:04 +02:00 |
|
Philippe GRAND
|
06cde1c35f
|
Standardize and update code
|
2018-09-12 19:32:30 +02:00 |
|
Philippe GRAND
|
04017367f9
|
Standardize and update code
|
2018-09-12 19:24:45 +02:00 |
|