aspangaro
|
bbab5e5bc3
|
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
|
2015-11-11 15:38:52 +01:00 |
|
Laurent Destailleur
|
e673b18871
|
Merge pull request #3949 from marcosgdf/bug-3865
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
|
2015-11-11 15:36:34 +01:00 |
|
Christophe Battarel
|
0c40a6dda5
|
add hidden constant
|
2015-11-11 15:32:42 +01:00 |
|
aspangaro
|
54091a0661
|
Correct getNomUrl
|
2015-11-11 15:31:39 +01:00 |
|
Laurent Destailleur
|
47ce8baadc
|
Merge pull request #3958 from aspangaro/develop-hrm
HRM: Update work
|
2015-11-11 15:28:14 +01:00 |
|
philippe grand
|
12c5d02a7a
|
[Qual] Uniformize code
|
2015-11-11 12:27:09 +01:00 |
|
aspangaro
|
e157d8b8d2
|
Update for fk_country
|
2015-11-11 08:52:28 +01:00 |
|
aspangaro
|
ca0c68a8e2
|
Merge remote-tracking branch 'Upstream/develop' into develop-hrm
|
2015-11-11 08:20:12 +01:00 |
|
aspangaro
|
e1b329e80a
|
HRM: Update work
|
2015-11-11 08:16:06 +01:00 |
|
Frédéric FRANCE
|
2799dbf45b
|
Update product.php
|
2015-11-10 23:02:54 +01:00 |
|
philippe grand
|
d06a445e01
|
[Qual] Uniformize code
|
2015-11-10 19:22:27 +01:00 |
|
Laurent Destailleur
|
13a0fa2c69
|
Missing css
|
2015-11-10 15:50:13 +01:00 |
|
Laurent Destailleur
|
b0419557b1
|
Exclude dir
|
2015-11-10 00:37:30 +01:00 |
|
Laurent Destailleur
|
98c32fa1ec
|
FIX The label hidden was not supported when using jmobile
|
2015-11-10 00:36:33 +01:00 |
|
Alexis Algoud
|
99513ac9f3
|
Merge branch 'develop' of https://github.com/Dolibarr/dolibarr into 3.9_NEW_multityppeeventfilter
|
2015-11-09 18:31:21 +01:00 |
|
frederic34
|
b8a84d68ec
|
add messages
|
2015-11-09 18:19:10 +01:00 |
|
Alexis Algoud
|
68cbd4699b
|
NEW multi event type for filter and get form in order to allow bookmark
|
2015-11-09 17:18:23 +01:00 |
|
Laurent Destailleur
|
19684f9a36
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-09 16:48:41 +01:00 |
|
Laurent Destailleur
|
f49fab8a7e
|
Rename some files in english and increase fields size.
|
2015-11-09 16:48:30 +01:00 |
|
Raphaël Doursenaud
|
c3ed30ffd8
|
Moved to new package for TCPDF
Previous one has been deprecated by upstream
|
2015-11-09 12:21:08 +01:00 |
|
Raphaël Doursenaud
|
93d6ae3c16
|
Ignore composer autoloader and binaries
@eldy is against those. Let's follow the leader…
|
2015-11-09 12:20:16 +01:00 |
|
Raphaël Doursenaud
|
e5915ce8d9
|
Upgraded PHPExcel to v1.8.1
Fixes issues with PHP 7
|
2015-11-09 12:19:48 +01:00 |
|
Raphaël Doursenaud
|
0e155be4e8
|
Reinstall ckeditor with composer
This time using the correct full package
Also used the branch + tag commit to work around that bug:
https://github.com/ckeditor/ckeditor-releases/issues/41
|
2015-11-09 12:18:50 +01:00 |
|
Raphaël Doursenaud
|
442431704b
|
Upgraded ADOdb Date to v0.36
Extracted from ADOdb v5.19
Fixes PHP 7 fatal error
|
2015-11-09 12:16:04 +01:00 |
|
Raphaël Doursenaud
|
7c44198022
|
[Qual] Prevent GIT submodules in composer deps
Dependencies installed with composer should not be added as submodules.
Restored missing Escpos-php library.
|
2015-11-09 12:12:05 +01:00 |
|
Marcos García de La Fuente
|
80ef746348
|
Reverted unwanted changes
|
2015-11-08 19:23:02 +01:00 |
|
Laurent Destailleur
|
71fa347e8e
|
FIX Better compatibility for users that used the not supported option
MAIN_USE_JQUERY_MULTISELECT set to 1.
|
2015-11-08 18:40:12 +01:00 |
|
Marcos García de La Fuente
|
9cdf45e0a6
|
Fixed JS compatibility with multiprices price generator
|
2015-11-08 16:54:54 +01:00 |
|
Marcos García de La Fuente
|
9bc4b9f0bc
|
Moved update function after updatePrice
|
2015-11-08 16:45:42 +01:00 |
|
Marcos García de La Fuente
|
7ebe032d6f
|
FIX #3865 ajax_autocompleter triggers twice change() JS event over #search_htmlname
Close #3865
|
2015-11-08 16:01:12 +01:00 |
|
Laurent Destailleur
|
096ec3100d
|
Merge pull request #3926 from frederic34/fccard
allow chaining and remove header exit
|
2015-11-08 15:49:33 +01:00 |
|
Laurent Destailleur
|
6ec33a94c6
|
Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop
|
2015-11-08 15:39:10 +01:00 |
|
Laurent Destailleur
|
bd56396394
|
Fix migration error
|
2015-11-08 15:38:57 +01:00 |
|
Laurent Destailleur
|
645e27d44a
|
Merge pull request #3947 from marcosgdf/little-changes
Little changes
|
2015-11-08 15:29:24 +01:00 |
|
Laurent Destailleur
|
350345ecca
|
Prepare 3.6.5
|
2015-11-08 15:18:26 +01:00 |
|
Marcos García de La Fuente
|
7f0d81d255
|
Missing changes of PR #3927
|
2015-11-08 15:12:31 +01:00 |
|
Laurent Destailleur
|
722a133b31
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.6.5
Conflicts:
ChangeLog
Conflicts:
ChangeLog
|
2015-11-08 15:09:57 +01:00 |
|
Laurent Destailleur
|
d4aeb8b3bc
|
Abandon package APS. Was never used.
3.6.5
|
2015-11-08 14:57:26 +01:00 |
|
Laurent Destailleur
|
04aba8ce96
|
Abandon package APS. Was never used.
|
2015-11-08 14:56:36 +01:00 |
|
Laurent Destailleur
|
9b8bb114cd
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.7.2
Conflicts:
ChangeLog
|
2015-11-08 14:55:12 +01:00 |
|
Marcos García de La Fuente
|
04243510f3
|
Little changes
|
2015-11-08 14:54:29 +01:00 |
|
Laurent Destailleur
|
c639e82062
|
FIX Add a protection to not make release if ChangeLog was not generated.
Conflicts:
ChangeLog
3.7.2
|
2015-11-08 14:45:56 +01:00 |
|
Laurent Destailleur
|
e6ab6bdb8e
|
Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7
|
2015-11-08 14:38:01 +01:00 |
|
Laurent Destailleur
|
7a0206adce
|
FIX Missing to set context into workflow actions, so triggers can't know
we are creating an invoice from order or an order from a proposal.
|
2015-11-08 14:37:50 +01:00 |
|
Laurent Destailleur
|
98b887edae
|
Update doc to generate ChangeLog
|
2015-11-08 12:23:40 +01:00 |
|
Laurent Destailleur
|
42ae4e10b3
|
Abandon package APS. Was never used.
|
2015-11-08 12:19:05 +01:00 |
|
Laurent Destailleur
|
6b98c50510
|
FIX Add a protection to not make release if ChangeLog was not generated.
|
2015-11-08 12:16:30 +01:00 |
|
Laurent Destailleur
|
4a96fc5f62
|
Merge branch '3.8' of git@github.com:Dolibarr/dolibarr.git into 3.8
|
2015-11-08 12:12:39 +01:00 |
|
Laurent Destailleur
|
972c364c37
|
FIX Add a protection to not make release if ChangeLog was not generated.
Prepare package 3.8.2
|
2015-11-08 12:12:28 +01:00 |
|
Juanjo Menent
|
0ce7cad48c
|
Merge pull request #3946 from aspangaro/3.7-1
Fix: Accountancy compatibility with subtotal & jalon module
|
2015-11-08 11:26:06 +01:00 |
|