Quick Search:

Line History

line history graph

View Mode

Logical Physical

Show Arbitrary Diff

From to

Supports revisions and tags.

History

trunk 1546 1

latest revision download trunk

1546 annotated / raw | Diffs: previous, other | Lines: 5869 ( +4702, -256 )

Created: 2007-03-31 04:21:32 +0200 (20 months ago) | Author: hpdl | Changeset: 1546

Copied to: branches/frank/osc_trunk/install/oscommerce.sql 1756

merge country zones Anders worked on; merge from hpdl r1545

Tags: oscommerce-3.0a4

Properties

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

1536 annotated / raw | Diffs: previous, other | Lines: 1423 ( +6, -2 )

Created: 2007-03-31 00:10:22 +0200 (20 months ago) | Author: hpdl | Changeset: 1536

move program locations to the configuration table

merge from hpdl r1534

Properties

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

1512 annotated / raw | Diffs: previous, other | Lines: 1419 ( +2, -13 )

Created: 2007-03-30 01:46:41 +0200 (20 months ago) | Author: hpdl | Changeset: 1512

allow language sets to inject definitions from another language set
this is helpful for language variations where only a few definitions are different

merge from hpdl r1501, r1507, r1511

Properties

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

1498 annotated / raw | Diffs: previous, other | Lines: 1430 ( +3, -1 )

Created: 2007-03-29 16:04:50 +0200 (20 months ago) | Author: hpdl | Changeset: 1498

Copied to: branches/frank/Alpha4_TinyMCE/install/oscommerce.sql 1503

update version number to 3.0 Alpha 4
update copyright notice / license notice

merge from hpdl r1497

Properties

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

1390 annotated / raw | Diffs: previous, other | Lines: 1428 ( +1, -1 )

Created: 2007-03-06 20:41:22 +0100 (20 months ago) | Author: hpdl | Changeset: 1390

merge from hpdl r1388

MySQL 4.1 compatibility fix

Properties

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

1372 annotated / raw | Diffs: previous, other | Lines: 1428 ( +15, -0 )

Created: 2007-03-05 23:58:51 +0100 (20 months ago) | Author: hpdl | Changeset: 1372

merge from hpdl r1290-r1291, r1293

introduce the administrators log class to log database changes performed from the administration tool
introduce the new Administrators Log section on the Administration Tool to displayed the logged actions

Properties

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

1317 annotated / raw | Diffs: previous, other | Lines: 1413 ( +1, -1 )

Created: 2007-03-05 06:36:15 +0100 (20 months ago) | Author: hpdl | Changeset: 1317

make the user_name field case sensitive

fix OSC-90

Properties

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

1316 annotated / raw | Diffs: previous, other | Lines: 1413 ( +6, -6 )

Created: 2007-03-05 06:06:50 +0100 (20 months ago) | Author: hpdl | Changeset: 1316

remove NOT NULL requirements on some fields

fix OSC-107

Properties

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

1157 annotated / raw | Diffs: previous, other | Lines: 1413 ( +1, -1 )

Created: 2006-11-23 00:11:13 +0100 (2 years ago) | Author: hpdl | Changeset: 1157

Copied (3 times):

remove control character from the file

Branch point for: modom

Properties

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

1156 annotated / raw | Diffs: previous, other | Lines: 1413 ( +107, -107 )

Created: 2006-11-22 16:10:47 +0100 (2 years ago) | Author: tech2000 | Changeset: 1156

Reverting to 1111

Properties

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

1155 annotated / raw | Diffs: previous, other | Lines: 1413 ( +108, -108 )

Created: 2006-11-22 02:30:04 +0100 (2 years ago) | Author: tech2000 | Changeset: 1155

Changed almost all country names to their native languages.

Properties

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

1111 annotated / raw | Diffs: previous, other | Lines: 1413 ( +0, -2 )

Created: 2006-11-06 12:39:48 +0100 (2 years ago) | Author: hpdl | Changeset: 1111

merge from hpdl r1110; fix the addition of new administrators

Properties

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

1078 annotated / raw | Diffs: previous, other | Lines: 1415 ( +7, -0 )

Created: 2006-10-25 17:43:32 +0200 (2 years 1 month 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: 1408 ( +1, -1 )

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

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

Properties

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

971 annotated / raw | Diffs: previous, other | Lines: 1408 ( +1, -1 )

Created: 2006-09-01 14:25:15 +0200 (2 years 3 months ago) | Author: hpdl | Changeset: 971

merge from hpdl r970

when importing or removing a language, also take care of the product image groups
remove the auto_increment from the osc_products_images_groups table

Branch point for: tag:oscommerce-3.0a3

Properties

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

963 annotated / raw | Diffs: previous, other | Lines: 1408 ( +2, -2 )

Created: 2006-09-01 01:41:20 +0200 (2 years 3 months ago) | Author: hpdl | Changeset: 963

merge from hpdl r962; update default values

Properties

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

950 annotated / raw | Diffs: previous, other | Lines: 1408 ( +0, -4 )

Created: 2006-08-31 19:50:13 +0200 (2 years 3 months ago) | Author: hpdl | Changeset: 950

merge from hpdl r948; use heading image sizes, drop redundant image parameters

Properties

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

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

Created: 2006-08-31 15:53:35 +0200 (2 years 3 months ago) | Author: hpdl | Changeset: 946

merge from hpdl r944 r945; remove language image field from the database and hardcode it as 'icon.gif'

Properties

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

857 annotated / raw | Diffs: previous, other | Lines: 1413 ( +182, -134 )

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

merge from hpdl r856

added zones for:

Australia
Chile
Sweden

Thanks Anders for providing the zones to Chile and Sweden

Properties

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

831 annotated / raw | Diffs: previous, other | Lines: 1365 ( +1, -0 )

Created: 2006-08-29 14:48:40 +0200 (2 years 3 months ago) | Author: hpdl | Changeset: 831

merge from hpdl r825 to r830

E_ALL compatibility updates
set the error reporting level to E_ALL by default

Properties

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

814 annotated / raw | Diffs: previous, other | Lines: 1364 ( +19, -35 )

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

merge from hpdl r809, r810, r811

- remove redundant customers_basket_attributes database table; the attributes already exist as part of the product_id string in the main customers_basket table
- merge the customers_info database table into the main customers table

Properties

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

808 annotated / raw | Diffs: previous, other | Lines: 1380 ( +0, -2 )

Created: 2006-08-26 20:53:33 +0200 (2 years 3 months ago) | Author: hpdl | Changeset: 808

merge from hpdl r802, r803, r804

- the product_id string structure is actually changed in this commit and not in the previous commit as mentioned in the commit log
- move action logic from application_top.php to new action modules
- set an empty string to empty GET parameters to make sure they pass isset() checks

Properties

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

779 annotated / raw | Diffs: previous, other | Lines: 1382 ( +1, -1 )

Created: 2006-08-23 20:08:41 +0200 (2 years 3 months ago) | Author: hpdl | Changeset: 779

merge from hpdl r778
fix #41

allow the postcode to be entered voluntarily (not needed in some countries; eg Chile)

Properties

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

763 annotated / raw | Diffs: previous, other | Lines: 1382 ( +1, -1 )

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

merge from hpdl r762
- add the address format for Chile (thanks to Anders (Tech2000))

Properties

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

758 annotated / raw | Diffs: previous, other | Lines: 1382 ( +45, -47 )

Created: 2006-08-23 14:30:07 +0200 (2 years 3 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

757 annotated / raw | Diffs: previous, other | Lines: 1384 ( +252, -269 )

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

merge from hpdl r725, r728, r729, r732, r733, r734
- standardize general.php functions
- new osC_Address class for adadress related functions (incl. address format string being moved to the countries database table)

Properties

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

756 annotated / raw | Diffs: previous, other | Lines: 1401 ( +0, -1 )

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

merge from hpdl r705, r719, r720, r721
- general fixes

Properties

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

754 annotated / raw | Diffs: previous, other | Lines: 1402 ( +0, -2 )

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

merge from hpdl r685 to r688
- css/xhtml updates
- standardize html_output.php functions
- convert & to & in the href_link function

Properties

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

646 annotated / raw | Diffs: previous, other | Lines: 1404 ( +2, -2 )

Created: 2006-07-18 19:46:07 +0200 (2 years 4 months ago) | Author: hpdl | Changeset: 646

merge hpdl r645

change the encoding to utf-8

fix #56

Branch point for: frank garrone

Properties

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

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

Created: 2006-07-05 13:04:24 +0200 (2 years 4 months ago) | Author: hpdl | Changeset: 610

merge from hpdl r607
automatically select the best connection method when communicating with gateway servers
close #18

Properties

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

608 annotated / raw | Diffs: previous, other | Lines: 1403 ( +34, -1 )

Created: 2006-07-05 12:56:09 +0200 (2 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

554 annotated / raw | Diffs: previous, other | Lines: 1370 ( +88, -83 )

Created: 2006-04-29 18:26:53 +0200 (2 years 7 months ago) | Author: hpdl | Changeset: 554

merge from hpdl -r474

Properties

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

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

Created: 2006-03-06 01:37:29 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 474

merge from hpdl r471

Tags: oscommerce-3.0a2

Properties

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

471 annotated / raw | Diffs: previous, other | Lines: 1364 ( +1, -16 )

Created: 2006-03-05 21:51:18 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 471

merge from hpdl r468

Properties

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

448 annotated / raw | Diffs: previous, other | Lines: 1379 ( +2, -0 )

Created: 2006-02-21 07:27:28 +0100 (2 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)

Properties

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

443 annotated / raw | Diffs: previous, other | Lines: 1377 ( +1, -29 )

Created: 2006-02-20 00:01:01 +0100 (2 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

410 annotated / raw | Diffs: previous, other | Lines: 1405 ( +34, -20 )

Created: 2006-01-26 10:17:09 +0100 (2 years 10 months ago) | Author: hpdl | Changeset: 410

merge from hpdl -r 383:head ; mainly related to the new XML based languages implementation

Properties

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

366 annotated / raw | Diffs: previous, other | Lines: 1391 ( +131, -23 )

Created: 2005-12-22 16:45:34 +0100 (2 years 11 months ago) | Author: hpdl | Changeset: 366

merge from hpdl -r152

Tags: oscommerce-3.0a1

Properties

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

6 annotated / raw | Diffs: previous, other | Lines: 1283 ( +3, -2 )

Created: 2005-02-23 16:07:33 +0100 (3 years 9 months ago) | Author: hpdl | Changeset: 6

replace the calls to the database functions with the new database class methods

Branch point for: hpdl

Properties

 svn:keywords = Id

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

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

Added svn:keywords Id property

Properties

 svn:keywords = Id

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

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

Initial import