makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes
History
Igor Wiedler f6865dc33a Merge remote-tracking branch 'upstream/develop' into ticket/11574 
* upstream/develop: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...

Conflicts:
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
2013-07-14 11:34:58 -04:00
..
acp [ticket/11696] Rename db_tools.php so it can be autoloaded 2013-07-14 10:10:05 -04:00
captcha [ticket/11696] Rename db_tools.php so it can be autoloaded 2013-07-14 10:10:05 -04:00
db [ticket/11696] Move file to new directory 2013-07-14 10:16:15 -04:00
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 [ticket/9657] Keep approval state of posts/topics when copying them 2013-07-13 00:54:39 -04:00
questionnaire Merge remote-tracking branch 'upstream/develop' into ticket/11015 2012-12-06 21:49:24 -05:00
ucp Merge remote-tracking branch 'phpbb/develop' into ticket/9657 2013-07-13 09:36:24 -04:00
utf [ticket/10847] fixing all misspelled "dependant" to "dependent" 2012-04-30 21:55:24 +02:00
.htaccess
bbcode.php [feature/twig] Fix BBCode parser 2013-07-02 11:29:32 -05:00
constants.php Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +02:00
functions.php Merge pull request #1541 from nickvergessen/ticket/11684 2013-07-13 10:38:24 -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 Merge remote-tracking branch 'upstream/develop' into ticket/11574 2013-07-14 11:34:58 -04:00
functions_content.php Merge PR #786 branch 'brunoais/ticket/10845' into develop 2012-11-06 16:23:33 -05: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 [feature/twig] Should have been else 2013-07-01 21:32:10 -05:00
functions_module.php [feature/twig] Spacing 2013-07-04 15:24:42 -05:00
functions_posting.php [ticket/9657] Use the service instead of the static class 2013-07-11 14:24:07 +02:00
functions_privmsgs.php [ticket/11103] Instantiate $phpbb_notifications as needed 2012-12-13 19:19:40 -06: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-olympus' into develop 2013-06-11 18:46:30 +02: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