History | View | Annotate | Download (18.4 kB)
commit adfa1656fb9d8b5bb601af1d7a6720884954d87aMerge: bd579c8 af5b9a9Author: Nils Adermann <naderman@naderman.de>Date: Mon Dec 13 16:35:55 2010 +0100
Merge branch 'ticket/igorw/9556' into develop
Copy 3.0.x branch to trunk
XHTML mistakes in the updater. #46585
TortoiseMerge seems to mess up the newlines... very very annoying bug.
- Allow download of conflicting file for later reference in automatic updater- Default difference view is now 'inline' instead of 'side by side'- Added new option for merging differences to conflicting files in automatic updater
update diff engine to Text_Diff 1.1.0
More 5.3 compatibility.
some diff engine updates (only minor, but will hopefully not break anything)
Hiding everywhere little buggers, eh?
One commit for those fixes having a very tiny impact (mostly only whitespaces or forgotten spans, etc.)Although i somehow mistakingly got #20445 and #15249 into it. :/
Removing s_watching_img from watch_topic_forum() function (Bug #20445)Changing order for post review if more than one post affected (Bug #15249)...
This commit was manufactured by cvs2svn to create branch 'phpBB-3_0_0'.
dumdidum... sorry. ;)
- two new packages... diff and utf- only 60 chars for topic title if new post (please see changelog for explanation)- change utf8_wordwrap (had some bugs david and nils spotted - was not really functional, sorry for this. :D)
forgot that one ...
First bunch of changes for #5712
fix
updates for the updater and the diff engine.- this update also includes an important change for including the diff engine, since we may need to include an updated engine before updating. This basically means that for a future update (B4 to another version) requires copying the new diff files first... the new include method should prevent this needed handwork for later versions then.
adjust some comments to work with phpdocumentor. :)
Thanks to the GPL we are able to use the pear package text_diff - now splitted into the diff classes, the renderer and the engine