Commit Graph

32077 Commits

Author SHA1 Message Date
simnandez
bcfd35648b Fix: [ bug #427 ] Bad links to wiki help in certains menus 2012-06-15 15:54:56 +02:00
Laurent Destailleur
554a5b4c29 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-06-15 12:44:31 +02:00
Laurent Destailleur
eb543f0606 Fix: missing a return into clean_url function 2012-06-15 12:44:11 +02:00
Regis Houssin
1f4d3207fe Merge pull request #227 from simnandez/3.2
Fix: [ bug #427 ] Bad links to wiki help in certains menus
2012-06-15 03:28:20 -07:00
simnandez
83d75aaa31 Fix: [ bug #427 ] Bad links to wiki help in certains menus 2012-06-15 12:20:45 +02:00
Laurent Destailleur
2e74a4ba85 Fix: The fix made by renaming PDF_ADDALSOTARGETDETAILS into MAIN_PDF_ADDALSOSOURCEDETAILS was fixing things in the wrong direction. The regression was the missing data on the recipient compared to 3.1.1 2012-06-15 11:26:16 +02:00
Laurent Destailleur
5d502aa7d1 Fix: function dol_nboflines_bis 2012-06-15 00:17:12 +02:00
Laurent Destailleur
c28c5c1003 Fix: Bad calculation of nb of line. Fix: Bad position of lines into pdf_soleil 2012-06-14 20:01:47 +02:00
Laurent Destailleur
383195581f Fix: Messy source address 2012-06-14 17:51:56 +02:00
Laurent Destailleur
6c27963d1d Fix: Use order date for stats, not valid date. 2012-06-14 16:34:34 +02:00
Regis Houssin
707bffd181 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-13 21:54:27 +02:00
Laurent Destailleur
6406d4e64c Fix: typo error 2012-06-13 20:16:21 +02:00
Laurent Destailleur
142e7e55d7 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-13 20:14:48 +02:00
Regis Houssin
56188ca798 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-12 23:15:25 +02:00
Regis Houssin
c8c31b2167 Fix: mutualize ckeditor parameters 2012-06-12 23:14:54 +02:00
Regis Houssin
c4fbdbbce4 Fix: mutualize ckeditor parameters 2012-06-12 23:13:59 +02:00
Regis Houssin
86aab20c0a Merge pull request #224 from simnandez/3.2
Fix: Missing translation key
2012-06-11 13:02:22 -07:00
Regis Houssin
548266d607 Fix: uniformize code 2012-06-11 21:46:37 +02:00
Regis Houssin
fb15ea20c6 Fix: update jquery-cookie plugin 2012-06-11 17:27:20 +02:00
Regis Houssin
c9be1cbb8b Fix: missing remove_file action
Fix: use object instead id and store odt filename in object for use in
triggers
2012-06-10 17:09:44 +02:00
Regis Houssin
eef50058b1 Fix: bad parameters, use global 2012-06-10 10:30:45 +02:00
Regis Houssin
c9c4ba2a72 Fix: problem with external modules and uniformize code
Conflicts:
	htdocs/comm/propal/document.php
	htdocs/core/class/fileupload.class.php
	htdocs/projet/fiche.php

Change-Id: Ib36cd4d6ad5eb1e9ad2a188ef276f37c098cfef4
2012-06-09 18:47:16 +02:00
Laurent Destailleur
4c52e477e4 Fix: Removed non greek sentences 2012-06-09 12:41:03 +02:00
Laurent Destailleur
b8b400a5a4 Fix: No alpha here, this breaks ability to submit html content with
images or links.
2012-06-09 12:40:51 +02:00
simnandez
92cb694f55 Fix: Missing translation key 2012-06-09 09:05:14 +02:00
Regis Houssin
db148c4233 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-09 07:51:38 +02:00
Laurent Destailleur
2be18e834a Fix: Turkish translation 2012-06-09 00:25:31 +02:00
Laurent Destailleur
b554dfc3d2 Fix: Missing translation key 2012-06-09 00:25:22 +02:00
Laurent Destailleur
183ba3e8ca Fix: Another fix for var not initialized 2012-06-08 22:26:54 +02:00
Laurent Destailleur
f2365a4c8d Fix: A lot of pb into javascript. Javascripts code for same feature was
not inserted always at same place (sometinmes at low level, and
sometimes at high level). This was creating conflict into javascript.

Conflicts:
	htdocs/product/class/product.class.php
2012-06-08 22:25:45 +02:00
Regis Houssin
c512585670 Fix: delete or rename a document product dir 2012-06-08 21:41:37 +02:00
Regis Houssin
1b19fddbc6 Fix: missing oldcopy during update 2012-06-08 21:41:21 +02:00
Regis Houssin
1c3bf3bb22 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2.1 2012-06-08 18:21:22 +02:00
Regis Houssin
db840bf8de Fix: remove deprecated code can cause warning 2012-06-08 18:20:06 +02:00
Regis Houssin
4713738ea3 Fix: avoid warning 2012-06-08 18:19:55 +02:00
Regis Houssin
176c6013ec Fix: bad option name 2012-06-08 11:48:07 +02:00
Regis Houssin
6f28b69804 Fix: add iframe transport for compatibility with all browser 2012-06-08 11:36:46 +02:00
Regis Houssin
92bb9c99f5 Release 3.2.1-alpha 2012-06-08 07:43:42 +02:00
Regis Houssin
aee1c3b069 Fix: more clean code for new version of jQuery fileupload 2012-06-08 07:25:55 +02:00
Regis Houssin
1f4be4cfed Fix: stock message in session and reload the page for avoid url problem
with jQuery fileupload
2012-06-08 07:25:43 +02:00
Regis Houssin
a04ca9449a New: update jQuery and jQuery UI 2012-06-08 07:25:31 +02:00
Regis Houssin
1649a9a1b1 Fix: reload page after file upload completed 2012-06-08 07:25:20 +02:00
Regis Houssin
8c4ddb99be Fix: add max file size 2012-06-08 07:25:07 +02:00
Regis Houssin
bef5b66dab Fix: replace Bootstrap version by jQueryUI version 2012-06-08 07:24:52 +02:00
Regis Houssin
c43b5f99ac Works on jQuery fileupload upgrade (Todo: css problem) 2012-06-08 07:24:22 +02:00
Laurent Destailleur
d8894b149e Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-06 23:13:41 +02:00
Laurent Destailleur
407978991c Fix: bad error management 2012-06-06 23:05:59 +02:00
Regis Houssin
0d1159d862 Fix: problem with external module 2012-06-06 23:02:46 +02:00
Laurent Destailleur
06442f4755 Fix: Var not initialized 2012-06-06 21:39:37 +02:00
Regis Houssin
54dd02413f Fix: missing search in alternative root directory 2012-06-06 14:05:04 +02:00