summaryrefslogtreecommitdiff
path: root/admin_site_merge.php
AgeCommit message (Expand)AuthorFilesLines
2017-07-11Prepare to remove class FilterGreg Roach1-3/+3
2017-06-18Code styleGreg Roach1-1/+1
2017-06-18Modern browsers support RFC7231 - relative URLs in 30x responsesGreg Roach1-1/+1
2017-06-17jQuery-3, Bootstrap-4, FontAwesome-4.7, Select2-4, remove popup windowsGreg Roach1-83/+63
2017-03-222017Greg Roach1-1/+1
2016-12-26Code style - strict typingGreg Roach1-3/+3
2016-12-25Code style - single quotesGreg Roach1-1/+1
2016-12-23Code style - short array syntaxGreg Roach1-7/+7
2016-09-02Fix #1087 - upper/lower case XREFGreg Roach1-0/+4
2016-01-30Update copyright yearGreg Roach1-1/+1
2016-01-17Two spaces have no effect in HTMLGreg Roach1-2/+2
2015-12-31Fix #740 merging records with no facts in commonGreg Roach1-2/+2
2015-06-08PHPDocGreg Roach1-2/+1
2015-06-05Refactor includes/functions into classesGreg Roach1-14/+16
2015-05-31PSR-4Greg Roach1-0/+2
2015-05-30Code styleGreg Roach1-4/+4
2015-04-30Fix #570 - redirect after mergeGreg Roach1-1/+2
2015-04-06Wrong URLs in mergeGreg Roach1-3/+3
2015-04-06Merging records ignores common factsGreg Roach1-0/+3
2015-04-06Show link targets when merging recordsGreg Roach1-3/+18
2015-03-09Use Tree object instead of ID/nameGreg Roach1-11/+11
2015-02-06GlobalsGreg Roach1-1/+1
2015-02-05GlobalsGreg Roach1-0/+1
2015-02-05Add API to access the parent tree of a recordGreg Roach1-1/+1
2015-02-05Namespaces should consist of both vendor and packageGreg Roach1-1/+1
2015-02-04PHPDoc for globalsGreg Roach1-0/+6
2015-02-02Refactor classes to use namespaces, as per PSR-4. Replace GPL2 with GPL3.Greg Roach1-71/+61
2015-01-31#1416744 - Family tree titles on RTL/LTR pagesGreg Roach1-1/+1
2015-01-31Combine WT_SERVER_NAME and WT_SCRIPT_PATH into WT_BASE_URLGreg Roach1-1/+1
2015-01-31Too many/few argumentsGreg Roach1-12/+12
2015-01-31AutocompleteGreg Roach1-2/+2
2015-01-31ResponsiveGreg Roach1-2/+2
2015-01-31Fix: #137712 - Refreshing page during merge causes error.Greg Roach1-237/+321
2015-01-26HTML validation and tidy upGreg Roach1-0/+2
2015-01-24Add visual feedback for privacy settingsGreg Roach1-1/+1
2015-01-19HTML5Greg Roach1-4/+4
2015-01-19HTML5Greg Roach1-6/+6
2015-01-18Scrutinizer Auto-FixesScrutinizer Auto-Fixer1-40/+40
2015-01-17New theme system and admin interfaceGreg Roach1-3/+3
2014-11-08PHPDocGreg Roach1-1/+1
2014-10-22Better description of variable namesGreg Roach1-3/+3
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