Commit Graph

32077 Commits

Author SHA1 Message Date
Laurent Destailleur
7feff22c1a Fxi: Bad permission check 2012-06-06 00:23:13 +02:00
Laurent Destailleur
a5a4ef538d Fix: Exclude temp file 2012-06-06 00:23:00 +02:00
Laurent Destailleur
c8bd77ddd7 Fix: Missing permission check 2012-06-06 00:22:43 +02:00
Laurent Destailleur
1c32b4231d Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-05 12:55:12 +02:00
Laurent Destailleur
31560e19df Fix with PHP 5.2 2012-06-05 12:54:34 +02:00
Regis Houssin
e9a8ec1795 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-04 11:26:01 +02:00
Regis Houssin
26aa12de97 Fix: don't exclude savant and jstree for externals modules ! 2012-06-04 11:25:17 +02:00
Laurent Destailleur
00d185f648 Fix: Use wrong handler. Make install fails. 2012-06-04 02:15:10 +02:00
Regis Houssin
4e05640ecb Fix: date format error 2012-06-03 23:56:27 +02:00
Regis Houssin
ff33cb4a88 Fix: merge array of hookmanager errors 2012-06-03 23:55:05 +02:00
Laurent Destailleur
5ce0fe1405 Fix: Solve error Method Not Implemented 2012-06-01 21:24:54 +02:00
Laurent Destailleur
7c61f6fd88 Fix: Try a fix for the _FILES escape problem. 2012-06-01 21:00:03 +02:00
Laurent Destailleur
42b3e109d7 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 20:58:00 +02:00
Regis Houssin
d11971dbbd Merge pull request #217 from GPCsolutions/3.2
Fixed a bug in intervention's list navigation
2012-06-01 02:19:29 -07:00
Raphaël Doursenaud
20d90831e1 Fixed a bug in interventions' list navigation
The navigation arrows were referencing "index.php" file thus
preventing navigation between pages.
The actual name of the file is "list.php".
2012-06-01 10:52:39 +02:00
Laurent Destailleur
0160fb8c5e Fix: an url must be with url escape format. 2012-06-01 10:12:15 +02:00
Laurent Destailleur
a51114d571 Fix: regression. quote was no more supported. 2012-06-01 09:34:43 +02:00
Laurent Destailleur
52f270d623 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 09:28:49 +02:00
Regis Houssin
9c42cdc7d3 Fix: clear file name send by php 2012-06-01 07:14:29 +02:00
Raphaël Doursenaud
d79b65ce49 Fixed a bug preventing invoice sorting by authors 2012-06-01 06:52:59 +02:00
Laurent Destailleur
2b85a2fcd4 Merge pull request #216 from GPCsolutions/82af0ed28f223d1324c8843abb106c8ee6af9a4b
Fixed a bug preventing invoice sorting by authors
2012-05-31 17:57:40 -07:00
Laurent Destailleur
4fd98dfb72 Fix: Revert a lot of commits made on wrong branch. No new features, no
change on architecture on a beta, only bug fixes on visible features.
2012-06-01 02:22:39 +02:00
Laurent Destailleur
06eca56e00 Revert "Fix: replace Bootstrap version by jQueryUI version"
This reverts commit 03ec0d7cc5.
2012-06-01 02:07:35 +02:00
Laurent Destailleur
2d818fc886 Revert "Fix: add max file size"
This reverts commit 8b224e9e2d.
2012-06-01 02:07:24 +02:00
Laurent Destailleur
180908bfe1 Revert "Fix: reload page after file upload completed"
This reverts commit 368af101ef.
2012-06-01 02:07:11 +02:00
Laurent Destailleur
3dcf553a47 Revert "New: update jQuery and jQuery UI"
This reverts commit 7ed980fab5.
2012-06-01 02:07:02 +02:00
Laurent Destailleur
f9bda74e22 Revert "Fix: stock message in session and reload the page for avoid url problem with jQuery fileupload"
This reverts commit 4deeb20dd8.
2012-06-01 02:06:53 +02:00
Laurent Destailleur
73f1d8ee99 Revert "Fix: more clean code for new version of jQuery fileupload"
This reverts commit d7308525ae.
2012-06-01 02:06:43 +02:00
Laurent Destailleur
1a73347866 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-06-01 01:54:24 +02:00
Regis Houssin
d7308525ae Fix: more clean code for new version of jQuery fileupload 2012-05-31 21:12:40 +02:00
Regis Houssin
4deeb20dd8 Fix: stock message in session and reload the page for avoid url problem
with jQuery fileupload
2012-05-31 21:12:25 +02:00
Raphaël Doursenaud
0a8016e2aa Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-31 10:09:14 +02:00
Regis Houssin
7ed980fab5 New: update jQuery and jQuery UI 2012-05-30 23:40:45 +02:00
Regis Houssin
368af101ef Fix: reload page after file upload completed 2012-05-30 23:37:02 +02:00
Regis Houssin
8b224e9e2d Fix: add max file size 2012-05-30 23:36:50 +02:00
Regis Houssin
03ec0d7cc5 Fix: replace Bootstrap version by jQueryUI version 2012-05-30 23:36:40 +02:00
Regis Houssin
a717297a8c Works on jQuery fileupload upgrade (Todo: css problem) 2012-05-30 23:36:17 +02:00
Raphaël Doursenaud
086a0ae340 Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-30 17:36:04 +02:00
Regis Houssin
599971b27a Merge pull request #214 from simnandez/3.2
Trad: Add translation
2012-05-30 07:40:22 -07:00
Simnandez
f23462a173 Trad: Add translation 2012-05-30 16:28:13 +02:00
Laurent Destailleur
a83c7d0992 Fix: Regression with quot management. Try a better fix. 2012-05-30 12:49:22 +02:00
Laurent Destailleur
f67636d0f3 Merge branch '3.2' of ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-30 12:47:58 +02:00
Laurent Destailleur
92fe8ebe1d Fix: js not escaped 2012-05-30 12:33:47 +02:00
Raphaël Doursenaud
2812bfae7a Merge branch '3.2' of https://github.com/Dolibarr/dolibarr into 3.2 2012-05-30 10:29:15 +02:00
Regis Houssin
1a969e61e9 Fix: can't delete a files with quote 2012-05-30 08:31:59 +02:00
Laurent Destailleur
fd9565934c A better fix to remove files from document list 2012-05-30 04:11:37 +02:00
Laurent Destailleur
a465814fd4 More fix for canvas features
Conflicts:
	htdocs/product/canvas/product/tpl/card_create.tpl.php
	htdocs/product/fiche.php
2012-05-30 03:50:53 +02:00
Laurent Destailleur
514babeab1 Fix: delete of documents is done by page of element, not by the view
wrapper.

Conflicts:
	htdocs/langs/en_US/main.lang
	htdocs/langs/fr_FR/main.lang
	htdocs/projet/fiche.php
2012-05-30 00:18:11 +02:00
Regis Houssin
caadf396e2 Merge branch '3.2' of git+ssh://git@github.com/Dolibarr/dolibarr.git into 3.2 2012-05-30 00:09:49 +02:00
Regis Houssin
5c2922a17b Fix: big problem with files upload and more compatible with external
modules

Conflicts:
	htdocs/compta/facture.php
2012-05-30 00:09:38 +02:00