florian HENRY
|
42bf6fd3dc
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_ticketsup
|
2018-03-11 16:13:51 +01:00 |
|
florian HENRY
|
cfdaa7c88d
|
ticket sup make it work
|
2018-03-11 16:07:13 +01:00 |
|
Laurent Destailleur
|
e393621f2f
|
Dolibarrize
|
2018-03-11 16:00:18 +01:00 |
|
Laurent Destailleur
|
0ac1d8b226
|
Dolibarize
|
2018-03-11 11:33:24 +01:00 |
|
Laurent Destailleur
|
e14d2f08b8
|
Dolibarize
|
2018-03-11 11:12:38 +01:00 |
|
Laurent Destailleur
|
8217587b5e
|
Dolibarize new module
|
2018-03-11 10:34:21 +01:00 |
|
Laurent Destailleur
|
a331fdd0b8
|
Merge pull request #8338 from Librethic/ticketsup_core
NEW : Ticketsup module integration
|
2018-03-11 10:06:27 +01:00 |
|
jfefe
|
138c842959
|
Correct bad paths
|
2018-03-11 09:44:58 +01:00 |
|
jfefe
|
79acb79ae0
|
Begin integration of module « Ticketsup »
Related to #4948
|
2018-03-11 09:44:58 +01:00 |
|
Laurent Destailleur
|
ce53c8fdb5
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-03-11 02:21:37 +01:00 |
|
Laurent Destailleur
|
4070d78d13
|
Fix phpcs
|
2018-03-11 02:18:46 +01:00 |
|
Laurent Destailleur
|
5d86b8e621
|
Merge pull request #8337 from atm-florian/dev_fixscrunitiz
fix scrunitizer
|
2018-03-11 02:08:35 +01:00 |
|
Laurent Destailleur
|
7f469e9f6f
|
Fix PHPCS
|
2018-03-11 02:04:08 +01:00 |
|
Laurent Destailleur
|
6baafab53c
|
Fix travis errors
|
2018-03-11 01:52:40 +01:00 |
|
Laurent Destailleur
|
5edaa9a98c
|
Fix phpcs
|
2018-03-11 01:50:15 +01:00 |
|
Laurent Destailleur
|
5b0dd0e31b
|
Try to fix regression
|
2018-03-11 01:23:06 +01:00 |
|
florian HENRY
|
888afe0e33
|
fix scrunitizer
|
2018-03-11 00:25:14 +01:00 |
|
Laurent Destailleur
|
06689bb79f
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2018-03-11 00:16:21 +01:00 |
|
Laurent Destailleur
|
64f21b8a3c
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into develop
Conflicts:
htdocs/expensereport/card.php
|
2018-03-11 00:10:13 +01:00 |
|
Laurent Destailleur
|
11abbbcd98
|
Merge pull request #8334 from atm-florian/dev_fixtrigger
fix trigger position into explication class
|
2018-03-11 00:00:43 +01:00 |
|
Laurent Destailleur
|
17d1a15d50
|
Update expedition.class.php
|
2018-03-11 00:00:24 +01:00 |
|
Laurent Destailleur
|
a7737cc436
|
Merge pull request #8332 from defrance/patch-105
primary key without space
|
2018-03-10 23:53:53 +01:00 |
|
Laurent Destailleur
|
0389664b1e
|
Fix php code
|
2018-03-10 23:50:41 +01:00 |
|
florian HENRY
|
3da645ab3b
|
fix trigger position into explication class
|
2018-03-10 23:40:56 +01:00 |
|
BENKE Charlene
|
0d50cab97e
|
primary key without space
|
2018-03-10 23:05:24 +01:00 |
|
Laurent Destailleur
|
390618db47
|
Fix bad space
|
2018-03-10 22:42:28 +01:00 |
|
Laurent Destailleur
|
bdb6a09762
|
Fix phpcs
|
2018-03-10 22:41:57 +01:00 |
|
Laurent Destailleur
|
54d2e1f55d
|
Merge pull request #7970 from marcosgdf/bug-6980
FIX #6980 FormMail::getEmailTemplate returns an array instead of a ModelMail object
|
2018-03-10 22:27:32 +01:00 |
|
Laurent Destailleur
|
72bccd9c6b
|
Merge branch 'develop' into bug-6980
|
2018-03-10 22:27:07 +01:00 |
|
Laurent Destailleur
|
dfb3d1b3bc
|
Merge pull request #8325 from inoveaconseil/develop
Add execution date on direct debit
|
2018-03-10 22:11:58 +01:00 |
|
Laurent Destailleur
|
bb835d3633
|
Update bonprelevement.class.php
|
2018-03-10 22:09:32 +01:00 |
|
Laurent Destailleur
|
ce13fa56a2
|
Merge pull request #8302 from ptibogxiv/ptibogxiv-stripe
ADD IPN/webhook for stripe
|
2018-03-10 22:05:37 +01:00 |
|
Laurent Destailleur
|
3a8c216ab6
|
Merge branch 'develop' into ptibogxiv-stripe
|
2018-03-10 22:05:18 +01:00 |
|
Laurent Destailleur
|
8aec5cf6fa
|
Merge pull request #8331 from atm-alexis/NEW_hidden_conf_for_nb_weeks_to_swho
NEW hidden conf AGENDA_NB_WEEKS_IN_VIEW_PER_USER to set nb weeks to show into per user view
|
2018-03-10 21:55:58 +01:00 |
|
Laurent Destailleur
|
d10b7ef05a
|
Merge pull request #8330 from BadPixxel/7.0_Fix_Product_price_warning
Fix for PHP7.1: PHP Warning: A non-numeric value in product.class.php
|
2018-03-10 21:53:48 +01:00 |
|
Laurent Destailleur
|
0b1b740a0e
|
Merge pull request #8329 from BadPixxel/7.0
BugFix Issue #8261: Variants module. Combinations cannot be edited
|
2018-03-10 21:53:12 +01:00 |
|
Laurent Destailleur
|
6c9e0e1752
|
Merge branch '7.0' into 7.0
|
2018-03-10 21:52:57 +01:00 |
|
Alexis Algoud
|
74dc815bfa
|
fix commonobject isInt for module builder capabilities
|
2018-03-10 19:02:06 +01:00 |
|
Laurent Destailleur
|
72eff36cd6
|
Merge pull request #8328 from atm-alexis/FIX_commonObject_isInt_linked
Fix commonobject isInt for module builder capabilities
|
2018-03-10 18:59:12 +01:00 |
|
Laurent Destailleur
|
905cf112e9
|
Merge pull request #8327 from tiaris/fix7.0
FIX #8289
|
2018-03-10 18:58:22 +01:00 |
|
Laurent Destailleur
|
6fcc271790
|
Update product.class.php
|
2018-03-10 18:57:55 +01:00 |
|
Laurent Destailleur
|
f609547bc9
|
Update bonprelevement.class.php
|
2018-03-10 18:50:41 +01:00 |
|
Laurent Destailleur
|
9e0c74ca20
|
Update bonprelevement.class.php
|
2018-03-10 18:49:48 +01:00 |
|
Laurent Destailleur
|
b2677c35e2
|
Merge pull request #8317 from frederic34/swifmailer
Add dkim signing with Swiftmailer
|
2018-03-10 18:48:08 +01:00 |
|
Laurent Destailleur
|
aea3c164ba
|
Merge pull request #8178 from hregis/7.0_bug2
Fix: avoid Warning: A non-numeric value encountered
|
2018-03-10 18:47:11 +01:00 |
|
Laurent Destailleur
|
3911738b88
|
Fix vulnerability reported by DIGITEMIS CYBERSECURITY & PRIVACY
|
2018-03-10 18:40:45 +01:00 |
|
Laurent Destailleur
|
e3ace1f89f
|
Fix morecss not provided
|
2018-03-10 18:17:54 +01:00 |
|
Laurent Destailleur
|
702c84a100
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-03-10 17:57:49 +01:00 |
|
Alexis Algoud
|
129c032118
|
NEW hidden conf to set nb weeks to show into user view
|
2018-03-10 16:46:57 +01:00 |
|
BadPixxel
|
ea3872b0cb
|
BugFix for PHP7.1: PHP Warning: A non-numeric value encountered in /tmp/Dolibarr/htdocs/product/class/product.class.php on line 1709
|
2018-03-10 15:57:29 +01:00 |
|