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

merge.tcl

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 7
Last Commit: 05 Apr
Commits this week: 0
Total Lines of Code (LoC): 114
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 08 Aug 2017
1:47 am

gustafn

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

Options
    • -5
    • +29
    ./merge.tcl
  2. … 7834 more files in changeset.
Tuesday 13 Sep 2016
12:53 pm

gustafn

- replace "javascript:*" urls with event listeners

Options
    • -1
    • +19
    ./merge.tcl
  2. … 1 more file in changeset.
Saturday 02 Jan 2016
2:50 pm

gustafn

.xql-file reform of acs-admin

- remove sql statements from the code, where these are provided via .xql

- prefer empty sql statements over various forms of *SQL*

- remove obsolete Oracle queries

member_approve

member_ban

member_reject

member_deleted

member_unapprove

user_info

- remove obsolete .xql files (containing only unused query names)

www/users/modify-admin-privileges-oracle.xql

www/users/modify-admin-privileges-postgresql.xql

www/users/user-add-2.xql

Options
    • -5
    • +5
    ./merge.tcl
  2. … 13 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
    • -1
    • +7
    ./merge.tcl
  2. … 754 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
    • -2
    • +2
    ./merge.tcl
  2. … 2547 more files in changeset.
Tuesday 05 Aug 2014
12:08 pm

gustafn

- check ids in page contracts

Options
    • -2
    • +2
    ./merge.tcl
  2. … 36 more files in changeset.
Friday 30 Nov 2007
7:16 pm

daveb

Remove header stuff from core. Use template::head procedures.

Add template::head::add_style to add inline styles.

Options
    • -1
    • +4
    ./merge.tcl
  2. … 6 more files in changeset.
Wednesday 10 Jan 2007
10:21 pm

gustafn

Normalizing string comparison operations into tcl 8.4 operations, enabling byte-code compilation for expressions and many conditionals

Options
    • -4
    • +4
    ./merge.tcl
  2. … 367 more files in changeset.
Friday 15 Dec 2006
1:00 am

donb

First round of oacs-5-3 merge to HEAD commits

Options
    • -3
    • +3
    ./merge.tcl
  2. … 96 more files in changeset.
Thursday 14 Dec 2006
11:49 pm

donb

Picked up some changes missed by the join of oacs-5-2 and oacs-5-3. It turns

out the cvs won't join files if it has already done some merging previously.

In this case I'd previously merged oacs-5-2 to HEAD, then branched oacs-5-3, then

reopened the 5.2 branch for minor bug fixing for .LRN 2.2.1. This confused

CVS or ... at least made it stubborn.

Options
    • -3
    • +3
    ./merge.tcl
  2. … 5 more files in changeset.
Friday 03 Nov 2006
10:27 pm

leed

Fixed bug #2999: Merge users fails.

Options
    • -3
    • +3
    ./merge.tcl
  2. … 1 more file in changeset.
Sunday 04 Jun 2006
2:45 am

donb

Merged acs-core oacs-5-2 (currently 5.2.3) -> HEAD.

TODO:

1. Bump acs-core package version numbers to 5.3.0d1

2. Would be nice to do a test install, wouldn't it?

Options
    • -0
    • +87
    ./merge.tcl
  2. … 721 more files in changeset.
Monday 13 Jun 2005
10:43 pm

enriquec

Improving the resultant messages output of each callback of the merge process

Options
    • -7
    • +17
    ./merge.tcl
  2. … 2 more files in changeset.
Wednesday 08 Jun 2005
7:52 pm

andrewg

Adding missing -object_id switch to site_node::get_url_from_object_id calls

Options
    • -3
    • +3
    ./merge.tcl
1:11 pm

enriquec

Fixing bugs in user merge support. Improving the process, making it more generic and now it works for acs-core. Adding the upgrade scripts for oracle and pg.

Options
    • -51
    • +37
    ./merge.tcl
  2. … 13 more files in changeset.
Tuesday 24 May 2005
4:54 am

enriquec

Adding GUI to merge user accounts. I modified the 'one acs admin user' page and 'search' page to support this.

Options
    • -0
    • +91
    ./merge.tcl
  2. … 16 more files in changeset.
4:54 am

enriquec

file merge.tcl was initially added on branch oacs-5-2.

Options
    • -0
    • +0
    ./merge.tcl