Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
17,881 Commits 28 Branches 95 Tags 527 MiB
c67d02847b
Commit Graph

67 Commits

Author SHA1 Message Date
Don Allingham
02096637b8 2007-02-11 Don Allingham <don@gramps-project.org> 
* src/Merge/_MergePlace.py: merge from 2.2 tree
	* src/GrampsDbUtils/_GedcomParse.py: parsing improvements
	* src/GrampsDbUtils/_GedcomLex.py: parsing improvements

2007-02-11  Don Allingham  <don@gramps-project.org>
	* src/Merge/_MergePlace.py (MergePlaces.merge): fix typo on 
	add_source_reference
2007-02-07  Zsolt Foldvari  <zfoldvar@users.sourceforge.net>
	* src/DisplayTabs/_NoteTab.py: move "rich text" notes to 2.3 branch.

2007-02-06  Brian Matherly  <brian@gramps-project.org>
	* src/docgen/PdfDoc.py: provide a more useful error when reportlab crashes

2007-02-06  Douglas Blank  <dblank@cs.brynmawr.edu>
	* src/ReportBase/_ReportDialog.py: 0000905: Typo in catching exceptions in 
	  buggy reports
	* src/plugins/holidays.xml: 0000906: Canada holidays patch

2007-02-06  Don Allingham  <don@gramps-project.org>
	* src/GrampsDb/_ReadGedcom.py: fix cal/est parsing
	* src/DisplayTabs/_ButtonTab.py: catch window already being open
	* example/gedcom/sample.ged: Add est/cal samples



svn: r8088
 2007-02-12 03:53:56 +00:00
Zsolt Foldvari
e54cbc8c51 2007-02-11 Zsolt Foldvari <zfoldvar@users.sourceforge.net> 
* src/MarkupText.py: added
	* src/DisplayTabs/_NoteTab.py: handling 'rich text' notes
	* src/RelLib/_NoteBase.py: handling 'rich text' notes
	* src/RelLib/_Note.py: handling 'rich text' notes
	* src/GrampsDb/_GrampsBSDDB.py: handling 'rich text' notes
	* src/GrampsDbUtils/_ReadXML.py: handling 'rich text' notes
	* src/GrampsDbUtils/_WriteXML.py: handling 'rich text' notes
	* src/Merge/_MergeSource.py: handling 'rich text' notes
	* src/Merge/_MergePlace.py: handling 'rich text' notes
	* src/Merge/_MergePerson.py: handling 'rich text' notes
	* src/ReportBase/_ReportUtils.py: handling 'rich text' notes
	* src/ViewManager.py: cleanup



svn: r8081
 2007-02-10 23:40:48 +00:00
Don Allingham
806b7375cf svn: r7860 2006-12-31 05:17:35 +00:00
Don Allingham
13260778f1 * 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
aa171d3409 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
96a9dda07e * src/Merge/_MergePerson.py: fixed check_for_child function to handle childrefs 
svn: r7713
 2006-11-26 22:34:02 +00:00
Alex Roitman
45437abe02 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
364cec4571 remove debug 
svn: r7194
 2006-08-17 21:48:54 +00:00
Don Allingham
20abe966d3 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
5fde6c6e50 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
2d7c1c3435 * src/Merge/_MergePerson.py: Use new child_ref API. 
svn: r7077
 2006-07-25 20:23:28 +00:00
Don Allingham
051f992afb 2006-07-04 Don Allingham <don@gramps-project.org> 
* various: pyflakes fixes



svn: r6992
 2006-07-04 23:38:51 +00:00
Alex Roitman
99acb9d02f Update 
svn: r6824
 2006-05-31 02:41:46 +00:00
Don Allingham
1772ac7d01 * 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
594ce4ce53 * src/Merge/_MergePlace.py: handle notes 
* src/glade/mergedata.glade: handle notes


svn: r6779
 2006-05-25 23:43:34 +00:00
Don Allingham
305b3d7bd1 * 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
d5f33362ac * src/DataViews/_SourceView.py: source merge support 
svn: r6777
 2006-05-25 20:35:04 +00:00