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

merge-final.tcl

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 5
Last Commit: 05 Apr
Commits this week: 0
Total Lines of Code (LoC): 85
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
Friday 19 Jan 2018
2:40 pm

gustafn

add ad_script_abort after ad_returnredirect to make termination intent explicit

Options
    • -1
    • +2
    ./merge-final.tcl
  2. … 27 more files in changeset.
Tuesday 08 Aug 2017
1:47 am

gustafn

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

Options
    • -6
    • +15
    ./merge-final.tcl
  2. … 7834 more files in changeset.
Saturday 02 Jan 2016
10:14 pm

gustafn

- prefer sql statements between curly braces

Options
    • -6
    • +9
    ./merge-final.tcl
  2. … 16 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-final.tcl
  2. … 754 more files in changeset.
Sunday 14 Jun 2015
1:55 am

gustafn

- use type checking for boolean parameters in page_contracts to improve security

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

gustafn

- check ids in page contracts

Options
    • -3
    • +3
    ./merge-final.tcl
  2. … 36 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
    • -3
    • +3
    ./merge-final.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
    • -2
    • +2
    ./merge-final.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
    • -2
    • +2
    ./merge-final.tcl
  2. … 5 more files in changeset.
Friday 03 Nov 2006
10:27 pm

leed

Fixed bug #2999: Merge users fails.

Options
    • -2
    • +2
    ./merge-final.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
    • +74
    ./merge-final.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
    • -9
    • +20
    ./merge-final.tcl
  2. … 2 more files in changeset.
Wednesday 08 Jun 2005
11:48 pm

enriquec

Adding a proc call that will merge the users objects, permissions and protraits

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

enriquec

Adding an 'if' clause in adp merge final page if the user doesn't want to merge.

Options
    • -5
    • +5
    ./merge-final.tcl
  2. … 2 more files in changeset.
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
    • -2
    • +9
    ./merge-final.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
    • +54
    ./merge-final.tcl
  2. … 16 more files in changeset.
4:54 am

enriquec

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

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