makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
phpbb/phpBB/develop
History
Joas Schilling bdb7ec0ceb Merge remote-tracking branch 'phpbb/develop' into feature/softdelete-1-permission 
* phpbb/develop: (704 commits)
  [ticket/11630] Improvements to the PHP lint pre-commit hook
  [feature/auth-refactor] Move auth providers to separate directory
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file().
  [ticket/11617] Remove spaces and tabs from empty lines
  [ticket/11617] Missing U_ACTION in acp_captcha.php
  [feature/auth-refactor] Fix code style issue
  [feature/auth-refactor] Fix comment grammar
  [feature/auth-refactor] Fix the actual cause of test failures
  [ticket/10838] Fix URL for wiki and remove irrelevant line
  [ticket/10838] Remove php 5.4 and builtin server references
  [ticket/10838] Fix missing data
  [ticket/10838] separate database used mentioned in unit tests
  [ticket/11585] Make $auth_admin class property
  [feature/auth-refactor] A possible fix for the functional test failures
  [ticket/11566] Subsilver template error displayed after table headers
  [ticket/11566] Remove extra pair of brackets from conditional statement
  [ticket/11566] Check that guest doesn't have reporting permission by default
  [ticket/11566] Add captcha to report post template in subsilver
  [ticket/11566] Use the new constant CONFIRM_REPORT for captcha init
  ...

Conflicts:
	phpBB/docs/sphinx.sample.conf
	phpBB/feed.php
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
2013-07-11 11:41:48 +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/11201] Revert WLM dropping because it is still used in China. 2013-02-04 01:31:43 +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 'phpbb/develop' into feature/softdelete-1-permission 2013-07-11 11:41:48 +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 [feature/soft-delete] Update development scripts with new column names 2012-08-30 22:54:24 +02: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 [feature/soft-delete] Fix the rest of *_approved and the delete_post unit test 2012-11-10 11:24:52 +01:00
mysql_upgrader.php [ticket/11201] Revert WLM dropping because it is still used in China. 2013-02-04 01:31:43 +01: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