Meik Sievertsen 97be42d31c improve code to detect and solve conflicts for code removed from one version to another. ...

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10168 89ea8834-ac86-4346-8a33-228a782c2dd0

2009-09-20 16:20:20 +00:00

..

adm

correctly display diff for conflicts

2009-09-17 08:13:28 +00:00

cache

…

develop

Revert r10106 - Index usage is very unlikely because of WHERE IN (). :-|

2009-09-04 17:27:13 +00:00

docs

phpBB updater now solves common conflicts on it's own. This further reduces the chance of conflicts.

2009-09-17 14:18:57 +00:00

download

Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)

2009-08-01 12:28:50 +00:00

files

…

images

…

includes

improve code to detect and solve conflicts for code removed from one version to another.

2009-09-20 16:20:20 +00:00

install

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 ;))

2009-09-20 16:18:41 +00:00

language

Bug #51385 - regression from r9252 - only spelling fix

2009-09-16 13:02:13 +00:00

store

…

styles

Correctly display underlined links placed in last line in viewtopic. (Bug #14811 - Patch by primehalo)

2009-09-10 13:56:11 +00:00

.htaccess

…

common.php

…

config.php

fail <3 r9769

2009-07-17 13:23:09 +00:00

cron.php

…

faq.php

populate who is online only where required

2009-08-12 10:30:37 +00:00

feed.php

ok, i am very sorry, but this needs to be fixed.

2009-08-12 15:00:47 +00:00

index.php

fix r9604

2009-06-18 11:04:54 +00:00

mcp.php

fix mcp sorting for pm_reports, and some minor language changes

2009-07-22 13:33:54 +00:00

memberlist.php

Fix Bug #50475 - Only show "Add friend" and "Add foe" links if the specific module is enabled.

2009-08-30 11:56:15 +00:00

posting.php

although we do not use force_approved_state check it nevertheless for the message displayed to the user - bug #51325

2009-09-20 12:32:27 +00:00

report.php

use existing language key for "private message not found"

2009-09-19 10:46:19 +00:00

search.php

Rename get_unread_topics_list() to get_unread_topics().

2009-09-08 08:53:01 +00:00

style.php

Fix style recompilation now we do not force the SID to be passed anymore. This also fixes the problems users see after updates, where styles are not always instantly updated, as well as helping style authors a lot. ;)

2009-08-25 12:19:57 +00:00

ucp.php

We only remove board cookies (this is what the feature is supposed to do). This also solves issues with headers having > 20 Set-Cookie calls (which in turn breaks varnish 2.0.4-rc1 too)

2009-09-03 09:25:16 +00:00

viewforum.php

Simplified login_box() and redirection after login. S_LOGIN_ACTION can now be used on every page. (Bug #50285)

2009-08-30 17:13:28 +00:00

viewonline.php

Fix bug #46215 - Adjust viewonline filename regular expression to be less strict.

2009-06-09 15:52:03 +00:00

viewtopic.php

Fix Bug #51375 - Do not show QR in closed topics/forums

2009-09-18 14:28:45 +00:00