Laurent Destailleur
|
d9b55f2275
|
Merge branch 'develop' into dev_ticketsup
|
2018-03-11 18:12:47 +01:00 |
|
Frédéric FRANCE
|
5251a6c72a
|
Update index.php
|
2018-03-11 18:12:32 +01:00 |
|
Laurent Destailleur
|
baf6fc6a8b
|
Merge pull request #8343 from atm-maxime/develop
Fix mail send
|
2018-03-11 18:11:37 +01:00 |
|
Laurent Destailleur
|
0005b1bc48
|
Merge pull request #8342 from atm-florian/dev_fixscrunitiz
fix scrunitizer
|
2018-03-11 18:11:13 +01:00 |
|
Laurent Destailleur
|
4b3c2bb824
|
Merge pull request #8340 from Librethic/ticketsup_core
Fix PHPCS errors with ticketsup module
|
2018-03-11 18:10:19 +01:00 |
|
Laurent Destailleur
|
40cf236f92
|
Merge branch 'develop' into ticketsup_core
|
2018-03-11 18:10:11 +01:00 |
|
Laurent Destailleur
|
d0598a767c
|
Merge pull request #8339 from frederic34/patch-4
Update ticketsup linkedobjectblock.tpl.php
|
2018-03-11 18:06:40 +01:00 |
|
Laurent Destailleur
|
d6eee30ee9
|
Merge pull request #8336 from defrance/patch-106
add sql log on install debug
|
2018-03-11 18:06:18 +01:00 |
|
Laurent Destailleur
|
dea80eba4e
|
Use a constant name starting with MAIN
|
2018-03-11 18:06:08 +01:00 |
|
Laurent Destailleur
|
f0a0c8c3e5
|
Fix phpcs
|
2018-03-11 17:57:58 +01:00 |
|
Regis Houssin
|
af6f7f6773
|
Fix: travis
|
2018-03-11 17:44:47 +01:00 |
|
Frédéric FRANCE
|
435a049960
|
Create index.html
|
2018-03-11 17:35:00 +01:00 |
|
jfefe
|
3b814ebba2
|
Try to fix phpunit test (br tag isuue)
|
2018-03-11 16:54:39 +01:00 |
|
Laurent Destailleur
|
7ffce2a28f
|
Dolibarize
|
2018-03-11 16:48:44 +01:00 |
|
jfefe
|
c3fab4c54c
|
Fix Phpunit issue
|
2018-03-11 16:48:26 +01:00 |
|
florian HENRY
|
42bf6fd3dc
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into dev_ticketsup
|
2018-03-11 16:13:51 +01:00 |
|
jfefe
|
2464fadf03
|
Merge branch 'develop' into ticketsup_core
|
2018-03-11 16:11:01 +01:00 |
|
florian HENRY
|
cfdaa7c88d
|
ticket sup make it work
|
2018-03-11 16:07:13 +01:00 |
|
jfefe
|
5656e17570
|
Fix PHPCS errors (ticketsup module)
|
2018-03-11 16:06:11 +01:00 |
|
Laurent Destailleur
|
e393621f2f
|
Dolibarrize
|
2018-03-11 16:00:18 +01:00 |
|
Maxime Kohlhaas
|
df185de6ae
|
Fix mail send
|
2018-03-11 15:09:25 +01:00 |
|
florian HENRY
|
6d8566a238
|
fix scrunitizer
|
2018-03-11 12:41:48 +01:00 |
|
jfefe
|
0f96575b41
|
Fix PHPCS errors with ticketsup module
|
2018-03-11 12:06:57 +01:00 |
|
Frédéric FRANCE
|
26dbd4f3a1
|
Update linkedobjectblock.tpl.php
|
2018-03-11 11:43:12 +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 |
|
BENKE Charlene
|
bfaffe6692
|
Changes Done
|
2018-03-11 10:51:05 +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 |
|
Laurent Destailleur
|
5c4b5cc74f
|
fix
|
2018-03-11 00:40:35 +01:00 |
|
Laurent Destailleur
|
9ed2e47775
|
Merge branch '7.0' of git@github.com:Dolibarr/dolibarr.git into 7.0
|
2018-03-11 00:32:41 +01:00 |
|
Laurent Destailleur
|
897b3f7b79
|
Fix setup
|
2018-03-11 00:31:26 +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
|
f98ca2e31a
|
Merge pull request #8335 from inoveaconseil/patch-1
Fix #8092
|
2018-03-11 00:06:28 +01:00 |
|
Laurent Destailleur
|
03f7df88c6
|
Update card.php
|
2018-03-11 00:05:32 +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 |
|
BENKE Charlene
|
923bad4da6
|
add sql log on install debug
new global variable INSTALL_DISPLAY_SQL_LOG to display sql log on module install
|
2018-03-10 23:59:34 +01:00 |
|
Laurent Destailleur
|
c755d5f58d
|
Merge pull request #8333 from atm-maxime/fix_advtargetemailin
Fix #8057
|
2018-03-10 23:54:34 +01:00 |
|