Opened 14 years ago

Last modified 11 years ago

#13 new enhancement

Copy, merge and clean up trunk -> stable propagation, naming, etc

Reported by: Kris Deugau Owned by:
Priority: major Milestone:
Version: Keywords:
Cc:

Description (last modified by Kris Deugau)

Crossmerge all differences between /trunk and /branches/stable so further development can proceed from a coherent start.

Change History (24)

comment:1 by Kris Deugau, 14 years ago

Type: defect → enhancement

comment:2 by Kris Deugau, 14 years ago

/trunk

Merge basic node-tracking from r393:396 into trunk. See #13.

comment:3 by Kris Deugau, 14 years ago

Description: modified (diff)

comment:4 by Kris Deugau, 14 years ago

(In [398]) /trunk

Merge add (r343) and updates (r392 and r393) to quick-hack PHP
customer info editor scripts. See #13.

comment:5 by Kris Deugau, 14 years ago

(In [399]) /trunk

Merge updates/bugfixes to access-pwd-update.pl from r386. See #13.

comment:6 by Kris Deugau, 14 years ago

(In [400]) /trunk

Merge addition of CustIDCK.pm from r56 - proprietary info this contained
was stripped during repo history conversion and it makes a good base for
providing data validation hooks.
Also merge all updates and related additions since.
See #13.

comment:7 by Kris Deugau, 14 years ago

(In [401]) /trunk

Merge add of combineblocks.pl from r306. See #13.

comment:8 by Kris Deugau, 14 years ago

(In [402]) /trunk

Merge miscellaneous microdifferences that have crept in. See #13.

comment:9 by Kris Deugau, 14 years ago

(In [403]) /trunk

Update SQL tabledef and alloctype preseeding with latest typedefs. See #13.
(nb: not a straight merge from /branches/stable)

comment:10 by Kris Deugau, 14 years ago

(In [404]) /trunk

Merge "temporary" fix-up-the-IP-pool deallocation hack. See #13.

This will be regularized and integrated down the road since it's
likely that legacy data may show the same constructs, and there
are probably advantages to *creating* similar allocations new.

See #6.

comment:11 by Kris Deugau, 14 years ago

(In [405]) /trunk

Add, in comments, mail notifications present in /branches/stable
but not in /trunk. See #13.

comment:12 by Kris Deugau, 14 years ago

(In [406]) /trunk

Fix some trivial typos introduced with r405. See #13.

comment:13 by Kris Deugau, 14 years ago

(In [407]) /branches/stable

Remove NOV-VPN hack comment block. See #13.

comment:14 by Kris Deugau, 14 years ago

(In [408]) /branches/stable

Comment out mailNotify calls to prepare to accept merge of redesigned
notifications. See #2, #13.

comment:15 by Kris Deugau, 14 years ago

(In [409]) /trunk

Minor typofix on preseeded alloctypes. See #13.

comment:16 by Kris Deugau, 14 years ago

(In [410]) /branches/stable

Merge tabledef/preseeding SQL from /trunk. See #13.

comment:17 by Kris Deugau, 14 years ago

(In [411]) /branches/stable

Merge extra pieces of admin.cgi from /trunk. See #13.

comment:18 by Kris Deugau, 14 years ago

(In [414]) /branches/stable

Merge CSS shuffle from r413. Pieces of r412 were needed in
admin.cgi as well. See #13.

comment:19 by Kris Deugau, 14 years ago

Milestone: → 2.6

comment:20 by Kris Deugau, 14 years ago

(In [425]) /trunk

Remove useless "Recent changes" link/page, which has lagged further
and further and doesn't make much sense any more. See #13.

comment:21 by Kris Deugau, 14 years ago

(In [430]) /trunk

Remove obsolete PHP hacks for munging customer data for rWHOIS. See #13.

comment:22 by Kris Deugau, 14 years ago

(In [444]) /branches/stable

Merge dangling comment difference in consistency-check.pl - this
should bring /branches/stable identical to /trunk as of r414.

Get mergeinfo more or less properly set with --record-only for
development up to r414.

See #13.

comment:23 by Kris Deugau, 14 years ago

(In [445]) /branches/stable

Bring /branches/stable up to date with /trunk. See #13.

comment:24 by Kris Deugau, 11 years ago

Milestone: 2.7
Note: See TracTickets for help on using tickets.