dépôts / lhc / web / wiklou.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 4b069cd) | patch
Implement action=mergehistory
authorGeoffrey Mon <geofbot@gmail.com>
Wed, 30 Dec 2015 04:53:34 +0000 (23:53 -0500)
committerGeoffrey Mon <geofbot@gmail.com>
Sat, 6 Feb 2016 15:39:27 +0000 (10:39 -0500)
commite74f36ebe0d7e945da481101e3a99f0f2bb12637
treecfa68af9bcc0b9e05f704fb26cb73a257c1a5da7tree | snapshot
parent4b069cd1b88877fbb253af8780e358d96ba2587ccommit | diff
Implement action=mergehistory

* New class ApiMergeHistory handles action=mergehistory
* Merge History functionality moved from SpecialMergeHistory to
  MergeHistory
* SpecialMergeHistory now uses MergeHistory for actual merging
* Unit tests and i18n messages for above

Bug: T69742
Change-Id: Ic5078307dae78a2b3687e34a5d0a584988d483a1
autoload.php diff | blob | history
includes/MergeHistory.php [new file with mode: 0644] blob
includes/api/ApiMain.php diff | blob | history
includes/api/ApiMergeHistory.php [new file with mode: 0644] blob
includes/api/i18n/en.json diff | blob | history
includes/api/i18n/qqq.json diff | blob | history
includes/specials/SpecialMergeHistory.php diff | blob | history
languages/i18n/en.json diff | blob | history
languages/i18n/qqq.json diff | blob | history
tests/phpunit/includes/MergeHistoryTest.php [new file with mode: 0644] blob
Wiklou, le Wiki du Wiklou