Quick Search:

Line History

line history graph

View Mode

Logical Physical

Show Arbitrary Diff

From to

Supports revisions and tags.

History

frank 1246 678 trunk 1154 1078 613 5 1 weisser 1101 garrone 700 hpdl 1142 43

latest revision download trunk

1154 annotated / raw | Diffs: previous, other | Lines: 840 ( +18, -14 )

Created: 2006-11-18 13:43:07 +0100 (3 years ago) | Author: frank | Changeset: 1154

Copied (2 times):

Reference: OSC-45

New fix for install procedure (rpc calls). The transmitted results are now filtered to protect adding strings (for example: banners of free hosting) to the message.

Properties

 svn:eol-style = native
 svn:keywords = Id

1137 annotated / raw | Diffs: previous, other | Lines: 836 ( +15, -15 )

Created: 2006-11-10 19:54:44 +0100 (3 years ago) | Author: frank | Changeset: 1137

Reference: OSC-45

Fix for install procedure (rpc calls). The transmitted results are now filtered to protect adding strings (for example: banners of free hosting) to the message.

Properties

 svn:eol-style = native
 svn:keywords = Id

1078 annotated / raw | Diffs: previous, other | Lines: 836 ( +4, -4 )

Created: 2006-10-25 17:43:32 +0200 (3 years ago) | Author: hpdl | Changeset: 1078

merge from hpdl r1070 - r1072, r1074; introduction of the access level implementation for the administration tool

Branch point for: weisser

Properties

 svn:eol-style = native
 svn:keywords = Id

1076 annotated / raw | Diffs: previous, other | Lines: 836 ( +4, -3 )

Created: 2006-10-25 17:37:50 +0200 (3 years ago) | Author: hpdl | Changeset: 1076

merge from hpdl r1016, r1025 - r1027; modularize the administration tool pages

Properties

 svn:eol-style = native
 svn:keywords = Id

908 annotated / raw | Diffs: previous, other | Lines: 835 ( +1, -1 )

Created: 2006-08-30 21:21:46 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 908

merge from hpdl r907; check if pInfo is set first

Branch point for: tag:oscommerce-3.0a3

Properties

 svn:eol-style = native
 svn:keywords = Id

894 annotated / raw | Diffs: previous, other | Lines: 835 ( +26, -22 )

Created: 2006-08-30 17:24:01 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 894

merge from r893; add a check for the product id

Properties

 svn:eol-style = native
 svn:keywords = Id

877 annotated / raw | Diffs: previous, other | Lines: 831 ( +8, -6 )

Created: 2006-08-30 05:08:51 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 877

merge from hpdl r876; fix #92

Properties

 svn:eol-style = native
 svn:keywords = Id

875 annotated / raw | Diffs: previous, other | Lines: 829 ( +8, -0 )

Created: 2006-08-30 05:01:25 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 875

merge from hpdl r874; logic update

Properties

 svn:eol-style = native
 svn:keywords = Id

758 annotated / raw | Diffs: previous, other | Lines: 821 ( +1, -1 )

Created: 2006-08-23 14:30:07 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 758

merge from hpdl r735 to r737, r745 to r748
-finalize function standardization work

Properties

 svn:eol-style = native
 svn:keywords = Id

755 annotated / raw | Diffs: previous, other | Lines: 821 ( +31, -31 )

Created: 2006-08-23 14:08:21 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 755

merge from hpdl r692, r696, r701, r702
- use the html_output functions from the catalog side
- replace the call to MAXIMUM_FILE_UPLOAD_SIZE with the osC_Language class
- assign the box heading links in the initialize() method

Properties

 svn:eol-style = native
 svn:keywords = Id

749 annotated / raw | Diffs: previous, other | Lines: 821 ( +107, -36 )

Created: 2006-08-23 13:35:29 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 749

merge from hpdl r661 to r666
- show favicon with padlock for ssl connections
- new method to handle file uploads
- allow images existing on the server to be assign to products

Properties

 svn:eol-style = native
 svn:keywords = Id

613 annotated / raw | Diffs: previous, other | Lines: 750 ( +9, -9 )

Created: 2006-07-06 14:28:27 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 613

merge from hpdl r611 and r612

Branch point for: frank garrone

Properties

 svn:eol-style = native
 svn:keywords = Id

608 annotated / raw | Diffs: previous, other | Lines: 750 ( +233, -56 )

Created: 2006-07-05 12:56:09 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 608

merge from hpdl r555, r556, r571, r583, r584, r587 - r606
multiple product images implementation
close #21

Properties

 svn:eol-style = native
 svn:keywords = Id

448 annotated / raw | Diffs: previous, other | Lines: 573 ( +1, -1 )

Created: 2006-02-21 07:27:28 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 448

merge from hpdl -r443

- fixes from 2.2MS2 update package
- remove John Doe from new installations
- add the possibility to define special product prices by gross value (incl. tax)

Tags: oscommerce-3.0a2

Properties

 svn:eol-style = native
 svn:keywords = Id

443 annotated / raw | Diffs: previous, other | Lines: 573 ( +11, -19 )

Created: 2006-02-20 00:01:01 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 443

merge from hpdl -r417

- checkout procedure cleanup (logic)
- new "core" service module to load core classes (logic moved from application_top.php)
- install modules by their install() methods during the installation procedure
- remove existing cache files during the installation procedure
- fix spelling mistake in the service modules (preceeds -> precedes)

Properties

 svn:eol-style = native
 svn:keywords = Id

365 annotated / raw | Diffs: previous, other | Lines: 581 ( +27, -16 )

Created: 2005-12-22 16:25:26 +0100 (3 years 11 months ago) | Author: hpdl | Changeset: 365

merge from hpdl r152

Tags: oscommerce-3.0a1

Properties

 svn:eol-style = native
 svn:keywords = Id

151 annotated / raw | Diffs: previous, other | Lines: 570 ( +0, -0 )

Created: 2005-08-02 16:33:25 +0200 (4 years 3 months ago) | Author: mattice | Changeset: 151

Update linefeeds

Properties

 svn:eol-style = native
 svn:keywords = Id

121 annotated / raw | Diffs: previous, other | Lines: 570 ( +18, -18 )

Created: 2005-04-28 09:19:20 +0200 (4 years 6 months ago) | Author: hpdl | Changeset: 121

register_globals compatibility fix

new language class methods to load language definitions and to return selected language information

Properties

 svn:keywords = Id

5 annotated / raw | Diffs: previous, other | Lines: 570 ( +0, -0 )

Created: 2005-01-31 02:40:15 +0100 (4 years 9 months ago) | Author: hpdl | Changeset: 5

Added svn:keywords Id property

Branch point for: hpdl

Properties

 svn:keywords = Id

1 new annotated / raw | Lines: 570 ( +570, -0 )

Created: 2005-01-31 01:06:19 +0100 (4 years 9 months ago) | Author: hpdl | Changeset: 1

Initial import

latest revision download Branch frank

1246 annotated / raw | Diffs: previous, other | Lines: 841 ( +1, -1 )

Created: 2007-02-11 12:42:36 +0100 (2 years 9 months ago) | Author: frank | Changeset: 1246

Improvement solved (nr87). Update. The problem with the thumbnail view (see ticket 87) in the admin with new/editing products occurs when a thumbnail in the line above has 3 lines of text instead of 2 beneath the thumbnail. This causes the thumbnail block to become bigger (higher) so the thumbnail block in the row beneath it will align to it and not start at the left.

Properties

 svn:eol-style = native
 svn:keywords = Id

1245 annotated / raw | Diffs: previous, other | Lines: 841 ( +1, -1 )

Created: 2007-02-10 12:39:24 +0100 (2 years 9 months ago) | Author: frank | Changeset: 1245

Improvement solved (nr87). The problem with the thumbnail view (see ticket 87) in the admin with new/editing products occurs when a thumbnail in the line above has 3 lines of text instead of 2 beneath the thumbnail. This causes the thumbnail block to become bigger (higher) so the thumbnail block in the row beneath it will align to it and not start at the left.

Properties

 svn:eol-style = native
 svn:keywords = Id

1182 annotated / raw | Diffs: previous, other | Lines: 841 ( +2, -1 )

Created: 2006-12-25 20:11:15 +0100 (2 years 10 months ago) | Author: frank | Changeset: 1182

Bug solved (nr74). Preview image problem was caused by typo in modified RPC regex (admin/templates/pages/products_edit.php).

Properties

 svn:eol-style = native
 svn:keywords = Id

1165 new/copied annotated / raw | Diffs: previous, other | Lines: 840 ( +840, -0 )

Created: 2006-12-14 22:24:31 +0100 (2 years 11 months ago) | Author: frank | Changeset: 1165

Copied from: trunk/oscommerce/admin/templates/pages/products_edit.php 1154

Copy of actual osC V3.0 Alpha 4Pre R1157

Properties

 svn:eol-style = native
 svn:keywords = Id

1151 annotated / raw | Diffs: previous, other | Lines: 820 ( +4, -3 )

Created: 2006-11-17 00:25:27 +0100 (3 years ago) | Author: frank | Changeset: 1151

Fix for install procedure (rpc calls).

Properties

 svn:eol-style = native
 svn:keywords = Id

1145 annotated / raw | Diffs: previous, other | Lines: 819 ( +2, -1 )

Created: 2006-11-16 19:33:44 +0100 (3 years ago) | Author: frank | Changeset: 1145

Fix for install procedure (rpc calls), part 3. Regex.split solution doesn't work in all cases. I've used the regex.exec function. After extracting the data out of the http.responseText record[0] will be dumped (this is the total string result). I've tested this in: IE6.0, IE7.0 (final), FF1.5, FF2.0 and OP9.01.

Properties

 svn:eol-style = native
 svn:keywords = Id

1144 annotated / raw | Diffs: previous, other | Lines: 818 ( +19, -13 )

Created: 2006-11-15 22:57:30 +0100 (3 years ago) | Author: frank | Changeset: 1144

Fix for install procedure (rpc calls). Some browsers handle the used regex.split function differently. I've changed the regex and created a loop to 'flush' the empty records out. I've tested this in: IE6.0, IE7.0 (final), FF1.5, FF2.0 and OP9.01.

Properties

 svn:eol-style = native
 svn:keywords = Id

1115 annotated / raw | Diffs: previous, other | Lines: 812 ( +20, -20 )

Created: 2006-11-06 23:45:32 +0100 (3 years ago) | Author: frank | Changeset: 1115

Reference: OSC-45

Fix for install procedure (rpc calls). The transmitted results are now filtered to protect adding strings (for example: banners of free hosting) to the message.

Properties

 svn:eol-style = native
 svn:keywords = Id

1093 annotated / raw | Diffs: previous, other | Lines: 812 ( +27, -13 )

Created: 2006-10-30 23:49:36 +0100 (3 years ago) | Author: frank | Changeset: 1093

osCommerce V3.0 Alpha 3 modified to be W3C CSS/XHTML valid. Update.
Remarks:
- Pop-up image mod isn't working on MAC. Need to be sorted out later
- templates/head folder has been added. Need to be discussed.
- Warning/error box on the bottom of the catalog has been moved into the template instead of the application_bottom.php, else the code will be added outside the body tag (which isn't allowed) this should be placed back later. The changes are tested on a Windows machine with Opera 9.01, Firefox 1.5 and Internet Explorer 6.0. If there are problems with viewing this version in other (or these) browsers please notify me (please add a screenshot)!

Properties

 svn:eol-style = native
 svn:keywords = Id

994 annotated / raw | Diffs: previous, other | Lines: 798 ( +12, -49 )

Created: 2006-10-04 23:54:15 +0200 (3 years 1 month ago) | Author: frank | Changeset: 994

osCommerce V3.0 Alpha 3 modified to be W3C CSS/XHTML valid.
Remarks:
- Pop-up image mod isn't working on MAC. Need to be sorted out later
- templates/head folder has been added. Need to be discussed.
- In admin products is one problem left:
<form name="product" method="post" enctype="multipart/form-data">
This line (in products.php) misses an action.
- Warning/error box on the bottom of the catalog has been moved into the template instead of the application_bottom.php, else the code will be added outside the body tag (which isn't allowed) this should be placed back later.

The changes are tested on a Windows machine with Opera 9.01, Firefox 1.5 and Internet Explorer 6.0. If there are problems with viewing this version in other (or these) browsers please notify me (please add a screenshot)!

Properties

 svn:eol-style = native
 svn:keywords = Id

979 annotated / raw | Diffs: previous, other | Lines: 835 ( +177, -92 )

Created: 2006-09-02 13:38:58 +0200 (3 years 2 months ago) | Author: frank | Changeset: 979

merge from r977

Properties

 svn:eol-style = native
 svn:keywords = Id

678 new annotated / raw | Diffs: previous, other | Lines: 750 ( +0, -0 )

Created: 2006-08-10 23:31:42 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 678

copy trunk to franks branch

Properties

 svn:eol-style = native
 svn:keywords = Id

latest revision download Branch garrone

700 new annotated / raw | Diffs: previous, other | Lines: 750 ( +0, -0 )

Created: 2006-08-16 11:10:05 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 700

taken from /trunk/oscommerce

Properties

 svn:eol-style = native
 svn:keywords = Id

latest revision download Branch hpdl

1142 annotated / raw | Diffs: previous, other | Lines: 836 ( +15, -15 )

Created: 2006-11-10 23:40:48 +0100 (3 years ago) | Author: hpdl | Changeset: 1142

merge from trunk r1137

Properties

 svn:eol-style = native
 svn:keywords = Id

1070 annotated / raw | Diffs: previous, other | Lines: 836 ( +4, -4 )

Created: 2006-10-25 15:28:07 +0200 (3 years ago) | Author: hpdl | Changeset: 1070

introduction of the access level implementation

Properties

 svn:eol-style = native
 svn:keywords = Id

1016 annotated / raw | Diffs: previous, other | Lines: 836 ( +4, -3 )

Created: 2006-10-18 13:38:59 +0200 (3 years 1 month ago) | Author: hpdl | Changeset: 1016

modularize the administration tool pages (not yet stable)

Properties

 svn:eol-style = native
 svn:keywords = Id

907 annotated / raw | Diffs: previous, other | Lines: 835 ( +1, -1 )

Created: 2006-08-30 21:21:10 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 907

check if pInfo is set first

Properties

 svn:eol-style = native
 svn:keywords = Id

893 annotated / raw | Diffs: previous, other | Lines: 835 ( +26, -22 )

Created: 2006-08-30 17:23:28 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 893

add a check for the product id

Properties

 svn:eol-style = native
 svn:keywords = Id

876 annotated / raw | Diffs: previous, other | Lines: 831 ( +8, -6 )

Created: 2006-08-30 05:07:57 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 876

logic update

Properties

 svn:eol-style = native
 svn:keywords = Id

874 annotated / raw | Diffs: previous, other | Lines: 829 ( +8, -0 )

Created: 2006-08-30 05:00:40 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 874

logic update

Properties

 svn:eol-style = native
 svn:keywords = Id

746 annotated / raw | Diffs: previous, other | Lines: 821 ( +1, -1 )

Created: 2006-08-23 12:54:05 +0200 (3 years 2 months ago) | Author: hpdl | Changeset: 746

finalize the standardization of the admin general.php functions

Properties

 svn:eol-style = native
 svn:keywords = Id

702 annotated / raw | Diffs: previous, other | Lines: 821 ( +15, -15 )

Created: 2006-08-16 16:28:42 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 702

use html_output functions from the catalog side

Properties

 svn:eol-style = native
 svn:keywords = Id

692 annotated / raw | Diffs: previous, other | Lines: 821 ( +16, -16 )

Created: 2006-08-16 02:53:12 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 692

use the html_output functions from the catalog side

Properties

 svn:eol-style = native
 svn:keywords = Id

666 annotated / raw | Diffs: previous, other | Lines: 821 ( +8, -8 )

Created: 2006-07-29 12:01:57 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 666

only start to fill the local images select box if entries have been retrieved from the RPC call

Properties

 svn:eol-style = native
 svn:keywords = Id

664 annotated / raw | Diffs: previous, other | Lines: 821 ( +90, -33 )

Created: 2006-07-28 15:04:51 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 664

allow images existing on the server to be assigned to products

such images will need to be copied to oscommerce/images/products/_upload

Properties

 svn:eol-style = native
 svn:keywords = Id

662 annotated / raw | Diffs: previous, other | Lines: 764 ( +20, -6 )

Created: 2006-07-27 21:32:28 +0200 (3 years 3 months ago) | Author: hpdl | Changeset: 662

another method to handle iframe based file uploads

Properties

 svn:eol-style = native
 svn:keywords = Id

611 annotated / raw | Diffs: previous, other | Lines: 750 ( +9, -9 )

Created: 2006-07-05 19:56:53 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 611

use the new form name

Properties

 svn:eol-style = native
 svn:keywords = Id

605 annotated / raw | Diffs: previous, other | Lines: 750 ( +3, -5 )

Created: 2006-07-04 18:28:53 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 605

remove the preview part when inserting/editing products

Properties

 svn:eol-style = native
 svn:keywords = Id

603 annotated / raw | Diffs: previous, other | Lines: 752 ( +2, -2 )

Created: 2006-07-04 14:48:54 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 603

add image groups administration page
add "mini" image group
show default image group images on the product edit page
rename "Default" image group to "Thumbnails"

Properties

 svn:eol-style = native
 svn:keywords = Id

599 annotated / raw | Diffs: previous, other | Lines: 752 ( +18, -15 )

Created: 2006-07-03 19:36:46 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 599

remove the products_images_groups_id reference in the osc_products_images table; resize an original image to all image groups available

Properties

 svn:eol-style = native
 svn:keywords = Id

597 annotated / raw | Diffs: previous, other | Lines: 749 ( +1, -1 )

Created: 2006-07-03 14:44:32 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 597

fix new/edit product page title

Properties

 svn:eol-style = native
 svn:keywords = Id

592 annotated / raw | Diffs: previous, other | Lines: 749 ( +20, -24 )

Created: 2006-07-03 11:05:13 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 592

don't use the DOM for Internet Explorer compatibility

* Some issues still exist with IE with the default and trash icons not showing underneath each product image thumbnail until they are reloaded again

Properties

 svn:eol-style = native
 svn:keywords = Id

591 annotated / raw | Diffs: previous, other | Lines: 753 ( +20, -8 )

Created: 2006-07-02 12:53:19 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 591

add "loading images from server" status messages when loading multiple product images

Properties

 svn:eol-style = native
 svn:keywords = Id

590 annotated / raw | Diffs: previous, other | Lines: 741 ( +61, -73 )

Created: 2006-07-02 12:27:04 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 590

show "drag" icon as part of the mouseover effect when sorting multiple product images

use the Ajax.Request function of Prototype to make ajax calls instead of the custom loadXMLDoc function

Properties

 svn:eol-style = native
 svn:keywords = Id

589 annotated / raw | Diffs: previous, other | Lines: 753 ( +1, -1 )

Created: 2006-07-01 17:40:16 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 589

change new image upload method to inline uploading (for existing products; new products use the standard form and procedure)

Properties

 svn:eol-style = native
 svn:keywords = Id

588 annotated / raw | Diffs: previous, other | Lines: 753 ( +35, -24 )

Created: 2006-07-01 13:28:10 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 588

add ajax drag-and-drop style sorting to products that have multiple images

temporarily fix #35 (better solution is being worked on)

Properties

 svn:eol-style = native
 svn:keywords = Id

583 annotated / raw | Diffs: previous, other | Lines: 742 ( +219, -50 )

Created: 2006-06-29 15:12:20 +0200 (3 years 4 months ago) | Author: hpdl | Changeset: 583

new administration tool functionality for the multiple product images implementation

* image groups still need to be configurable via the administration tool
* showing the multiple images on the product info page still needs to be done

Properties

 svn:eol-style = native
 svn:keywords = Id

447 annotated / raw | Diffs: previous, other | Lines: 573 ( +1, -1 )

Created: 2006-02-21 07:09:01 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 447

change references from the language directory to the language code

Properties

 svn:eol-style = native
 svn:keywords = Id

422 annotated / raw | Diffs: previous, other | Lines: 573 ( +11, -19 )

Created: 2006-02-09 14:36:08 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 422

checkout procedure cleanup; move free shipping logic to a new 'free shipping' shipping module

Properties

 svn:eol-style = native
 svn:keywords = Id

249 annotated / raw | Diffs: previous, other | Lines: 581 ( +17, -6 )

Created: 2005-11-15 09:26:42 +0100 (4 years ago) | Author: hpdl | Changeset: 249

update administration tool for products model, keyword, and tags (multilingual)

Properties

 svn:eol-style = native
 svn:keywords = Id

241 annotated / raw | Diffs: previous, other | Lines: 570 ( +10, -10 )

Created: 2005-11-13 23:56:32 +0100 (4 years ago) | Author: hpdl | Changeset: 241

sync from xtrian-ms3's branch

Properties

 svn:eol-style = native
 svn:keywords = Id

153 annotated / raw | Diffs: previous, other | Lines: 570 ( +0, -0 )

Created: 2005-08-04 14:57:59 +0200 (4 years 3 months ago) | Author: hpdl | Changeset: 153

merge from trunk r149

Properties

 svn:eol-style = native
 svn:keywords = Id

119 annotated / raw | Diffs: previous, other | Lines: 570 ( +18, -18 )

Created: 2005-04-28 08:46:58 +0200 (4 years 6 months ago) | Author: hpdl | Changeset: 119

register_globals compatibility fix

Properties

 svn:keywords = Id

43 new annotated / raw | Diffs: previous, other | Lines: 570 ( +0, -0 )

Created: 2005-03-08 21:54:59 +0100 (4 years 8 months ago) | Author: hpdl | Changeset: 43

creating private branch

Properties

 svn:keywords = Id

latest revision download Branch weisser

1101 new annotated / raw | Diffs: previous, other | Lines: 836 ( +0, -0 )

Created: 2006-11-03 22:08:33 +0100 (3 years ago) | Author: hpdl | Changeset: 1101

oscommerce branch based on /trunk/oscommerce

Properties

 svn:eol-style = native
 svn:keywords = Id