Commit Graph

47779 Commits

Author SHA1 Message Date
Laurent Destailleur
1af2459d90 Merge branch '3.7' of git@github.com:Dolibarr/dolibarr.git into 3.7 2015-05-12 23:47:49 +02:00
Laurent Destailleur
b0d73ee674 FIX Bad link to login page into email for password renewal. 2015-05-12 23:47:28 +02:00
Laurent Destailleur
81d2d12035 Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-12 23:40:57 +02:00
Laurent Destailleur
ce0d728438 Merge pull request #2813 from bafbes/patch-3
Update html.formfile.class.php
2015-05-12 23:02:45 +02:00
Laurent Destailleur
39b4fc6455 Renamed readme file 2015-05-12 22:59:17 +02:00
Laurent Destailleur
0bf7dd0686 Merge pull request #2824 from atm-maxime/3.7
Fix : bad link when sorting shipment list #2823
2015-05-12 22:42:17 +02:00
Maxime Kohlhaas
942564be56 Fix : bad link when sorting shipment list #2823 2015-05-12 22:36:34 +02:00
Laurent Destailleur
f8e8fe6f34 Merge pull request #2816 from marcosgdf/bug-2757
Close bug #2757 Deleting product category photo gives "Forbidden access" error
2015-05-12 22:36:33 +02:00
Laurent Destailleur
4408648a68 Merge pull request #2817 from GPCsolutions/jqueryfixes
jQuery fixes
2015-05-12 22:36:12 +02:00
Laurent Destailleur
b3c9c3d91b Merge pull request #2818 from GPCsolutions/htmlfixes
HTML fixes
2015-05-12 22:34:35 +02:00
Laurent Destailleur
b99d2a8276 Merge pull request #2819 from GPCsolutions/typehinting
[Qual] Typehinting
2015-05-12 22:34:06 +02:00
Florian HENRY
8e61a03b5c Merge branch 'develop' of git@github.com:Dolibarr/dolibarr.git into develop 2015-05-12 21:02:36 +02:00
Raphaël Doursenaud
3b9388e57f Added typehinting to resultsets in database drivers 2015-05-12 19:51:41 +02:00
Raphaël Doursenaud
6558c0f1f2 Removed a bunch of unused variables 2015-05-12 19:47:15 +02:00
Raphaël Doursenaud
3fdc4ca5e0 Better type hinting for the SQLite3 database driver 2015-05-12 19:45:14 +02:00
Laurent Destailleur
cb6f23d9b6 Merge pull request #2771 from aternatik/api_rest
Add new core module : REST API
2015-05-12 19:39:37 +02:00
Raphaël Doursenaud
70d36dd1e3 Better type hinting for the SQLite database driver 2015-05-12 19:30:04 +02:00
Raphaël Doursenaud
67641280a4 Fixed parameter types 2015-05-12 19:16:29 +02:00
Raphaël Doursenaud
1fdff27184 Fixed type hintings 2015-05-12 19:11:12 +02:00
Raphaël Doursenaud
053f6ae494 [Qual] Fixed missing return statements 2015-05-12 19:10:47 +02:00
Raphaël Doursenaud
27d52cf2b0 Better type hinting for DoliDB 2015-05-12 19:01:01 +02:00
Raphaël Doursenaud
ccd14c8305 Better type hinting and code structure for the PgSQL database driver 2015-05-12 18:31:12 +02:00
Raphaël Doursenaud
4a01cf1256 Better type hinting for the Database interface 2015-05-12 18:30:16 +02:00
Raphaël Doursenaud
7231ca890a Better type hinting for the MSSQL database driver 2015-05-12 18:13:24 +02:00
Raphaël Doursenaud
6e6e63db50 Better type hinting and code structure for the MySQLi database driver 2015-05-12 17:56:01 +02:00
Raphaël Doursenaud
04f5e73557 Better type hinting for MySQL database driver 2015-05-12 17:16:46 +02:00
jfefe
125a34cb34 Fix PHPCS 2015-05-12 16:42:35 +02:00
jfefe
d079bc1507 Add comment to ignore PHPCs error due to restler framework 2015-05-12 16:35:05 +02:00
Raphaël Doursenaud
932e23ac09 [Qual] Use jQuery 'is' instead of 'prop' in conditions 2015-05-12 16:21:21 +02:00
Raphaël Doursenaud
aee61aa2c4 [Qual] Fixed deprecated HTML nowrap attribute to class 2015-05-12 15:37:35 +02:00
Raphaël Doursenaud
9b56427858 [Qual] Fixed HTML multiple attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The multiple attribute is boolean.
2015-05-12 15:11:47 +02:00
Raphaël Doursenaud
ce60ae0fcc [Qual] Fixed HTML readonly attribute
Dolibarr uses HTML 4.01 or HTML5 doctypes.
The readonly attribute is boolean.
2015-05-12 15:09:26 +02:00
Raphaël Doursenaud
d5565fffc1 [Qual] Fixed HTML input form disabled attribute 2015-05-12 15:01:13 +02:00
Raphaël Doursenaud
e149d49fb8 [Qual] Use jQuery property instead of attribute to test and set disabled 2015-05-12 14:53:01 +02:00
Raphaël Doursenaud
0d8641a073 [Qual] Use jQuery property instead of attribute to test and set checked 2015-05-12 14:51:30 +02:00
Marcos García de La Fuente
190f12c4c4 Merge branch '3.5' into bug-2757
Conflicts:
	ChangeLog
2015-05-12 10:16:48 +02:00
Marcos García de La Fuente
ea7eb241e3 Close bug #2757 Deleting product category photo gives "Forbidden access" error 2015-05-12 10:15:43 +02:00
Bahfir Abbes
95a2e65d86 Update list.php
Fix forgotten last contributor information
2015-05-12 09:01:15 +01:00
Bahfir Abbes
142460ab16 Update html.formfile.class.php
Fix forgotten last contributor information
2015-05-12 08:53:09 +01:00
Laurent Destailleur
a94121a8c5 Add field to define picto to use for status 2015-05-12 09:42:14 +02:00
aspangaro
304a6936a5 Attenuate lines #ddd -> #f4f4f4 2015-05-12 06:58:29 +02:00
aspangaro
4cb9c3a147 Merge remote-tracking branch 'Upstream/develop' into develop-md 2015-05-12 06:44:41 +02:00
aspangaro
02d7c1cf01 Deactivate Gradient into div.liste_titre 2015-05-12 06:44:14 +02:00
Laurent Destailleur
8075a92d5b FIX Bad logo for status "Do not contact" of thirdparty. 2015-05-12 02:40:21 +02:00
Laurent Destailleur
ac99f3aa8f Update changelog 2015-05-12 02:34:59 +02:00
Laurent Destailleur
973e2253bf Merge pull request #2797 from hregis/3.6
Fix: add $object for use with triggers
2015-05-12 00:14:22 +02:00
Laurent Destailleur
92a25e3d4c Prepare 3.7.1 2015-05-12 00:11:51 +02:00
Laurent Destailleur
83e4fe5d95 Merge remote-tracking branch 'origin/3.7' into develop
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/fourn/facture/list.php
2015-05-12 00:09:03 +02:00
Laurent Destailleur
c2b31a37ba Merge remote-tracking branch 'origin/3.6' into 3.7
Conflicts:
	build/makepack-dolibarr.pl
	htdocs/contrat/fiche.php
	htdocs/core/modules/expedition/modules_expedition.php
	htdocs/expedition/class/expedition.class.php
	htdocs/expedition/fiche.php
	htdocs/user/fiche.php
2015-05-11 23:53:38 +02:00
Laurent Destailleur
2a486f471b Merge remote-tracking branch 'origin/3.5' into 3.6
Conflicts:
	htdocs/product/class/product.class.php
2015-05-11 23:39:45 +02:00