History | View | Annotate | Download (52.9 kB)
commit a3673789402eae83b94860c87747091125701f78Merge: 30dacf8 f115795Author: Andreas Fischer <bantu@phpbb.com>Date: Wed Jan 12 01:49:44 2011 +0100
Merge branch 'task/naderman/config-class' into develop
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
commit 2e51e68ca145940462155d5164bf91bb4264d488Merge: 19155c7 7b4cdc9Author: Nils Adermann <naderman@naderman.de>Date: Wed Nov 10 19:02:35 2010 +0100
Merge branch 'develop-olympus' into develop
commit a885095897054c91ab68b753ce2a86ae74f2f666Merge: 9a39f55 c2ffa78Author: Igor Wiedler <igor@wiedler.ch>Date: Sun Oct 10 18:39:44 2010 +0200
Merge branch 'feature/igorw/request-class' into develop
commit 2e787fa836dbfdcec7864b5f143520aec3752bd0Merge: 999f6db 9731f24Author: Nils Adermann <naderman@naderman.de>Date: Sat Aug 21 23:35:43 2010 +0200
commit 591217a903460a81df4c19850f5d99c2e9d10b1dMerge: cf89952 0bf2c3eAuthor: Nils Adermann <naderman@naderman.de>Date: Sun May 16 19:52:36 2010 +0200
commit 693a2dc99bf07aeac1865d4a48ddf2589317ac7aMerge: b68de23 ac32927Author: Nils Adermann <naderman@naderman.de>AuthorDate: Wed Mar 3 23:32:09 2010 +0100Commit: Nils Adermann <naderman@naderman.de>CommitDate: Wed Mar 3 23:32:09 2010 +0100
Merge branch 'develop-olympus' into develop...
merge changes from 3.0.x branch
Copy 3.0.x branch to trunk
if preserve_cr is true and the file generated no conflict but is obviously not "empty" we tag it as modified because preserve_cr is the default mode for showing modifications (else the user gets a resolvable conflict and may wonder why ;))
Ok, after 20+ hours i think i fixed all grave issues with the updater- smaller memory footprint- better checks for already updated files- even less conflicts- fixed automatic conflict resolving after successful merges- no more conflicts for $Id$ changes...
Bugs #15809, #49215 - Allow updater to work correctly with PHP filename extensions other than .php.Related revisions: r9935, r9936
Bug #49215 again.
Fix bug #49215 - Use $phpEx variable instead of hardcoded '.php'
Fix bugs #46615 & #46945 - Fail gracefully if store folder is not writable during update.
late fix for #45335 (incorrect log message for update if using old updater)late fix committed because change does not effect update files or patch
slight change for 3.0.5 for updating.- only return auth options having 2 or more columns (does not change the outcome, the script works fine)- purge the theme after a successful update the easy way to let style.php do the job
- adjust db_tools again to not remove any schema (they may be required)- fill dbms version if not yet filled
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
Help the user if FTP update fails.
PHP 5.3 compatibility.
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'.
seems like there is an error within the udpater, skipping the first file changed. This is not good(tm). For Gold, we will provide update packages for going from RC7 -> gold and RC8 -> gold.
lets start thinking about the future
erm... i am very very sorry... but i think this one is responsible for the loops people still experience. :o
ok, fought #14735 with the help from paul.
more fixes...
automatic updater supporting batch-processing diff
deregister globals to install too
it has been decided amongst the team that using glob() is bad practice, after determining the overall usage among projects as well as the security history of the function.
a bunch of fixes
allow what is stated within the changelog...
basically what is listed within the changelog. ;)
more failsafe "glob()" method.
#13207
#13149
- do not include if there are no files fetched with glob()- allow options for merged files on update (merge, new file, old file)
changes...
some fixes... most importantly the ability to update the board with the automatic files while having fsockopen disabled (instead, the update file information will be used, which may be inaccurate if the admin did a mistake).
fixing bugs within the updater...
a tiny fix
ok, mess around with the templates + fixing some bugs + adjusting headers for those files already modified to circumvent conflicts for those having their editor set to remove trailing spaces (not recommended!)
- bracket in wrong place there [Bug #11122]
so some version_compare magic. :o
label changes, language fixes...
some language-specific adjustementsfix prune users (adding the list of users to the confirmation page)tried to fix the show/hide trigger in ACP by not using width: auto; (which gets somehow inherited to each other element)
some fixes...
ahhh, there are you. I can see a new haircut... looks good.
some fixes... hopefully not breaking something. :o
- improvements to search indexing performance, espacially tidy() by adding a word_count column, the database update from b5 to next version will take quite a while on bigger databases, I also lowered the default common word threshold from 20 to 5 percent, big boards might want to use 3 or 2 percent, 20 was way too high...
apply correct check for hiding session
safer name for the updater downloads (even if removed after download) - reported by SHS`
- forgot a few places :P
First bunch of changes for #5712
some important changes to let the update work. ;)
fixing some bugs, most being submitted grammatical/spelling errors.
implemented updater changes
- re-add script_path for "strange configurations" to let them force the generated urls correctly- show rank title if no rank image present in memberlist- other fixes.
some updater changes as well as tiny bugfixes
some tiny bugfixes.
- a bunch of fixes- added todos to the updater to make sure i do not forget. :)
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.
begin working on getting this thing a bit faster. I need to finish the other calls, this commit actually will break the diff engine and the updater. The speed increase noticed is from 89 seconds to 22 seconds as well as saving a lot of memory.
fix for bug #5676 - of course the "delete install folder" notice should not occur if directly within installation.
- fixed bug within the user_add function- fixed some updater bugs
some tiny changes
rather large update, most important things done:- implemented provided patch/diff file for bug #5350 (Highway of Life) with some tiny changes and alterations- more username/colour changes/fixes- added a note about PM rule-dependant message removals so the user is not wondering too much if he can't remember his rules. :)...
- fixed some bugs- changed attachment handling a bit- tried to remove target tags out of the code- do not add session ids to urls for bots as well as not creating a new session on each page view for them
I bet i introduced some bugs too. ;)
Next phase of last post changes + a few minor bugs
Note: This template variable is available but will not be used by default
the file updater. This is in CVS but the file is not able to be used without the correct update packages - no need to try.Please note that even if the file is now in CVS it does not mean we provide an update path from Beta2 to any other version.
