Log of /contributions/modules/geshifilter/geshifilter.conflicts.inc

---

Revision 1.1.2.5 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jul 12 23:33:02 2009 UTC (4 months, 2 weeks ago) by soxofaan
Branch: DRUPAL-5--2
Changes since 1.1.2.4: +4 -4 lines
Diff to previous 1.1.2.4 , to branch point 1.1 , to next main 1.7

#351185 by hass: i18n fixes

---

Revision 1.7 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jul 12 23:24:48 2009 UTC (4 months, 2 weeks ago) by soxofaan
Branch: MAIN
CVS Tags: HEAD
Changes since 1.6: +4 -4 lines
Diff to previous 1.6

#351185 by hass: i18n fixes

---

Revision 1.6 - (view) (download) (as text) (annotate) - [select for diffs]
Sun Jul 12 15:00:28 2009 UTC (4 months, 2 weeks ago) by soxofaan
Branch: MAIN
Changes since 1.5: +2 -2 lines
Diff to previous 1.5

various i18 fixes and typos (part of #351185 by hass)

---

Revision 1.5 - (view) (download) (as text) (annotate) - [select for diffs]
Sat Jul 4 09:48:59 2009 UTC (4 months, 3 weeks ago) by soxofaan
Branch: MAIN
Changes since 1.4: +3 -3 lines
Diff to previous 1.4

#455564: added [[code]] tag style and refactored bracket settings code

---

Revision 1.4 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jul 21 17:44:23 2008 UTC (16 months ago) by soxofaan
Branch: MAIN
CVS Tags: DRUPAL-6--1-2
Changes since 1.3: +6 -1 lines
Diff to previous 1.3

fixed some issues reported by the coder module

---

Revision 1.3 - (view) (download) (as text) (annotate) - [select for diffs]
Mon Jul 21 14:24:16 2008 UTC (16 months ago) by soxofaan
Branch: MAIN
Changes since 1.2: +2 -2 lines
Diff to previous 1.2

#285088 by saper: usage of full path in require_once calls

---

Revision 1.1.2.4 - (view) (download) (as text) (annotate) - [select for diffs]
Thu May 1 17:01:02 2008 UTC (18 months, 3 weeks ago) by soxofaan
Branch: DRUPAL-5--2
CVS Tags: DRUPAL-5--2-7, DRUPAL-5--2-8
Changes since 1.1.2.3: +6 -1 lines
Diff to previous 1.1.2.3 , to branch point 1.1

moved stuff from geshifilter.module to geshifilter.inc
brought geshifilter.conflicts.inc, geshifilter.filtertips.inc, geshifilter.pages.inc and geshifilter.inc in more sync with HEAD versions for easier maintenance

---

Revision 1.1.2.3 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 19 10:23:27 2008 UTC (21 months ago) by soxofaan
Branch: DRUPAL-5--2
CVS Tags: DRUPAL-5--2-6
Changes since 1.1.2.2: +0 -17 lines
Diff to previous 1.1.2.2 , to branch point 1.1

previous commit wrongly included initial changes to geshifilter.conflicts.inc, reverted now to previous version

---

Revision 1.1.2.2 - (view) (download) (as text) (annotate) - [select for diffs]
Tue Feb 19 10:17:10 2008 UTC (21 months ago) by soxofaan
Branch: DRUPAL-5--2
Changes since 1.1.2.1: +18 -1 lines
Diff to previous 1.1.2.1 , to branch point 1.1

added message when clearing the filter cache

---

Revision 1.2 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jan 31 10:30:37 2008 UTC (21 months, 3 weeks ago) by soxofaan
Branch: MAIN
CVS Tags: DRUPAL-6--1-0, DRUPAL-6--1-0-RC3, DRUPAL-6--1-1
Changes since 1.1: +104 -0 lines
Diff to previous 1.1

(port of http://drupal.org/cvs?commit=98566) refactored conflict detection and solved #185001 (code filter conflict) and #214766 (HTML escaping conflict)

---

Revision 1.1.2.1 - (view) (download) (as text) (annotate) - [select for diffs]
Thu Jan 31 09:48:26 2008 UTC (21 months, 3 weeks ago) by soxofaan
Branch: DRUPAL-5--2
Changes since 1.1: +99 -0 lines
Diff to previous 1.1

refactored conflict detection and solved #185001 (code filter conflict) and #214766 (HTML escaping conflict)

---

Revision 1.1
Thu Jan 31 09:48:26 2008 UTC (21 months, 3 weeks ago) by soxofaan
Branch: MAIN
Branch point for: DRUPAL-5--2
FILE REMOVED

file geshifilter.conflicts.inc was initially added on branch DRUPAL-5--2.