8 Commits

Author SHA1 Message Date
Tim G L Lyons
c833073ba6 GEPS023: merge branch (changes 17960-18546) into trunk
svn: r18548
2011-12-04 17:09:17 +00:00
Paul Franklin
331c135235 5128: Python files with no SVN "Id" property (& added MIME text/plain if none)
svn: r18338
2011-10-16 20:21:22 +00:00
Tim G L Lyons
5a3cef062c * Implemented merge Citation
* Updated merge Sources
* Implemented undo-redo for citations (revision 18069 had only added citations to the undo-redo list, not acted on that types of element)
* Fixed embedded lists for some of the object type editors that were done in Rev 18069
* Modified EditCitation so the source parameter is optional
* Added svn properties for all /src/Merge/merge*.py modules
* Added support for EditCitation from backreflist.py

svn: r18085
2011-08-30 10:40:30 +00:00
Doug Blank
e3fdeb363d Add property keywords; removed unneeded files after merge fixes (#2059)
svn: r16059
2010-10-26 10:49:11 +00:00
Doug Blank
3e28ee67ec 2059: need a way to compare and merge all objects, by MD Nauta
svn: r15645
2010-07-22 02:16:32 +00:00
Raphael Ackermann
bbe2cc6d4e 2008-01-22 Raphael Ackermann <raphael.ackermann@gmail.com>
* src/* Everything but src/images/* and src/data/* add correct svn 
	properties with the commands:
	svn propset -R svn:mime-type text/plain src/
	svn propset -R svn:eol-style native src/
	svn propset -R svn:keywords Id src/
	See below why the Id keyword is enough. From svn help propset
	svn:keywords   - Keywords to be expanded.  Valid keywords are:
      URL, HeadURL             - The URL for the head version of the object.
      Author, LastChangedBy    - The last person to modify the file.
      Date, LastChangedDate    - The date/time the object was last modified.
      Rev, Revision,           - The last revision the object changed.
      LastChangedRevision
      Id                       - A compressed summary of the previous
                                   4 keywords.

svn: r9912
2008-01-22 09:17:46 +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