phpbb/phpBB
Nathan Guse e8ab8fe0bc Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323
# By Joas Schilling (613) and others
# Via Andreas Fischer (214) and others
* 'develop' of github.com:phpbb/phpbb3: (2494 commits)
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [ticket/11791] Load adm/ events from styles/adm/event/
  [ticket/11215] Fix helper_url_test.php tests
  [ticket/11215] Add newline back to .htaccess, fix wording
  [ticket/11215] Update comment in .htaccess
  [ticket/11215] Uncomment rewrite rules in .htaccess
  [ticket/11215] Make controller helper url() method use correct format
  [ticket/11215] Add commented-out URL rewrite capability to .htaccess
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11215] Use new URL structure for controllers
  [ticket/11215] Everything appears to be working...
  ...

Conflicts:
	phpBB/includes/functions_privmsgs.php
2013-09-05 13:56:57 -05:00
..
adm [ticket/11791] Load adm/ events from styles/adm/event/ 2013-09-02 15:51:20 -05:00
assets/javascript Merge remote-tracking branch 'remotes/cyberalien/feature/editor-code-tabs' into develop 2013-06-06 14:07:27 -05:00
cache
config [ticket/11215] Make controller helper url() method use correct format 2013-09-02 10:54:55 -07:00
develop [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ 2013-09-03 19:44:07 +05:30
docs Merge pull request #1618 from VSEphpbb/ticket/11747 2013-09-05 11:36:25 -07:00
download [ticket/11802] replace $browser with $user->browser 2013-08-20 04:14:20 +05:30
files
images
includes Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323 2013-09-05 13:56:57 -05:00
install Merge branch 'prep-release-3.0.12' into develop-olympus 2013-09-05 00:37:40 +02:00
language Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323 2013-09-05 13:56:57 -05:00
phpbb [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ 2013-09-03 19:44:07 +05:30
store
styles Merge pull request #1618 from VSEphpbb/ticket/11747 2013-09-05 11:36:25 -07:00
.htaccess [ticket/11215] Remove unnecessary comment 2013-09-02 15:34:14 -07:00
app.php [ticket/11215] Correct paths when path info is used for controller access 2013-07-06 23:20:21 -04:00
common.php Merge branch 'develop' into ticket/11215 2013-08-31 13:37:11 -07:00
composer.json [ticket/11818] Update Symfony dependencies to 2.3.* 2013-09-02 16:23:05 -05:00
composer.lock [ticket/11818] Update Symfony dependencies to 2.3.* 2013-09-02 16:23:05 -05:00
cron.php
faq.php
feed.php [ticket/11481] Move prepended slash from calls into function 2013-06-06 20:35:38 +02:00
index.php
mcp.php [ticket/9657] Use the service instead of the static class 2013-07-11 14:24:07 +02:00
memberlist.php Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323 2013-09-05 13:56:57 -05:00
posting.php Merge branch 'develop-olympus' into develop 2013-09-02 12:31:27 +02:00
report.php [ticket/11763] Add missing variable when reporting a PM to avoid SQL Error 2013-08-03 17:30:28 +02:00
search.php [ticket/11749] Move event after all template data has been defined 2013-07-29 00:05:31 -07:00
ucp.php [ticket/11685] Remove logout confirmation page 2013-07-13 12:27:00 -04:00
viewforum.php [ticket/11749] PHP Events for viewforum.php 2013-07-27 10:45:40 -07:00
viewonline.php
viewtopic.php Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323 2013-09-05 13:56:57 -05:00
web.config