Laurent Destailleur
|
e85921c82f
|
Start to introduce sftp
|
2015-09-07 11:45:33 +02:00 |
|
Laurent Destailleur
|
91ddca6ab0
|
Merge remote-tracking branch 'origin/3.8' into develop
Conflicts:
htdocs/core/tpl/objectline_edit.tpl.php
|
2015-09-06 16:34:40 +02:00 |
|
Laurent Destailleur
|
822d4d1b39
|
Fix remove log
|
2015-09-06 15:06:13 +02:00 |
|
Laurent Destailleur
|
aaa639a3ab
|
Fix error when mark rate is 100% and buying price is 0, no way to
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
|
2015-09-06 15:00:17 +02:00 |
|
Laurent Destailleur
|
7c2b6e7780
|
Fix error when mark rate is 100% and buying price is 0, no way to
recalculate the unit price.
Fix cancel button was disabled if mark rate was not valid
Fix if mark rate is a number with space, does not hang.
|
2015-09-06 14:55:29 +02:00 |
|
Laurent Destailleur
|
0d811dce6a
|
Start to mutualize the builddoc and remove_file action.
|
2015-09-06 14:21:42 +02:00 |
|
Laurent Destailleur
|
77ef046af4
|
Start to mutualize the builddoc and remove_file action.
|
2015-09-06 14:02:21 +02:00 |
|
Laurent Destailleur
|
a21b015cbb
|
Fix XSS
|
2015-09-05 20:03:02 +02:00 |
|
Laurent Destailleur
|
389cb00164
|
Prepare code to mutualise buildodc and remove_file
|
2015-09-05 20:02:38 +02:00 |
|
Laurent Destailleur
|
873f33b8ab
|
Missing translation
|
2015-09-05 11:22:14 +02:00 |
|
Laurent Destailleur
|
1b9b0082ba
|
Merge pull request #3387 from defrance/patch-75
NEW: add intervention Aera
|
2015-09-05 11:19:37 +02:00 |
|
Laurent Destailleur
|
d108881690
|
Merge pull request #3370 from atm-gauthier/new_add_next_ref_on_product_service_clone
NEW : conf to use next product/service ref when we clone a product/se…
|
2015-09-05 10:57:11 +02:00 |
|
Laurent Destailleur
|
974ea7cd79
|
Merge branch 'patch-61' of https://github.com/defrance/dolibarr into develop
Conflicts:
htdocs/core/tpl/contacts.tpl.php
htdocs/societe/class/societe.class.php
|
2015-09-05 10:52:35 +02:00 |
|
Laurent Destailleur
|
9cf6b824d0
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-09-05 10:50:42 +02:00 |
|
Laurent Destailleur
|
6a9933d9af
|
Update doc
|
2015-09-05 10:49:55 +02:00 |
|
Laurent Destailleur
|
fbbea5b9e1
|
Merge pull request #3468 from GPCsolutions/composer
Updated composer links
|
2015-09-05 10:28:09 +02:00 |
|
Laurent Destailleur
|
c03d508bd3
|
Merge pull request #3467 from guerrierk/develop
NEW Adding Document tab into Bank Account
|
2015-09-05 10:26:51 +02:00 |
|
Laurent Destailleur
|
087938e340
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into
develop
Conflicts:
htdocs/compta/bank/class/account.class.php
|
2015-09-05 10:25:01 +02:00 |
|
Laurent Destailleur
|
ce17ee2b88
|
git push origin developMerge branch 'open-minds-patch-2' into develop
|
2015-09-05 10:23:06 +02:00 |
|
Laurent Destailleur
|
6ac4b8d0d4
|
Merge branch 'patch-2' of https://github.com/open-minds/dolibarr into open-minds-patch-2
|
2015-09-05 10:22:43 +02:00 |
|
Laurent Destailleur
|
4c0f117e55
|
Merge pull request #3465 from open-minds/patch-1
Fix detailed information of BBAN for Germany
|
2015-09-05 10:22:12 +02:00 |
|
Laurent Destailleur
|
25d89f3b2b
|
Merge pull request #3469 from frederic34/patch-9
Typo
|
2015-09-05 10:21:33 +02:00 |
|
Frédéric FRANCE
|
132a464df6
|
Update product.php
|
2015-09-05 08:57:01 +02:00 |
|
Raphaël Doursenaud
|
04e33fc92b
|
Updated composer links
|
2015-09-05 02:40:05 +02:00 |
|
Laurent Destailleur
|
304a71710e
|
Fix not complete info
|
2015-09-05 00:57:11 +02:00 |
|
Laurent Destailleur
|
51c5e01290
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-09-05 00:48:56 +02:00 |
|
Laurent Destailleur
|
7926fd8083
|
NEW ODT generators can set meta properties of ODT file
|
2015-09-05 00:47:06 +02:00 |
|
Laurent Destailleur
|
2a8ebcefcc
|
Merge pull request #3412 from gschratzer/develop
NEW update actions_sendmails.inc.php files.inc.php
|
2015-09-04 23:38:01 +02:00 |
|
Laurent Destailleur
|
8bea703363
|
Fix deadlock feature. Can't reconciliate cash bank account. Sometimes
users need. I introduce a hidden option to fix this quickly.
|
2015-09-04 23:23:39 +02:00 |
|
Laurent Destailleur
|
398e9bad94
|
Add ignore
Conflicts:
htdocs/.gitignore
|
2015-09-04 23:22:38 +02:00 |
|
GUERRIER Kevin
|
2395c1ca11
|
fix comment in file description
|
2015-09-04 21:58:09 +02:00 |
|
GUERRIER Kevin
|
a80b4703a9
|
Bugfix w/ Travis CI
|
2015-09-04 21:42:14 +02:00 |
|
GUERRIER Kevin
|
f69e35c6ce
|
Merge branch 'develop' of https://github.com/guerrierk/dolibarr into develop
|
2015-09-04 21:30:20 +02:00 |
|
GUERRIER Kevin
|
692fdbaec4
|
Adding Document tab into Bank Account
|
2015-09-04 21:29:16 +02:00 |
|
GUERRIER Kevin
|
d18b03840b
|
Adding Document tab into Bank Account
|
2015-09-04 21:16:43 +02:00 |
|
Juanjo Menent
|
ba0bf57707
|
Merge pull request #3353 from GPCsolutions/sentry
NEW Sentry logging support
|
2015-09-04 20:10:27 +02:00 |
|
Juanjo Menent
|
7924a8704d
|
Merge pull request #3352 from GPCsolutions/dolibarr-3351
NEW Composer installed dependencies
|
2015-09-04 20:09:38 +02:00 |
|
Laurent Destailleur
|
a66bcf1965
|
Fix deadlock feature. Can't reconciliate cash bank account. Sometimes
users need. I introduce a hidden option to fix this quickly.
|
2015-09-04 19:42:07 +02:00 |
|
Raphaël Doursenaud
|
1618cbc5bc
|
Added Raven libraries to list
|
2015-09-04 19:10:53 +02:00 |
|
Raphaël Doursenaud
|
a6ef289470
|
New Added client-side Sentry logging
Using Raven.js allows logging client-side javascript errors to the
configured Sentry server.
|
2015-09-04 19:10:46 +02:00 |
|
Raphaël Doursenaud
|
7ef5cbfb96
|
Updated raven-php to v0.12.1
|
2015-09-04 19:10:38 +02:00 |
|
Raphaël Doursenaud
|
7bb917e637
|
NEW Support logging to a Sentry server
Sentry is an Open Source error logging and aggregation platform.
It can be used on-premise or hosted at https://getsentry.com
|
2015-09-04 19:10:13 +02:00 |
|
Raphaël Doursenaud
|
3b5473abe4
|
NEW Syslog displays configuration errors
|
2015-09-04 19:10:04 +02:00 |
|
Raphaël Doursenaud
|
e5eefa685f
|
Add Raven client for Sentry
|
2015-09-04 19:09:55 +02:00 |
|
Raphaël Doursenaud
|
1ffb28a460
|
Fixed mobile detect classname without autoloader
|
2015-09-04 19:06:04 +02:00 |
|
Raphaël Doursenaud
|
32cb76a62b
|
Added missing TCPDI lib to COPYRIGHT
|
2015-09-04 19:06:04 +02:00 |
|
Raphaël Doursenaud
|
e0312d048b
|
Install TCPDF from composer
|
2015-09-04 19:06:04 +02:00 |
|
Raphaël Doursenaud
|
321094ab42
|
Install Restler framework from composer
|
2015-09-04 19:06:02 +02:00 |
|
Raphaël Doursenaud
|
1b7ed43c60
|
Install PHPExcel from composer
|
2015-09-04 19:06:02 +02:00 |
|
Raphaël Doursenaud
|
0eb0f52b6d
|
Install mobiledetect from composer
|
2015-09-04 19:06:01 +02:00 |
|