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

merge.adp

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 6
Last Commit: 09 Jul
Commits this week: 0
Total Lines of Code (LoC): 235
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 12 hours ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Tuesday 03 Sep 2024
5:37 pm

gustafn

merge from oacs-5-10

Options
    • -3
    • +3
    ./merge.adp
  2. … 8099 more files in changeset.
Thursday 08 Feb 2024
7:47 pm

gustafn

improved spelling

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

gustafn

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

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

gustafn

- replace "javascript:*" urls with event listeners

Options
    • -2
    • +2
    ./merge.adp
  2. … 1 more file in changeset.
Thursday 09 Jun 2016
10:52 am

gustafn

- modernize HTML in .adp files

Options
    • -13
    • +13
    ./merge.adp
  2. … 44 more files in changeset.
Friday 03 Jul 2015
12:25 pm

gustafn

- fix and standardize quoting in template properties

Options
    • -1
    • +1
    ./merge.adp
  2. … 396 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
    ./merge.adp
  2. … 2547 more files in changeset.
Wednesday 11 Sep 2013
8:40 pm

gustafn

- use property "doc(title)" throughout oacs-5-8 instead of "title" to get rid of warnings in error.log of the form:

Warning: /forums/message-view has no doc(title) set.

Using doc(title) is required in blank-master.tcl but was used so far only in a few packages

Options
    • -1
    • +1
    ./merge.adp
  2. … 337 more files in changeset.
Wednesday 30 Jul 2008
12:04 am

emmar

HTML Strict cleanup: removed trailing slash of input, img, link, meta tags

Options
    • -8
    • +8
    ./merge.adp
  2. … 21 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
    • -3
    • +1
    ./merge.adp
  2. … 6 more files 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
    • +237
    ./merge.adp
  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
    • -2
    • +2
    ./merge.adp
  2. … 2 more files in changeset.
Wednesday 08 Jun 2005
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
    • -248
    • +74
    ./merge.adp
  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
    • +411
    ./merge.adp
  2. … 16 more files in changeset.
4:54 am

enriquec

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

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