summaryrefslogtreecommitdiff
path: root/admin_site_merge.php
AgeCommit message (Expand)AuthorFilesLines
2014-10-06Whitespace changes to reduce merge conflicts with the assets branchGreg Roach1-3/+2
2014-09-17#237 - function accept_all_changes() not foundGreg Roach1-1/+0
2014-08-27Remove more unused code / cleanupGreg Roach1-1/+0
2014-08-14Import classes, per PSR autoloading standardsGreg Roach1-1/+3
2014-08-13Error in error message when merging non-existant recordsGreg Roach1-2/+2
2014-06-17Autocomplete doesn't work on pages with data from multiple treesGreg Roach1-8/+6
2014-05-09Refactor global user functions into new User/Auth classesGreg Roach1-2/+2
2014-03-31Merging records can fail when pending changes not acceptedGreg Roach1-10/+16
2014-02-24Consolidate paste_*, pastename and openerpasteid implementationsMatthew Noorenberghe1-10/+3
2014-01-04Update copyright date to 2014Greg Roach1-1/+1
2014-01-04Fix address of FSF, replace licence of GPLv2 by latest versionweberho1-1/+1
2013-11-01Tidy up trailing whitespaceGreg Roach1-1/+1
2013-09-14#770024 - merge data from two different family-trees faultyGreg Roach1-12/+30
2013-08-29New filter/validation functions for GET/POST variablesGreg Roach1-8/+6
2013-08-27#1217404 - Merging records causes loss of namefisharebest1-1/+1
2013-08-24Update non-typographic quotation marksGreg Roach1-2/+2
2013-08-09Remove empty subversion Id tagsGreg Roach1-3/+1
2013-07-05Rollback some ideas about always returning gedcom records, even for invalid l...fisharebest1-2/+2
2013-07-04Continue refactoring - with admin_site_merge.phpfisharebest1-165/+125
2013-06-29(no commit message)fisharebest1-5/+4
2013-06-01Unreachable code...fisharebest1-3/+1
2013-02-09Use framework to add javascriptfisharebest1-7/+6
2013-02-06Previously, AJAX pages loaded their own copies of JS libraries (to work aroun...fisharebest1-2/+2
2013-02-05PHP 5.3 constructs in admin_site_merge.phpfisharebest1-2/+2
2013-02-05TIdy up some I18N textfisharebest1-9/+8
2013-01-20PHP5.2 / PHP5.3 issuesfisharebest1-2/+5
2013-01-19HTML5 validation - need to use the non-xhtml version of nl2br()fisharebest1-3/+3
2012-12-07Inline the function getXrefLink as it is only used in one place.fisharebest1-1/+7
2012-09-13Complete rewrite of the handling of lists of trees:fisharebest1-13/+11
2012-07-18Specify WT_STATIC_URL path for all JS files - otherwise they won't get picked...fisharebest1-1/+1
2012-06-16Defer loading of external javascript (and most inline javascript) to the bott...fisharebest1-4/+2
2012-03-31Replace 3rd party autocomplete library with native jQuery functionsfisharebest1-1/+1
2012-03-28Use autofocus attribute instead of JavaScriptfisharebest1-12/+6
2012-03-25Update text. Change "Find individual ID" to "Find an individual", etc.fisharebest1-6/+6
2012-03-24Replace $WT_IMAGES array of images with CSS.fisharebest1-12/+6
2012-02-29Use HTML5 markup instead of PrintReady(), hasRTLText(), utf8_direction(), etc...fisharebest1-2/+2
2012-02-13Provide better sizes for popup windows.fisharebest1-4/+4
2011-12-12HTML validation - use html5-style for self-closing tags, instead of xhtml-stylefisharebest1-16/+16
2011-11-19Remove classes .rtl and .lrt - these exist to correct the alignment when we a...fisharebest1-1/+1
2011-11-11Remove redundant/obsolete html attribute (border="0") as this is already set ...fisharebest1-3/+3
2011-11-11Use consistent style for <a href="#" onclick="foo();"> the various combinatio...fisharebest1-6/+6
2011-11-05Major MVC refactoring. Every page now has a controller.fisharebest1-3/+5
2011-05-28fix: Merge - clicking on the icons does not workŁukasz Wilenski1-85/+83
2011-04-02Small correction to 11262Nigel Osborne1-3/+3
2011-04-02Remove unnecessary table cell and adjust alignmentNigel Osborne1-7/+6
2011-02-12don't display select family tree option when only one existsŁukasz Wilenski1-17/+27
2011-01-25Tidy up <script type="text/javascript"> tags. fisharebest1-30/+26
2011-01-16Tiny style changeŁukasz Wilenski1-9/+15
2011-01-07Add missing admin functionsNigel Osborne1-0/+320