makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-12 06:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/develop
History
Igor Wiedler 1b3cb68c2f Merge remote-tracking branch 'upstream/develop' into feature/avatars 
* upstream/develop: (255 commits)
  [ticket/10935] Limit number of PM rules per user to 5000
  [ticket/10801] Fixed quickmod tools.
  [ticket/9551] uncomment line and change length to 255
  [ticket/10925] Clarify installation requirements for SQLite
  [ticket/10938] Serve subforum listing on forumlist from template loop
  [ticket/10640] Change subject length in mcp in subsilver
  [ticket/10640] Change subject length in MCP
  [ticket/10640] Do not change default value of truncate_string()
  [ticket/10640] Change maximum subject length
  [ticket/10936] remove PCRE and mbstring support check
  [ticket/10936] fix language key
  [ticket/10829] Delete T_STYLESHEET_NAME - no longer used.
  [ticket/10829] $style_name -> $style_path in style class.
  [ticket/10743] Renaming user->theme
  [ticket/10743] Changing obtain_cfg_items
  [ticket/10882] Fix test name - oops.
  [ticket/10931] Apply strtolower() correctly, i.e. not on false.
  [ticket/10931] Also test get_bytes() and get_string() with false.
  [ticket/10931] Make to_numeric function globally available.
  [ticket/10932] Use included composer.phar in build process
  ...

Conflicts:
	phpBB/includes/mcp/mcp_warn.php
	phpBB/install/database_update.php
	phpBB/styles/prosilver/template/ucp_avatar_options.html
2012-06-27 14:47:13 +02:00
..
add_permissions.php Merge PR #799 branch 'develop-olympus' into develop 2012-05-10 14:43:14 -04:00
adjust_avatars.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_bbcodes.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_magic_urls.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_sizes.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_smilies.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_uids.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
adjust_usernames.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
benchmark.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
calc_email_hash.php Merge PR #799 branch 'develop-olympus' into develop 2012-05-10 14:43:14 -04:00
change_smiley_ref.php Merge PR #799 branch 'develop-olympus' into develop 2012-05-10 14:43:14 -04:00
check_flash_bbcodes.php [ticket/10881] Replace old (and unify) file headers in develop files. 2012-05-10 11:53:54 +02:00
collect_cache_stats.sh Copy 3.0.x branch to trunk 2009-10-04 18:14:59 +00:00
compile_template.php [ticket/10500] Fix phpbb_template_compile instantiation. 2011-12-03 21:15:29 -05:00
create_schema_files.php Merge remote-tracking branch 'upstream/develop' into feature/avatars 2012-06-27 14:47:13 +02:00
create_search_index.php Merge branch 'develop-olympus' into develop 2012-03-19 12:55:37 +01:00
create_variable_overview.php Merge PR #799 branch 'develop-olympus' into develop 2012-05-10 14:43:14 -04:00
extensions.php [ticket/10703] Added a condition to check if ext directory exists 2012-03-23 00:27:29 +05:30
fill.php Merge PR #799 branch 'develop-olympus' into develop 2012-05-10 14:43:14 -04:00
fix_files.sh exclude the image file with text in the name from having newlines fixed 2010-03-05 22:22:39 +01:00
generate_utf_casefold.php Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
generate_utf_confusables.php Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
generate_utf_tables.php Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00
imageset_to_css.php Merge remote-tracking branch 'cyberalien/ticket/10378' into develop 2012-02-17 14:08:03 +01:00
lang_duplicates.php [ticket/9916] Updating header license and removing Version $Id$ 2012-01-02 19:10:27 +01:00
merge_attachment_tables.php Merge PR #799 branch 'develop-olympus' into develop 2012-05-10 14:43:14 -04:00
merge_post_tables.php Merge PR #799 branch 'develop-olympus' into develop 2012-05-10 14:43:14 -04:00
mysql_upgrader.php Merge PR #799 branch 'develop-olympus' into develop 2012-05-10 14:43:14 -04:00
nuke-db.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
regex.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
remove-php-end-tags.py [ticket/9916] Updating header license and removing Version $Id$ 2012-01-02 19:10:27 +01:00
repair_bots.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
search_fill.php [ticket/10637] Leftovers from implementation of extensions in develop tools 2012-02-09 22:22:32 +02:00
set_permissions.sh [task/set-permissions] shell script to set file permissions 2010-06-28 18:12:56 +02:00
unicode_testing.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
update_email_hash.php [ticket/9556] Drop php closing tags, add trailing newline 2010-11-11 19:10:55 +01:00
utf_normalizer_test.php Merge branch 'develop-olympus' into develop 2012-01-02 17:36:21 +01:00