Commit Graph

16 Commits

Author SHA1 Message Date
Don Allingham bfa8c94aeb 2007-02-11 Don Allingham <don@gramps-project.org>
* src/Merge/_MergePlace.py (MergePlaces.merge): fix typo on 
	add_source_reference



svn: r8086
2007-02-11 18:21:58 +00:00
Don Allingham 91c6c4b923 svn: r7860 2006-12-31 05:17:35 +00:00
Don Allingham 1b35b73038 * src/GrampsDb/_WriteXML.py: fix bookmark handling
* src/plugins/FindDupes.py (Merge.find_potentials): update internal
	list on call (bug# 789)
	copy the LDS information (bug# 642)
	(MergePeople.merge_existing_family): fix child references on merge
	


svn: r7838
2006-12-22 23:28:05 +00:00
Don Allingham 01188d7bf9 2006-12-22 Don Allingham <don@gramps-project.org>
* src/Merge/_MergePerson.py (MergePeople.merge_person_information): 
	copy the LDS information



svn: r7836
2006-12-22 18:56:38 +00:00
Don Allingham be83b6f8ba * src/Merge/_MergePerson.py: fixed check_for_child function to handle childrefs
svn: r7713
2006-11-26 22:34:02 +00:00
Alex Roitman cb82d7c7c0 2006-08-23 Alex Roitman <shura@gramps-project.org>
* src/Merge/_MergePerson.py (MergePeopleUI.__init__): Properly
	close managed window.
	* src/glade/mergedata.glade: Remove unneeded signal connections.



svn: r7246
2006-08-23 16:11:47 +00:00
Don Allingham fe28941a7c remove debug
svn: r7194
2006-08-17 21:48:54 +00:00
Don Allingham 35d691568a 2006-08-17 Don Allingham <don@gramps-project.org>
* src/DataViews/_PersonView.py: rebuild after compare and
	merge (bug #350)



svn: r7193
2006-08-17 21:48:12 +00:00
Don Allingham cab2258c7a 2006-08-12 Don Allingham <don@gramps-project.org>
* src/Merge/_MergePerson.py: properly merge notes



svn: r7163
2006-08-12 21:59:32 +00:00
Alex Roitman a544d4b0e7 * src/Merge/_MergePerson.py: Use new child_ref API.
svn: r7077
2006-07-25 20:23:28 +00:00
Don Allingham 835329191f 2006-07-04 Don Allingham <don@gramps-project.org>
* various: pyflakes fixes



svn: r6992
2006-07-04 23:38:51 +00:00
Alex Roitman 7214376f42 Update
svn: r6824
2006-05-31 02:41:46 +00:00
Don Allingham 339e8434fa * src/Merge/_MergeSource.py: note handling on source merge
* src/glade/mergedata.glade: note handling on source merge


svn: r6786
2006-05-26 03:07:48 +00:00
Don Allingham c2276f723d * src/Merge/_MergePlace.py: handle notes
* src/glade/mergedata.glade: handle notes


svn: r6779
2006-05-25 23:43:34 +00:00
Don Allingham 38556466b0 * src/DataViews/_PersonView.py: Merge module support
* src/Merge/_MergeSource.py: broken out of MergeData.py
	* src/Merge/__init__.py: support of module
	* src/Merge/Makefile.am: added
	* src/Merge/_MergePlace.py: broken out of MergeData.py
	* src/Merge/_MergePerson.py: renamed


svn: r6778
2006-05-25 21:02:49 +00:00
Don Allingham f129939ab6 * src/DataViews/_SourceView.py: source merge support
svn: r6777
2006-05-25 20:35:04 +00:00