phpbb/phpBB
Nils Adermann addf81f62e Merge branch 'develop' into feature/extension-manager
* develop: (93 commits)
  [ticket/10157] Add notification to update cpfs when installing a language.
  [ticket/10185] Always set board startdate on conversion
  [ticket/10419] Reword the language strings
  [ticket/9361] View correct error messages when editing account information
  [ticket/10457] Undefined variable $request, when print-viewing PMs
  [ticket/10452] Fix xHTML errors when print-viewing PMs
  [ticket/9066] Move regex into get_preg_expression function and add tests
  [ticket/10254] Add "phpBB Group" to "Modified by" in prosilver stylesheet.css
  [ticket/10254] Removing the subsilver2 NOTE, incompatible with phpBB.com.
  [ticket/10254] Removing the NOTE as it is incompatible with phpBB.com.
  [ticket/10254] Remove subsilver2 as default style on theme.
  [ticket/10254] Remove style names from themes and fix some informations on it.
  [ticket/7138] Allow simple header and footer for trigger_error() messages
  [ticket/9066] Disallow some database prefix to prevent same errors and problems
  [ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
  [ticket/10437] Do not display announcements that are waiting for approval
  [ticket/10087] Organize bans in acp_baninto optgroups
  [ticket/8616] Include old U_INBOX var for BC
  [ticket/10435] Remove global announcement from forums total topic count
  [ticket/10435] Readd local announcements to total topic count in viewforum
  ...

Conflicts:
	phpBB/install/database_update.php
2011-11-18 19:14:06 +01:00
..
adm Merge branch 'develop' into feature/extension-manager 2011-11-18 19:14:06 +01:00
assets/javascript [ticket/10155] Update to jQuery 1.6.2 2011-07-12 10:24:20 +02:00
cache [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
develop Merge branch 'develop' into feature/extension-manager 2011-11-18 19:14:06 +01:00
docs Merge branch 'develop-olympus' into develop 2011-10-29 12:22:17 +02:00
download [feature/extension-manager] The class loader no longer knows about extensions 2011-09-29 15:42:46 +02: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' into feature/extension-manager 2011-11-18 19:14:06 +01:00
install Merge branch 'develop' into feature/extension-manager 2011-11-18 19:14:06 +01:00
language Merge branch 'develop-olympus' into develop 2011-11-17 12:46:00 -05:00
store [ticket/9520] Removed per directory web.config files. 2010-05-03 19:31:40 +02:00
styles Merge branch 'develop-olympus' into develop 2011-11-14 22:01:36 +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 Merge branch 'develop' into feature/extension-manager 2011-11-18 19:14:06 +01:00
cron.php [feature/extension-manager] Refactoring the structure of extension provider 2011-09-29 16:15:53 +02: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/extension-manager] Make search backends loadable from extensions 2011-09-29 15:42:40 +02: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