|  | Commit message (Collapse) | Author | Age | Files | Lines | 
|---|
| ... |  | 
| | 
| 
| 
| | PHPBB3-12594 | 
| | 
| 
| 
| | PHPBB3-12594 | 
| | 
| 
| 
| | PHPBB3-12510 | 
| |\  
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | 
| | | develop-ascraeus
* github-prototech/ticket/11508:
  [ticket/11508] Fix build_url test.
  [ticket/11508] Add functional test for jumpbox.
  [ticket/11508] Use $phpbb_path_helper.
  [ticket/11508] Allow equal sign in parameter value.
  [ticket/11508] Remove unnecessary implode.
  [ticket/11508] Remove unnecessary isset check.
  [ticket/11508] Fix build_url test.
  [ticket/11508] Curly brace should be on its own line...
  [ticket/11508] The question mark is expected even if there are no parameters.
  [ticket/11508] Add tests.
  [ticket/11508] Do not add the '?' unless there are parameters.
  [ticket/11508] Change separator parameter to a simple true|false $is_amp.
  [ticket/11508] Move helper functions to path_helper class.
  [ticket/11508] Move the stripping param code to separate function as well.
  [ticket/11508] Build the jumpbox hidden fields using the _form action_
  [ticket/11508] Split parts of build_url() into reusable functions. | 
| | | 
| | 
| | 
| | | PHPBB3-11508 | 
| | | 
| | 
| | 
| | | PHPBB3-11508 | 
| | | 
| | 
| | 
| | | PHPBB3-11508 | 
| |\ \  
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | 
| | | | develop-ascraeus
* github-exreaction/ticket/8323:
  [ticket/8323] Cache auth request
  [ticket/8323] Combine into a single query
  [ticket/8323] Comments on phpbb_get_banned_user_ids input for test
  [ticket/8323] More readability in test case
  [ticket/8323] Comments
  [ticket/8323] dataProvider for the test; better test data
  [ticket/8323] Comments
  [ticket/8323] Unit test for phpbb_get_banned_user_ids
  [ticket/8323] Comments for inactive reasons in constants.php
  [ticket/8323] Only disable administrative deactivated accounts from receiving PMs
  [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification
  [ticket/8323] Correct PM notification settings (only notify those who can receive them)
  [ticket/8323] Cleanup viewtopic code (not sure how this mess happened)
  [ticket/8323] Allow sending PMs to temporarily banned users
  [ticket/8323] Do not allow sending PMs to Inactive users
  [ticket/8323] Hide the Send PM link if users cannot receive the PM
  [ticket/8323] Correcting the comment
  [ticket/8323] Do not allow sending of Private Messages to users who are banned
  [ticket/8323] Remove code used for testing
  [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages
Conflicts:
	phpBB/language/en/ucp.php | 
| | |\ \  
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | | # By Joas Schilling (613) and others
# Via Andreas Fischer (214) and others
* 'develop' of github.com:phpbb/phpbb3: (2494 commits)
  [ticket/11825] Move schema_data.php into includes/ instead of phpbb/
  [ticket/11215] Remove unnecessary comment
  [ticket/11755] MySQL upgrader out of date
  [prep-release-3.0.12] Update Changelog for 3.0.12-RC3 release.
  [prep-release-3.0.12] Bumping version number for 3.0.12-RC3.
  [ticket/11823] Set up nginx server to match PHP files with characters after .php
  [ticket/11812] Fix empty define
  [ticket/11818] Update Symfony dependencies to 2.3.*
  [ticket/11791] Load adm/ events from styles/adm/event/
  [ticket/11215] Fix helper_url_test.php tests
  [ticket/11215] Add newline back to .htaccess, fix wording
  [ticket/11215] Update comment in .htaccess
  [ticket/11215] Uncomment rewrite rules in .htaccess
  [ticket/11215] Make controller helper url() method use correct format
  [ticket/11215] Add commented-out URL rewrite capability to .htaccess
  [ticket/11821] Fix comma usage next to "You are receiving this notification".
  [ticket/11769] Allow using 0 as poster name
  [ticket/11769] Allow '0' as username
  [ticket/11215] Use new URL structure for controllers
  [ticket/11215] Everything appears to be working...
  ...
Conflicts:
	phpBB/includes/functions_privmsgs.php | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-8323 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-8323 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-8323 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-8323 | 
| | |_|/  
|/| |   
| | |   
| | | | PHPBB3-12097 | 
| | | | 
| | | 
| | | 
| | | | PHPBB3-12349 | 
| | | | 
| | | 
| | | 
| | | | PHPBB3-11959 | 
| | | | 
| | | 
| | | 
| | | | PHPBB3-11959 | 
| |\ \ \  
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | | * develop-olympus:
  [ticket/12202] Use an array in the data provider instead of exploding manually
  [ticket/12202] Can't call htmlspecialchars before checking for quotes
  [ticket/12202] Fix tests
  [ticket/12202] Test for parse_cfg_file
  [ticket/12202] Use copyright symbol in style.cfg files
  [ticket/12202] Apply htmlspecialchars to style.cfg data
Conflicts:
	phpBB/styles/prosilver/style.cfg
	phpBB/styles/subsilver2/style.cfg | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-12202 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-12202 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-12202 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-12115 | 
| |\ \ \ \  
| | | | | 
| | | | | 
| | | | | 
| | | | | 
| | | | | 
| | | | | 
| | | | | 
| | | | | 
| | | | | 
| | | | | 
| | | | | 
| | | | | 
| | | | | 
| | | | | | * bantu/ticket/12056-develop:
  [ticket/12056] group_user_attributes: Fix "Creating ... from empty value".
  [ticket/12056] Fix "Call to undefined function ...\utf8_normalize_nfc()"
  [ticket/12056] Fix "Call to undefined function ...\utf8_clean_string()"
  [ticket/12056] Fix "Call to a member function trigger_event() on a non-object".
  [ticket/12056] Fix "Call to undefined function phpbb\phpbb_get_plural_form()".
  [ticket/12056] Fix "undefined function phpbb_pcre_utf8_support()".
  [ticket/12056] validate_config_vars: Fix ".. undefined function utf8_strlen()"
  [ticket/12056] validate_config_vars: Fix "Creating ... from empty value".
  [ticket/12056] validate_range: Fix "Creating default object from empty value"
  [ticket/12056] build_select: Fix "Creating default object from empty value"
  [ticket/12056] h_radio test: Fix "Creating default object from empty value" | 
| | | | | | 
| | | | | 
| | | | | 
| | | | | | PHPBB3-12056 | 
| |\ \ \ \ \  
| |/ / / /  
|/| / / /   
| |/ / /    
| | | | | * develop-olympus:
  [ticket/12056] Fix failure due to "Creating default object from empty value". | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-12056 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11700 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11700 | 
| | |_|/  
|/| |   
| | |   
| | | | PHPBB3-11700 | 
| |\ \ \  
| |/ /  
| | |   
| | |   
| | |   
| | |   
| | |   
| | | | # By Andreas Fischer
# Via Andreas Fischer (1) and Nathan Guse (1)
* develop-olympus:
  [ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
  [ticket/11619] Some tests for get_remote_file(). | 
| | | | 
| | | 
| | | 
| | | | PHPBB3-11619 | 
| |\ \ \  
| |/ /  
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | |   
| | | | * develop-olympus:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data()
Conflicts:
	tests/mock/cache.php | 
| | |\ \  
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | | * marc1706/ticket/11579:
  [ticket/11579] Add method for validating emails for valid MX and mark as slow
  [ticket/11579] Do not extend validate_data_helper
  [ticket/11579] Add missing commas to validate_username_test
  [ticket/11579] Rework calls to validate_data_helper
  [ticket/11579] Move simple tests into seperate files
  [ticket/11579] Use test case helper class and use assert prefix for method
  [ticket/11579] Move tests into seperate files depending on needed fixture
  [ticket/11579] Remove unnecessary globals from validate_password()
  [ticket/11579] Add remaining unit tests for validate_data functions
  [ticket/11579] Add basic set of unit tests for validate_data() | 
| | | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | | A method for setting up the prerequisities also has been added in order to
reduce the amount of necessary code.
PHPBB3-11579 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11579 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11579 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11579 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11579 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11579 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11579 | 
| | | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | | This now includes tests for usernames, passwords, emails, and jabber
addresses. A few small changes had to be applied to phpbb_mock_cache
and phpbb_mock_user in order to incorporate needed methods.
PHPBB3-11579 | 
| | | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | 
| | | | | This currently includes tests for the string, num, date, match, and
language iso validation functions.
PHPBB3-11579 | 
| |\ \ \ \  
| |/ / /  
| | | |   
| | | |   
| | | |   
| | | |   
| | | |   
| | | | | * ticket/11543:
  [ticket/11543] Add more users so #hidden <> #normal
Conflicts:
	tests/functions/obtain_online_test.php | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11543 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11543 | 
| |\ \ \ \  
| |/ / /  
| | | |   
| | | |   
| | | |   
| | | |   
| | | |   
| | | |   
| | | | | * ticket/11543:
  [ticket/11543] Use correct IP addresses and inject time for correct values
  [ticket/11543] Add unit tests for obtain_users_online_string()
  [ticket/11543] Add unit tests for obtain_users_online() with empty forum
  [ticket/11543] Add unit tests for obtain_users_online()
  [ticket/11543] Add unit tests for obtain_guest_count() | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11543 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11543 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11543 | 
| | | | | 
| | | | 
| | | | 
| | | | | PHPBB3-11543 |