makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 20:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB
History
Andreas Fischer c6075003a3 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [develop-olympus] Changelog: Changes since 3.0.8
  [develop-olympus] Bumping version number for 3.0.9-RC1.
  [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/convertors/convert_phpbb20.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
	phpBB/styles/prosilver/imageset/imageset.cfg
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/prosilver/template/template.cfg
	phpBB/styles/prosilver/theme/theme.cfg
	phpBB/styles/subsilver2/imageset/imageset.cfg
	phpBB/styles/subsilver2/style.cfg
	phpBB/styles/subsilver2/template/template.cfg
	phpBB/styles/subsilver2/theme/theme.cfg
2011-06-12 22:27:29 +02:00
..
adm Merge remote-tracking branch 'naderman/ticket/10198' into develop-olympus 2011-06-10 01:23:17 +02:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
develop Merge branch 'develop-olympus' into develop 2011-06-12 19:27:01 +02:00
docs Merge branch 'develop-olympus' into develop 2011-06-12 22:27:29 +02:00
download Merge branch 'develop-olympus' into develop 2011-05-10 23:46:24 -04:00
files [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
images [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
includes Merge branch 'develop-olympus' into develop 2011-06-12 19:27:01 +02:00
install [develop-olympus] Bumping version number for 3.0.9-RC1. 2011-06-12 19:45:01 +02:00
language Merge branch 'develop-olympus' into develop 2011-06-12 19:42:55 +02:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles [develop-olympus] Bumping version number for 3.0.9-RC1 and 3.0.9 releases. 2011-06-12 19:45:01 +02: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 Merge branch 'develop-olympus' into develop 2011-06-03 12:54:37 +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 [ticket/9684] Remove code for global announcement in root-files 2011-04-07 13:45:44 +02:00
index.php [ticket/10173] Use correct variable, checking for $birthday_year was correct. 2011-05-11 11:21:37 +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/9684] Remove code in some more files especially includes/ 2011-04-07 13:47:06 +02:00
posting.php Merge branch 'develop-olympus' into develop 2011-06-10 00:26:41 +02:00
report.php [ticket/9684] Remove code for global announcement in root-files 2011-04-07 13:45:44 +02:00
search.php [ticket/9684] Fix Forum/Topic-Tracking for global announcements 2011-04-07 13:47:08 +02:00
style.php Merge branch 'develop-olympus' into develop 2011-05-10 23:46:24 -04:00
ucp.php Merge branch 'develop-olympus' into develop 2011-05-13 01:29:57 +02:00
viewforum.php Merge branch 'develop-olympus' into develop 2011-06-09 21:59:52 +02:00
viewonline.php [ticket/9549] Enhance teampage and legend functionality 2011-02-16 18:21:49 +01:00
viewtopic.php Merge branch 'develop-olympus' into develop 2011-06-09 21:59:52 +02:00
web.config [ticket/9520] Additionally filter requests for {common,config}.php 2010-05-03 19:32:29 +02:00