makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 05:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/includes
History
Nathan Guse 2469225a72 Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610 
# By Oleg Pudeyev (29) and others
# Via Andreas Fischer (3) and others
* 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits)
  [ticket/11262] Add .lock in cache directory to .gitignore
  [ticket/11265] Add assertions for board installation success.
  [ticket/11162] Reformat.
  [ticket/10491] Make recreate_database static.
  [ticket/11162] Rename tricky updates to database helper.
  [ticket/10491] Install board once per test run.
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users
  [ticket/11162] Use empty($queries).
  [ticket/11162] Review comments fixed.
  [ticket/11162] Reformat.
  [ticket/11162] Newlines to LF.
  [ticket/11162] Use correct functions.
  [ticket/11162] Account for notify_status.
  ...

Conflicts:
	phpBB/includes/mcp/mcp_topic.php
2012-12-13 20:46:25 -06:00
..
acm [ticket/11227] @return void -> @return null in develop-olympus. 2012-11-29 15:37:12 -05:00
acp [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2) [develop-olympus] 2012-11-09 23:22:02 +01:00
auth [ticket/10401] Return correct type when ldap_bind() fails in ldap_login(). 2012-05-22 03:32:54 +02:00
captcha [ticket/9892] Shorten the index names on the q&a captcha 2011-06-12 01:28:06 +02:00
db [ticket/10205] Reduce nesting in mysql drivers. 2012-12-04 21:33:13 -05:00
diff improve code to detect and solve conflicts for code removed from one version to another. 2009-09-20 16:20:20 +00:00
hooks - fixed database updater 2007-10-04 12:03:05 +00:00
mcp Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610 2012-12-13 20:46:25 -06:00
questionnaire [ticket/11227] @return void -> @return null in develop-olympus. 2012-11-29 15:37:12 -05:00
search [ticket/9551] uncomment line and change length to 255 2012-06-19 20:03:57 +05:30
ucp [ticket/10841] adding space after if 2012-12-05 12:07:37 -05:00
utf - replaced the drop down menu log filter thing with log searching 2009-08-21 21:47:19 +00:00
.htaccess [ticket/9698] Add .htaccess to the includes subdirectory. 2010-10-15 16:47:21 +02:00
auth.php [ticket/10252] Correctly document behaviour of acl_get_list() for a_ permission 2011-07-15 10:23:06 +02:00
bbcode.php [ticket/8937] Keep space characters in front of [code] bbcode content 2011-07-17 00:44:39 -04:00
cache.php [ticket/9933] Move word censor regex into separate function in functions.php 2011-01-07 15:32:34 +01:00
constants.php [develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus. 2012-05-31 22:07:34 +02:00
error_collector.php [ticket/10369] Rename filter_errfile() to filter_root_path(). 2011-09-18 22:32:25 +02:00
functions.php [ticket/11162] Move to a separate file to avoid blowing out functions.php. 2012-12-04 23:35:34 -05:00
functions_admin.php [ticket/11227] @return void -> @return null in develop-olympus. 2012-11-29 15:37:12 -05:00
functions_compress.php [ticket/7296] Exporting styles to tar creates corrupted archives. 2010-08-22 11:16:19 -04:00
functions_content.php [ticket/10240] Reverted a commit which added buggy code. 2011-08-21 13:16:50 +01:00
functions_convert.php [ticket/10407] Fix check for empty image paths in convertor 2012-01-02 13:09:21 -05:00
functions_database_helper.php [ticket/11162] Rename tricky updates to database helper. 2012-12-12 21:46:38 -05:00
functions_display.php Merge remote-tracking branch 'nickvergessen/ticket/10237' into develop-olympus 2011-11-11 22:07:11 +01:00
functions_install.php [task/functional] Fixed DEBUG_TEST related issues 2012-09-01 10:53:01 -04:00
functions_jabber.php Fix Jabber SASL PLAIN authentication failures. (Bug #52995) 2009-10-29 15:04:19 +00:00
functions_messenger.php [ticket/10602] Avoid a race condition. 2012-12-05 00:57:24 -05:00
functions_module.php [Change] Alllow applications to set custom module inclusion path (idea by HoL) 2008-11-23 12:42:34 +00:00
functions_posting.php Merge PR #624 branch 'nickvergessen/ticket/8743' into develop-olympus 2012-10-16 21:20:58 -04:00
functions_privmsgs.php [ticket/10950] Fix grammar in comments 2012-07-20 18:03:06 +02:00
functions_profile_fields.php [ticket/10965] Profile data is only grabbed when show_novalue is enabled 2012-07-23 23:35:48 +02:00
functions_template.php [ticket/10147] Corrected a typo in includes/functions_template.php. 2011-04-23 15:36:45 -04:00
functions_transfer.php [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class. 2011-08-11 23:15:25 +02:00
functions_upload.php [ticket/10908] Download files only up to max_upload_filesize if limit is 0 2012-05-29 14:27:25 +02:00
functions_user.php Merge branch 'ticket/10605' into develop-olympus 2012-05-14 00:38:54 +02:00
index.htm Add blank indexes to stop nosey people being, erm, nosey 2001-11-21 13:06:56 +00:00
message_parser.php [ticket/217] Silence errors in tests, not code. 2011-06-06 21:14:10 +08:00
session.php [ticket/10913] Redirect to index if session id is required but was not sent 2012-05-29 14:54:04 +02:00
startup.php [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4. 2012-03-15 22:47:42 -04:00
template.php [ticket/10145] Always recompile all templates when DEBUG_EXTRA is defined. 2011-04-26 12:35:44 +02:00