Commit Graph

40021 Commits

Author SHA1 Message Date
Marcos García de La Fuente
e7d2765fc6 Replaced use of htmlentities with dol_htmlentities 2014-01-05 21:08:37 +01:00
Marcos García de La Fuente
e49f94d02e Fixed XSS problem in title tag 2014-01-05 04:52:45 +01:00
Laurent Destailleur
77e2d49658 Merge pull request #1358 from marcosgdf/payment_menu
Fixed quality control checks for PR #1357
2014-01-04 09:45:12 -08:00
Laurent Destailleur
918c5ff405 Fix: A lot of bug into generation of sticker pages or address pages
form members module:
- Position of element was wrong for non A4 pages.
- Removed bugged definition of 5164 sticker template.
- Solve problem of image proportions.
- Margin of right was wrong.
2014-01-04 16:13:34 +01:00
Laurent Destailleur
6c3c66c45d New: Add menu entry to barcode genration page. 2014-01-04 12:29:20 +01:00
Laurent Destailleur
bea74e54c8 Fix: The scale was hardcoded.
Comment in english
2014-01-04 12:26:31 +01:00
Laurent Destailleur
5551a5d4b4 Fix: Call Image on this instead of pdf.
Fix: Missing parameter for photo.
2014-01-02 20:45:59 +01:00
Marcos García de La Fuente
44ab26698e Fixed (again) quality code control checks 2014-01-02 16:41:23 +01:00
Laurent Destailleur
4e2bce1600 Fix: No hard coded data 2014-01-02 10:55:41 +01:00
Laurent Destailleur
504b519fb7 Fix: Bad link for download file into documents page of supplier invoices 2014-01-01 18:37:06 +01:00
Laurent Destailleur
ddde3339f8 Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
2013-12-31 16:33:36 +01:00
Laurent Destailleur
0bdcda50c6 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	ChangeLog
	build/exe/doliwamp/doliwamp.iss
	build/pad/pad_dolibarr.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
2013-12-31 16:13:12 +01:00
Laurent Destailleur
b1ea05e0d1 Merge remote-tracking branch 'origin/3.3' into 3.4
Conflicts:
	ChangeLog
	build/debian/changelog
	build/exe/doliwamp/doliwamp.iss
	build/makepack-dolibarr.pl
	build/pad/pad_dolibarr.xml
	build/pad/pad_doliwamp.xml
	build/rpm/dolibarr_fedora.spec
	build/rpm/dolibarr_generic.spec
	build/rpm/dolibarr_mandriva.spec
	build/rpm/dolibarr_opensuse.spec
	htdocs/filefunc.inc.php
2013-12-31 15:55:10 +01:00
Laurent Destailleur
0e54780377 Fix: Update doc and packager for doliwamp
Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss
2013-12-31 15:41:25 +01:00
Laurent Destailleur
7fc052ce19 More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
2013-12-31 15:27:15 +01:00
Laurent Destailleur
50df4e1ff1 Fix: Update doc and packager for doliwamp
Conflicts:
	build/exe/doliwamp/doliwamp.iss

Conflicts:
	build/exe/doliwamp/doliwamp.iss
2013-12-31 15:23:16 +01:00
Laurent Destailleur
13eff7d629 More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
2013-12-31 15:19:39 +01:00
Laurent Destailleur
6d40c10b95 Prepare 3.5.0 release 2013-12-31 15:18:11 +01:00
Laurent Destailleur
247c49e094 Prepare 3.5.0 release 2013-12-31 15:17:10 +01:00
Laurent Destailleur
bec70d1f0e Fix: Update doc and packager for doliwamp
Conflicts:
	build/exe/doliwamp/doliwamp.iss
2013-12-31 15:09:38 +01:00
Laurent Destailleur
f0eb9b8a15 More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
2013-12-31 15:06:25 +01:00
Laurent Destailleur
70ac6efcc2 Fix: Update doc and packager for doliwamp 2013-12-31 15:04:59 +01:00
Laurent Destailleur
3ace6da1d5 More prerequisites to check to run makepack-dolibarr to build debian
package (check on dpatch too).
2013-12-31 14:24:01 +01:00
Laurent Destailleur
eadccb5d9b Merge remote-tracking branch 'origin/3.5' into develop
Conflicts:
	htdocs/langs/bg_BG/main.lang
	htdocs/langs/el_GR/cron.lang
	htdocs/langs/el_GR/help.lang
	htdocs/langs/el_GR/main.lang
	htdocs/langs/el_GR/margins.lang
	htdocs/langs/el_GR/stocks.lang
	htdocs/langs/el_GR/suppliers.lang
	htdocs/langs/et_EE/admin.lang
	htdocs/langs/et_EE/agenda.lang
	htdocs/langs/et_EE/banks.lang
	htdocs/langs/et_EE/bills.lang
	htdocs/langs/et_EE/commercial.lang
	htdocs/langs/et_EE/companies.lang
	htdocs/langs/et_EE/compta.lang
	htdocs/langs/et_EE/dict.lang
	htdocs/langs/et_EE/help.lang
	htdocs/langs/et_EE/main.lang
	htdocs/langs/et_EE/margins.lang
	htdocs/langs/et_EE/other.lang
	htdocs/langs/et_EE/stocks.lang
	htdocs/langs/et_EE/suppliers.lang
	htdocs/langs/et_EE/users.lang
	htdocs/langs/et_EE/withdrawals.lang
	htdocs/langs/lv_LV/admin.lang
	htdocs/langs/lv_LV/agenda.lang
	htdocs/langs/lv_LV/banks.lang
	htdocs/langs/lv_LV/bills.lang
	htdocs/langs/lv_LV/boxes.lang
	htdocs/langs/lv_LV/opensurvey.lang
	htdocs/langs/lv_LV/users.lang
	htdocs/langs/ro_RO/admin.lang
	htdocs/langs/ro_RO/banks.lang
	htdocs/langs/ro_RO/bills.lang
	htdocs/langs/ro_RO/companies.lang
	htdocs/langs/ro_RO/compta.lang
	htdocs/langs/ro_RO/cron.lang
	htdocs/langs/ro_RO/dict.lang
	htdocs/langs/ro_RO/help.lang
	htdocs/langs/ro_RO/main.lang
	htdocs/langs/ro_RO/margins.lang
	htdocs/langs/ro_RO/other.lang
	htdocs/langs/ro_RO/stocks.lang
	htdocs/langs/ro_RO/suppliers.lang
	htdocs/langs/ro_RO/withdrawals.lang
	htdocs/langs/uz_UZ/main.lang
2013-12-31 12:18:31 +01:00
Laurent Destailleur
f44a45feb2 Fix: Missing some languages into the transifex sync script.
Trans: Sync language files from transifex.
2013-12-31 12:03:37 +01:00
Laurent Destailleur
0bf88ce44f Merge branch '3.5' of git@github.com:Dolibarr/dolibarr.git into 3.5 2013-12-31 10:48:51 +01:00
Laurent Destailleur
e142bd252d Fix: disable code making jmobile crazy. 2013-12-31 10:48:15 +01:00
simnandez
9f020bb0a9 Fix: Ordering 2013-12-30 18:24:33 +01:00
Laurent Destailleur
f0151ce112 Merge remote-tracking branch 'origin/3.5' into develop 2013-12-30 12:44:46 +01:00
Laurent Destailleur
2e0fc364bd Merge remote-tracking branch 'origin/3.4' into 3.5 2013-12-30 12:42:14 +01:00
Laurent Destailleur
f0bda47d96 Merge remote-tracking branch 'origin/3.3' into 3.4 2013-12-30 12:39:30 +01:00
Laurent Destailleur
a59a0151fb Fix: Removed analytics tags 2013-12-30 12:35:32 +01:00
Laurent Destailleur
a337517193 Merge branch 'develop' of https://github.com/Dolibarr/dolibarr.git into
develop
2013-12-30 11:37:43 +01:00
Laurent Destailleur
cfb791c584 Fix: Better translation 2013-12-29 19:30:11 +01:00
Laurent Destailleur
338ee2dbbc Merge remote-tracking branch 'origin/3.5' into develop 2013-12-29 00:57:29 +01:00
Laurent Destailleur
436f585b69 Merge remote-tracking branch 'origin/3.4' into 3.5
Conflicts:
	build/exe/doliwamp/doliwamp.iss
2013-12-29 00:48:31 +01:00
Laurent Destailleur
3e39cd279d Fix: avoid to include not desired directory 2013-12-29 00:42:53 +01:00
Laurent Destailleur
fc20237cc7 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2013-12-29 00:25:14 +01:00
Laurent Destailleur
5960e9e361 Update doc 2013-12-29 00:24:57 +01:00
Marcos García de La Fuente
9b90e93fe5 Forgot typehinting for function payment_supplier_prepare_head 2013-12-28 23:24:24 +01:00
Marcos García de La Fuente
c6ded35d4b Fixed quality control checks for PR #1357 2013-12-28 23:13:32 +01:00
Laurent Destailleur
8248f63826 Fix: Missing translation 2013-12-27 20:31:57 +01:00
Laurent Destailleur
29ae579298 Fix: Bad link 2013-12-27 20:29:30 +01:00
Laurent Destailleur
8207b7c243 Missing translation 2013-12-27 20:27:17 +01:00
Laurent Destailleur
7d6779bd4a Merge remote-tracking branch 'origin/3.5' into develop 2013-12-27 18:09:31 +01:00
Laurent Destailleur
d07c767f25 Fix: Alignement of element into block login 2013-12-27 17:55:24 +01:00
Laurent Destailleur
538e6c5dc2 Fix: Alignement of element into block login 2013-12-27 17:51:36 +01:00
Laurent Destailleur
da2f35e1a2 Fix: Missing translation.
Fix: Title of tab not visible
2013-12-27 17:43:52 +01:00
BENKE Charles
94bf105b13 Update llx_projet_task.sql
new field "ref" present on update sql but not on the table
2013-12-27 17:14:56 +01:00
Laurent Destailleur
3bb4de3e86 Better translation 2013-12-27 15:56:00 +01:00