OpenACS / openacs-4 / packages / acs-lang / www / admin

message-conflicts.tcl

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 5
Last Commit: 07 Nov
Commits this week: 0
Total Lines of Code (LoC): 132
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated 23 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 03 Sep
5:37 pm

gustafn

merge from oacs-5-10

Options
    • -4
    • +4
    ./message-conflicts.tcl
  2. … 8099 more files in changeset.
Thursday 07 Apr 2022
2:53 pm

gustafn

Make use of uniform styling based on adp:icon

Options
    • -1
    • +1
    ./message-conflicts.tcl
  2. … 20 more files in changeset.
Friday 20 Dec 2019
10:55 pm

gustafn

improve page contracts

Options
    • -1
    • +1
    ./message-conflicts.tcl
  2. … 1 more file in changeset.
Monday 16 Dec 2019
6:55 pm

antoniop

Rename string_truncate and string_truncate_middle to comply with OpenACS naming convention, create deprecated wrappers, replace occurrences

As string_truncate_middle was defined in xotcl-request-monitor, bring it to acs-tcl instead

Options
    • -2
    • +2
    ./message-conflicts.tcl
  2. … 11 more files in changeset.
Tuesday 08 Aug 2017
1:47 am

gustafn

merged changes from the oacs-5-9 branch and resolved conflicts

Options
    • -0
    • +6
    ./message-conflicts.tcl
  2. … 7834 more files in changeset.
Thursday 10 Sep 2015
10:21 am

gustafn

- add editor hints to keep spaces/tabs in the furture more consistent

Options
    • -0
    • +6
    ./message-conflicts.tcl
  2. … 754 more files in changeset.
Monday 15 Jun 2015
1:10 pm

gustafn

- improve validity and security of HTML of admin pages

Options
    • -1
    • +1
    ./message-conflicts.tcl
  2. … 15 more files in changeset.
Monday 27 Oct 2014
5:38 pm

victorg

Merging back to HEAD branch oacs-5-8 (using tag vg-merge-oacs-5-8-from-20141027).

Options
    • -1
    • +1
    ./message-conflicts.tcl
  2. … 2547 more files in changeset.
Tuesday 27 Aug 2013
2:20 pm

gustafn

- get rid of empty_string_p in non-deprecated code

- make use of tcl byte-code compiler

Options
    • -1
    • +1
    ./message-conflicts.tcl
  2. … 42 more files in changeset.
Thursday 26 Feb 2004
4:28 pm

jeffd

merge of all changes on oacs-5-0 branch between tag openacs-5-0-0-final and jcd-merge-pre503 (except those in lars-blogger).

Options
    • -23
    • +53
    ./message-conflicts.tcl
  2. … 293 more files in changeset.
Monday 09 Feb 2004
5:37 pm

peterm

making import page report errors. Making conflict page show both new and old message and offer the option of accepting new or reverting to old message

Options
    • -23
    • +53
    ./message-conflicts.tcl
  2. … 3 more files in changeset.
Monday 26 Jan 2004
4:39 pm

jeffd

merge of changes between oacs-5-0-0b4 and oacs-5-0-0-final to HEAD

Options
    • -1
    • +19
    ./message-conflicts.tcl
  2. … 286 more files in changeset.
Friday 12 Dec 2003
2:35 pm

peterm

adding upgrade_status filter

Options
    • -1
    • +10
    ./message-conflicts.tcl
Thursday 11 Dec 2003
10:39 pm

jeffd

merge of changes on oacs-5-0 branch to oacs-5-0-0b4 tag

Options
    • -0
    • +78
    ./message-conflicts.tcl
  2. … 598 more files in changeset.
1:42 pm

peterm

bug fixes of import messages and message conflicts pages. Making sure message conflict page works if its called with empty string arguments

Options
    • -0
    • +9
    ./message-conflicts.tcl
  2. … 2 more files in changeset.
Tuesday 09 Dec 2003
2:41 pm

peterm

file message-conflicts.tcl was initially added on branch oacs-5-0.

Options
    • -0
    • +0
    ./message-conflicts.tcl
2:41 pm

peterm

Adding support for I18N message catalog upgrades. Any import of

messages from catalog files that is done after the initial import is

considered an upgrade. The message import and upgrade logic is

encapsulated in the proc lang::catalog::import_messages (invoked

through lang::catalog::import).

acs-lang package

- Bumping version of package to 5.0.0b5

- Changes to datamodel:

- Adding columns deleted_p, conflict_p, and sync_time to lang_messages table.

- Removed column upgrade_status from lang_message_keys table

- Adding columns deleted_p, sync_time, conflict_p, upgrade_status to lang_messages_audit table

- Changes to lang::catalog Tcl API:

- Added proc lang::catalog::import_messages that encapsulates the logic for import and upgrade of

messages from catalog files to database.

- Changed the lang::catalog::import_from_file and lang::catalog:import procs to use the new import_messages proc.

- Added the upgrade Tcl API test cases that extensively tests through the import_messages proc with both

en_US and de_DE locales.

- Changes to lang::message Tcl API:

- Changed lang::message::register to take new switches upgrade_sync, upgrade_status, and conlfict. Cleaned up the

proc a little and made it construct SQL dynamically.

- Added procs delete, get, and get_element.

- Added the edit proc that is used when editing attributes of a message other than the message text itself. This

proc will not create a new message revision. It is invoked for example by the delete proc.

- Added the count_conflicts proc.

- Changes to admin UI

- New canonical pages for import/export of catalog files that check for site-wide-admin priv

- Made the message delete page use appropriate Tcl API

- Added the message-conflicts page that shows conflicting messages. Linking to this page from

index page, locale-, and package index pages.

acs-admin package

- Removed the import/export messages pages and using the ones in acs-lang package instead.

Options
    • -0
    • +78
    ./message-conflicts.tcl
  2. … 44 more files in changeset.