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/develop
History
Joas Schilling b4db972840 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/10411-2 
* 'develop' of https://github.com/phpbb/phpbb3: (204 commits)
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
  [ticket/11247] Fix wrong property reference in flock class.
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
  [ticket/10716] Collect standard error from executed php process.
  [ticket/10716] Skip test if php is not in PATH.
  [ticket/10716] Exclude our dependencies from linting.
  [ticket/10103] New and improved wording.
  [ticket/10716] Only lint on php 5.3+.
  [ticket/10103] Assert with messages.
  [ticket/10103] assertLessThan/assertGreaterThan.
  [ticket/10103] Inline assignment is bad?
  [ticket/10103] $rv had too few characters.
  [ticket/10103] Correct flock class documentation.
  ...

Conflicts:
	phpBB/config/services.yml
	phpBB/includes/groupposition/legend.php
2012-12-06 14:26:14 +01: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 [ticket/10411] Update schema and fix database update 2012-11-14 02:01:16 +01: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-11-29 23:17:58 +01:00
generate_utf_confusables.php Merge branch 'develop-olympus' into develop 2012-11-29 23:17:58 +01:00
generate_utf_tables.php Merge branch 'develop-olympus' into develop 2012-11-29 23:17:58 +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 [feature/new-tz-handling] Remove appearances of board_dst and user_dst 2012-06-18 15:08:46 +02: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 [feature/new-tz-handling] Remove appearances of board_dst and user_dst 2012-06-18 15:08:46 +02:00
search_fill.php [ticket/11052] update search backend constructor everywhere 2012-08-15 22:05:26 +05:30
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-11-29 23:17:58 +01:00