Quick Search:

Line History

line history graph

View Mode

Logical Physical

Show Arbitrary Diff

From to

Supports revisions and tags.

History

frank 1767 1756 trunk 1512 1

latest revision download trunk

1512 annotated / raw | Diffs: previous, other | Lines: 262 ( +14, -5 )

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

Copied to: branches/frank/osc_trunk/includes/classes/language.php 1756

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

Tags: oscommerce-3.0a4

Properties

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

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

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

Copied to: branches/frank/Alpha4_TinyMCE/includes/classes/language.php 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

1434 annotated / raw | Diffs: previous, other | Lines: 251 ( +19, -6 )

Created: 2007-03-08 20:15:38 +0100 (2 years 8 months ago) | Author: hpdl | Changeset: 1434

use a new showImage() language class method to display the language icon
use new language icons found in images/worldflags
(merge from hpdl r1431-r1432)

Properties

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

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

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

Copied (3 times):

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

Branch point for: modom tag:oscommerce-3.0a3 weisser

Properties

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

758 annotated / raw | Diffs: previous, other | Lines: 238 ( +5, -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

757 annotated / raw | Diffs: previous, other | Lines: 234 ( +1, -1 )

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

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

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

Branch point for: frank garrone

Tags: oscommerce-3.0a2

Properties

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

410 annotated / raw | Diffs: previous, other | Lines: 233 ( +84, -10 )

Created: 2006-01-26 10:17:09 +0100 (3 years 9 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

383 annotated / raw | Diffs: previous, other | Lines: 159 ( +73, -93 )

Created: 2006-01-09 17:35:46 +0100 (3 years 10 months ago) | Author: hpdl | Changeset: 383

merge from hpdl r376

Properties

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

368 annotated / raw | Diffs: previous, other | Lines: 179 ( +7, -17 )

Created: 2005-12-22 17:27:23 +0100 (3 years 10 months ago) | Author: hpdl | Changeset: 368

merge from hpdl -r152 (having problems merging the includes/content directory and hope to get that fixed in the next commit)

Tags: oscommerce-3.0a1

Properties

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

151 annotated / raw | Diffs: previous, other | Lines: 189 ( +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: 189 ( +39, -15 )

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: 165 ( +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: 165 ( +165, -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

1767 annotated / raw | Diffs: previous, other | Lines: 262 ( +1, -1 )

Created: 2008-01-05 13:33:05 +0100 (22 months ago) | Author: frank | Changeset: 1767

Bug solution for issue nr140. Wrong method call, since the load method can be called from the admin (in the template section) and the admin language class extends the catalog language class and also contains a getData method (which expects other data) this must be called with a scope resolution operator to refer to the getData method of the catalog language class.

Properties

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

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

Created: 2007-12-26 21:48:55 +0100 (22 months ago) | Author: frank | Changeset: 1756

Copied from: trunk/oscommerce/includes/classes/language.php 1512

Copy of the current osC V3.0 trunk version

Properties

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