aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'github-exreaction/ticket/7598' into developNils Adermann2012-07-171-1/+6
|\ | | | | | | | | | | * github-exreaction/ticket/7598: [ticket/7598] Use $user->lang['COMMA_SEPARATOR'] [ticket/7598] Inactive users action notification (ACP)
| * [ticket/7598] Use $user->lang['COMMA_SEPARATOR']Nathan2012-07-141-3/+3
| | | | | | | | PHPBB3-7598
| * [ticket/7598] Inactive users action notification (ACP)Nathan2012-07-131-1/+6
| | | | | | | | | | | | When performing an action on users in the ACP Inactive Users, such as activating, deleting, or reminding, trigger_error is now called to give a notification that the action was performed PHPBB3-7598
* | Merge remote-tracking branch 'nickvergessen/ticket/10942' into developAndreas Fischer2012-07-179-1/+205
|\ \ | |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10942: [ticket/10942] Avoid possible conflicts with magic words in unit tests [ticket/10942] Add access modifiers [ticket/10942] Use ANSI SQL standard || in dbal.php [ticket/10942] Fix up unit tests for sql_case() [ticket/10942] Require same data type and do not cast expressions automatically [ticket/10942] Make unit tests for sql_case simpler [ticket/10942] Add a comment why we cast to sql_case() [ticket/10942] Rename method sql_conditional() to sql_case() [ticket/10942] Change term string to expression to avoid confusion [ticket/10942] Fix sql_conditional for mssql, postgre and oracle [ticket/10942] Fix function name on order_lower_test.php [ticket/10942] Add unit tests for sql_concatenate [ticket/10942] Add sql_concatenate to dbal [ticket/10942] Add unit tests for sql_conditional [ticket/10942] Add sql_conditional to dbal
| * [ticket/10942] Avoid possible conflicts with magic words in unit testsJoas Schilling2012-07-161-12/+12
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Add access modifiersJoas Schilling2012-07-046-7/+7
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Use ANSI SQL standard || in dbal.phpJoas Schilling2012-07-026-25/+17
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Fix up unit tests for sql_case()Joas Schilling2012-07-021-11/+28
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Require same data type and do not cast expressions automaticallyJoas Schilling2012-07-026-65/+2
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Make unit tests for sql_case simplerJoas Schilling2012-06-301-31/+19
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Add a comment why we cast to sql_case()Joas Schilling2012-06-205-0/+5
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Rename method sql_conditional() to sql_case()Joas Schilling2012-06-207-44/+44
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Change term string to expression to avoid confusionJoas Schilling2012-06-207-17/+17
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Fix sql_conditional for mssql, postgre and oracleJoas Schilling2012-06-205-0/+60
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Fix function name on order_lower_test.phpJoas Schilling2012-06-201-1/+1
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Add unit tests for sql_concatenateJoas Schilling2012-06-201-0/+64
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Add sql_concatenate to dbalJoas Schilling2012-06-207-0/+60
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Add unit tests for sql_conditionalJoas Schilling2012-06-201-0/+64
| | | | | | | | PHPBB3-10942
| * [ticket/10942] Add sql_conditional to dbalJoas Schilling2012-06-201-0/+17
| | | | | | | | PHPBB3-10942
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-121-1/+1
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
| * \ Merge branch 'prep-release-3.0.11' into develop-olympusAndreas Fischer2012-07-121-1/+1
| |\ \ | | | | | | | | | | | | | | | | * prep-release-3.0.11: [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
| | * \ Merge remote-tracking branch 'Noxwizard/ticket/10978' into prep-release-3.0.11Andreas Fischer2012-07-121-1/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | * Noxwizard/ticket/10978: [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
| | | * | [ticket/10978] Fix typo in prosilver ucp_groups_membership.htmlPatrick Webster2012-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10978
* | | | | Merge remote-tracking branch 'Fyorl/ticket/10941' into developAndreas Fischer2012-07-0916-0/+610
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fyorl/ticket/10941: (30 commits) [ticket/10941] Removed superfluous array [ticket/10941] File 'txt' now too big so changed tests to reflect that [ticket/10941] Added a comment to ensure tags stay uppercase [ticket/10941] Modified tearDown to use DirectoryIterator instead of glob [ticket/10941] Added tests/upload/fixture/copies to tracking [ticket/10941] Fixed form test test_too_large [ticket/10941] Replaced use of English with language system [ticket/10941] Renamed classes and filenames so that tests run [ticket/10941] Moved comment into markTestIncomplete parameter [ticket/10941] Removed manual includes of mock classes [ticket/10941] Added subdirectory for file operations [ticket/10941] Added some comments for clarification [ticket/10941] Fixed a failing test [ticket/10941] Rearranged tests into their own classes or methods [ticket/10941] Removed the incomplete mark as is_image is fixed [ticket/10941] Refactored tearDown to stop iterating over the directory. [ticket/10941] Refactored init_filespec to return new object. [ticket/10941] Minor typo fixes [ticket/10941] Changed assertTrue to assertEquals [ticket/10941] Now actually checks for the value of errors. ...
| * | | | | [ticket/10941] Removed superfluous arrayFyorl2012-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] File 'txt' now too big so changed tests to reflect thatFyorl2012-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Added a comment to ensure tags stay uppercaseFyorl2012-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Modified tearDown to use DirectoryIterator instead of globFyorl2012-07-091-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Added tests/upload/fixture/copies to trackingFyorl2012-07-091-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Fixed form test test_too_largeFyorl2012-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Replaced use of English with language systemFyorl2012-07-091-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Renamed classes and filenames so that tests runFyorl2012-07-092-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also fixed some minor issues that weren't flagged before because the tests were being ignored. PHPBB3-10941
| * | | | | [ticket/10941] Moved comment into markTestIncomplete parameterFyorl2012-07-091-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Removed manual includes of mock classesFyorl2012-07-093-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also marked a test as incomplete even though this appears to be ignored when actually running the tests. PHPBB3-10941
| * | | | | [ticket/10941] Added subdirectory for file operationsFyorl2012-07-098-22/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also removed common.php as it was unnecessary. PHPBB3-10941
| * | | | | [ticket/10941] Added some comments for clarificationFyorl2012-07-092-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Fixed a failing testFyorl2012-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since the is_image change, the filespec class no longer trusts the browser's reported mimetype and instead checks the file itself. Thus pretending a text file had the mimetype of an image will no longer fail, the file will simply not be treated as an image. PHPBB3-10941
| * | | | | [ticket/10941] Rearranged tests into their own classes or methodsFyorl2012-07-094-110/+151
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Removed the incomplete mark as is_image is fixedFyorl2012-07-091-11/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Had to remove one of the tests due to a small limitation with the functional testing framework. May mark the test as incomplete again pending further comments. PHPBB3-10941
| * | | | | [ticket/10941] Refactored tearDown to stop iterating over the directory.Fyorl2012-07-091-20/+15
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Refactored init_filespec to return new object.Fyorl2012-07-091-27/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed $filespec as a property of the filespec test and instead just instantiate new objects. PHPBB3-10941
| * | | | | [ticket/10941] Minor typo fixesFyorl2012-07-092-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed superfluous $user = null; that was left over from refactoring. PHPBB3-10941
| * | | | | [ticket/10941] Changed assertTrue to assertEqualsFyorl2012-07-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Now actually checks for the value of errors.Fyorl2012-07-093-25/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses phpbb_mock_lang to return the key used when setting errors to allow that key to be checked for during tests rather than just checking if any error was set. PHPBB3-10941
| * | | | | [ticket/10941] Re-arranged dataProvidor methods to be near their callersFyorl2012-07-091-67/+67
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Added a comment explaining the incomplete testFyorl2012-07-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] tearDown() now uses explicit file listFyorl2012-07-091-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instances of $it also renamed for clarity. PHPBB3-10941
| * | | | | [ticket/10941] Minor adjustments as per PR commentsFyorl2012-07-098-47/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added some comments clarifying globals and lowercased fixture filenames PHPBB3-10941
| * | | | | [ticket/10941] Marked broken test as incompleteFyorl2012-07-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10941
| * | | | | [ticket/10941] Added functional tests for the fileupload classFyorl2012-07-095-0/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: test_form_upload() is broken. Uploading files via Symfony fails to retain $_FILES['fileupload']['type'] even if it set explicitely. This appears to be a bug in Symfony. Since the current version of filespec::is_image() relies on the mimetype, these tests will __fail__. filespec::is_image() has been fixed in https://github.com/phpbb/phpbb3/pull/833 however. PHPBB3-10941
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 02:48:43 +0000