makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes
History
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
..
acp Merge pull request #1513 from nickvergessen/ticket/11582 2013-07-22 11:28:55 -07:00
captcha [ticket/11731] Remove static calls to captcha garbage collector 2013-07-22 15:04:30 -07:00
db [ticket/11825] Move schema_data.php into includes/ instead of phpbb/ 2013-09-03 19:44:07 +05:30
diff [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
hooks [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
mcp Merge branch 'develop-olympus' into develop 2013-08-15 01:40:08 +02:00
questionnaire Merge remote-tracking branch 'upstream/develop' into ticket/11015 2012-12-06 21:49:24 -05:00
ucp Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323 2013-09-05 13:56:57 -05:00
utf [ticket/10847] fixing all misspelled "dependant" to "dependent" 2012-04-30 21:55:24 +02:00
.htaccess [ticket/9698] Add .htaccess to the includes subdirectory. 2010-10-15 16:47:21 +02:00
bbcode.php [ticket/11628] Remove phpbb_style (move methods to phpbb_template) 2013-07-24 12:24:35 -05:00
constants.php Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323 2013-09-05 13:56:57 -05:00
functions.php [ticket/11215] Add commented-out URL rewrite capability to .htaccess 2013-09-02 09:43:41 -07:00
functions_acp.php [ticket/10999] Fix assets_version in ACP 2013-07-13 13:30:33 -04:00
functions_admin.php Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +02:00
functions_compatibility.php [feature/avatars] Use deprecated for compatibility function 2013-02-03 23:06:30 +01:00
functions_compress.php [ticket/11159] Static public is the currently approved order. 2012-11-06 16:43:48 -05:00
functions_container.php [ticket/11574] Fix more issues in the updater 2013-07-14 15:40:19 -04:00
functions_content.php Merge branch 'develop-olympus' into develop 2013-08-03 15:37:01 +02:00
functions_convert.php [feature/soft-delete] Lay the groundwork for a soft-delete feature 2012-08-29 17:49:37 +02:00
functions_database_helper.php [ticket/11162] Chase dbal autoloading changes in develop. 2012-12-13 21:27:30 -05:00
functions_display.php [ticket/9649] Display information on index for moderators on unapproved posts 2013-07-13 14:57:31 -04:00
functions_download.php Merge branch 'ticket/10820' into ticket/10820-develop 2013-06-14 00:32:23 +05:30
functions_install.php [ticket/11696] Rename db_tools.php so it can be autoloaded 2013-07-14 10:10:05 -04:00
functions_jabber.php Merge branch 'develop-olympus' into develop 2013-07-12 10:37:52 -05:00
functions_messenger.php [ticket/11628] Make get_template_vars protected 2013-07-24 13:38:12 -05:00
functions_module.php [ticket/11791] Load adm/ events from styles/adm/event/ 2013-09-02 15:51:20 -05:00
functions_posting.php Merge branch 'develop-olympus' into develop 2013-09-02 12:31:27 +02:00
functions_privmsgs.php [ticket/11640] removed the space that I wonder what it was doing there. 2013-07-29 16:55:58 +01:00
functions_profile_fields.php [ticket/11010] dealing with dimensions problem, removing extra code 2013-05-20 18:42:06 +02:00
functions_transfer.php [ticket/9916] Updating header license and removing Version $Id$ 2011-12-31 13:32:52 +00:00
functions_upload.php [ticket/10763] Use self when calling get_extension() in filespec class 2012-12-17 19:17:32 +01:00
functions_url_matcher.php [ticket/11335] (kernel request subscriber) Make php_ext 'php' not '.php' 2013-04-24 17:45:41 -05:00
functions_user.php Merge branch 'develop' of github.com:phpbb/phpbb3 into ticket/8323 2013-09-05 13:56:57 -05:00
index.htm
message_parser.php [ticket/11250] Move quote special cases from class to unit tests 2012-12-14 12:58:57 +01:00
sphinxapi.php [ticket/11248] Convert line endings to LF - develop edition. 2012-12-07 21:57:33 -05:00
startup.php [ticket/10893] Update the usage of Composer 2012-05-13 13:05:20 -04:00