Nils Adermann 0a4efcbe8c Merge branch 'develop-olympus' into develop ...

* develop-olympus:
  [ticket/9956] Display error message if no disapprove reason given

Conflicts:
	phpBB/includes/mcp/mcp_queue.php

2011-11-18 19:42:44 +01:00

..

adm

Merge branch 'develop-olympus' into develop

2011-11-15 16:46:23 +01:00

assets/javascript

[ticket/10155] Update to jQuery 1.6.2

2011-07-12 10:24:20 +02:00

cache

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

develop

Merge branch 'develop-olympus' into develop

2011-10-16 20:16:25 +02:00

docs

Merge branch 'develop-olympus' into develop

2011-10-29 12:22:17 +02:00

download

[ticket/10359] Fix phpbb_request regression in download/file.php

2011-09-08 22:37:19 +02:00

files

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

images

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

includes

Merge branch 'develop-olympus' into develop

2011-11-18 19:42:44 +01:00

install

Merge branch 'develop-olympus' into develop

2011-11-18 19:32:44 +01:00

language

Merge branch 'develop-olympus' into develop

2011-11-17 12:46:00 -05:00

store

Copy 3.0.x branch to trunk

2009-10-04 18:14:59 +00:00

styles

Merge branch 'develop-olympus' into develop

2011-11-18 19:42:44 +01:00

.htaccess

[Feature] Ability to use HTTP authentication in ATOM feeds by passing the GET parameter auth=http

2010-01-19 19:08:51 +00:00

common.php

[ticket/10412] Replace memory_get_usage with memory_get_peak_usage

2011-10-14 02:02:17 +02:00

cron.php

[ticket/10046] Remove register_shutdown_function() in cron.php from develop.

2011-03-12 15:07:31 +01:00

faq.php

[ticket/9556] Drop php closing tags, add trailing newline

2010-11-11 19:10:55 +01:00

feed.php

[feature/remove-imagesets] Adjustments to php files

2011-09-04 01:08:00 +03:00

index.php

Merge branch 'develop-olympus' into develop

2011-08-30 01:41:41 +02:00

mcp.php

[ticket/9684] Remove code for global announcement in root-files

2011-04-07 13:45:44 +02:00

memberlist.php

[ticket/10410] Add option to display users in their first teampage group

2011-10-28 22:55:26 +02:00

posting.php

[ticket/9608] Remove use of references in captcha and other places

2011-07-13 11:32:38 +02:00

report.php

Merge branch 'develop-olympus' into develop

2011-07-16 22:28:55 -04:00

search.php

[feature/remove-imagesets] Adjustments to php files

2011-09-04 01:08:00 +03:00

ucp.php

Merge branch 'develop-olympus' into develop

2011-11-13 20:34:53 +01:00

viewforum.php

Merge branch 'develop-olympus' into develop

2011-11-13 15:35:27 +01:00

viewonline.php

[ticket/10290] Fixed malformed SQL query in viewonline.php

2011-08-04 23:16:23 -04:00

viewtopic.php

Merge branch 'develop-olympus' into develop

2011-11-11 22:17:12 +01:00

web.config

[ticket/10219] Remove invalid and invisible character from web.config.

2011-06-14 23:18:33 +02:00