aboutsummaryrefslogtreecommitdiffstats
path: root/tests
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-172-0/+245
|\ \ \ \ \ | |/ / / /
| * | | | Merge pull request #2922 from Nicofuma/ticket/13036Marc Alexander2014-09-172-0/+245
| |\ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/13036] Make the reference type configurable when generating a route
| | * | | | [ticket/13036] Complete testsTristan Darricau2014-09-162-0/+121
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13036
| | * | | | [ticket/13036] Add unit testsTristan Darricau2014-09-161-0/+124
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13036
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-177-1/+214
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2932 from Nicofuma/ticket/12963Marc Alexander2014-09-177-1/+214
| |\ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | [ticket/12963] Load extensions migrations from /migration
| | * | | | [ticket/12963] Add unit testsTristan Darricau2014-09-107-1/+214
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12963
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-163-63/+84
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2921 from Nicofuma/ticket/13034Marc Alexander2014-09-163-63/+84
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | [ticket/13034] Fix the route generated for the frontend not in the phpbb root path
| | * | | | [ticket/13034] Fix testsTristan Darricau2014-09-163-6/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13034
| | * | | | [ticket/13034] Fix unit testsTristan Darricau2014-09-041-23/+33
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13034
| | * | | | [ticket/13034] Fix the route generated for the frontend not in the phpbb rootTristan Darricau2014-09-042-38/+46
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13034
* | | | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-071-0/+85
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge pull request #2925 from nickvergessen/ticket/12983Marc Alexander2014-09-071-0/+85
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
| | * | | | [ticket/12983] Do not test invalid values until Symfony 2.4Joas Schilling2014-09-071-9/+27
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12983
| | * | | | [ticket/12983] Add functional test for ucp pref moduleJoas Schilling2014-09-061-0/+67
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-12983
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-061-0/+27
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12852] Add unit tests [ticket/12852] Add space after if [ticket/12852] Remove whitespace [ticket/12852] Make get_url_parts handle get variable with no value
| * | | | Merge pull request #2919 from Senky/ticket/12852Tristan Darricau2014-09-061-0/+27
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12852] Make get_url_parts handle get variable with no value * Senky/ticket/12852: [ticket/12852] Add unit tests [ticket/12852] Add space after if [ticket/12852] Remove whitespace [ticket/12852] Make get_url_parts handle get variable with no value
| | * | | | [ticket/12852] Add unit testsJakub Senko2014-09-041-0/+27
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-12852
* | | | | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-062-2/+23
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13031] Slightly change behavior of choose_mime_type and add unit tests [ticket/13031] Guess with all mimetype guessers and pick best guess [ticket/13031] Only use mimetype guesser guess if it helps us
| * | | | [ticket/13031] Slightly change behavior of choose_mime_type and add unit testsMarc Alexander2014-09-051-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The mime type 'application/octet-stream' will still always be overwritten by proper guesses. However, guesses with guessers that have a higher priority will now overwrite previous guesses even if the mime types of these guesses had a slash in them. PHPBB3-13031
| * | | | [ticket/13031] Only use mimetype guesser guess if it helps usMarc Alexander2014-09-031-2/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we already have a mimetype and the guesser's guess is the default fallback, we should keep the already existing mimetype the browser supplied. Otherwise, platforms that might not support mimetype guessers will cause us to always have the mimetype set to application/octet-stream on images. This will prevent users from uploading images. PHPBB3-13031
* | | | [ticket/12661] Fix unit testsTristan Darricau2014-09-021-1/+21
| | | | | | | | | | | | | | | | PHPBB3-12661
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-025-2/+85
|\ \ \ \ | |/ / /
| * | | Merge pull request #2908 from Pico/t/12661Marc Alexander2014-09-025-2/+85
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12661] Load extensions templates from "all" folder by render()
| | * | | [ticket/12661] Add new line at the end of filesPico2014-08-252-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12661
| | * | | [ticket/12661] Add template testPico882014-08-245-2/+85
| | | | | | | | | | | | | | | | | | | | PHPBB3-12661
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-247-0/+68
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/13008] Add functionnal test [ticket/13008] Use an absolute path with the FileLocator for the routing files
| * | | | Merge pull request #2905 from Nicofuma/ticket/13008Andreas Fischer2014-08-247-0/+68
| |\ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13008] Use an absolute path with the FileLocator for the routing files * Nicofuma/ticket/13008: [ticket/13008] Add functionnal test [ticket/13008] Use an absolute path with the FileLocator for the routing files
| | * | | [ticket/13008] Add functionnal testTristan Darricau2014-08-247-0/+68
| | | | | | | | | | | | | | | | | | | | PHPBB3-13008
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-231-0/+251
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12658] Rebased and fixed unit tests [ticket/12658] Fix wrong eol character [ticket/12658] Refactoring code [ticket/12658] Fix typo and coding style mistakes [ticket/12658] Add test for command config:delete [ticket/12658] Add test for command config:increment [ticket/12658] Add test for command config:get [ticket/12658] Add test for command config:set-atomic [ticket/12658] Add test for base case of command config:set
| * | | | [ticket/12658] Rebased and fixed unit testsTristan Darricau2014-08-231-7/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| * | | | [ticket/12658] Fix wrong eol characterLEZY Thomas2014-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| * | | | [ticket/12658] Refactoring codeLEZY Thomas2014-08-231-33/+15
| | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| * | | | [ticket/12658] Fix typo and coding style mistakesLEZY Thomas2014-08-231-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| * | | | [ticket/12658] Add test for command config:deleteLEZY Thomas2014-08-231-0/+34
| | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| * | | | [ticket/12658] Add test for command config:incrementLEZY Thomas2014-08-231-11/+63
| | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| * | | | [ticket/12658] Add test for command config:getLEZY Thomas2014-08-231-0/+48
| | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| * | | | [ticket/12658] Add test for command config:set-atomicLEZY Thomas2014-08-231-5/+65
| | | | | | | | | | | | | | | | | | | | PHPBB3-12658
| * | | | [ticket/12658] Add test for base case of command config:setLEZY Thomas2014-08-231-0/+71
| |/ / / | | | | | | | | | | | | PHPBB3-12658
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-2115-91/+93
|\ \ \ \ | |/ / /
| * | | Merge pull request #2885 from Nicofuma/ticket/12990Marc Alexander2014-08-2115-91/+93
| |\ \ \ | | | | | | | | | | | | | | | [ticket/12990] Use the full services name for the notification's types
| | * | | [ticket/12990] Fix unit testsTristan Darricau2014-08-1715-91/+93
| | | | | | | | | | | | | | | | | | | | PHPBB3-12990
* | | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-191-4/+4
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12996] Fix reliability issue in flock test.
| * | | | [ticket/12996] Fix reliability issue in flock test.Fred Emmott2014-08-191-4/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $delta was always an int - so, this test would sometimes fail if you happened to call time() /very/ close to a 1s boundary. Found by HHVM's continuous testing. PHPBB3-12996
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * develop-ascraeus: [ticket/12822] Correctly call \phpbb\user in avatar manager test
| * | | [ticket/12822] Correctly call \phpbb\user in avatar manager testMarc Alexander2014-08-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12822
* | | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-117-26/+109
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes Conflicts: phpBB/styles/subsilver2/template/ucp_groups_manage.html phpBB/styles/subsilver2/template/ucp_profile_avatar.html
| * | | Merge remote-tracking branch 'github-marc1706/ticket/12822' into ↵Nils Adermann2014-08-117-26/+109
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-marc1706/ticket/12822: [ticket/12822] Fix test runs of avatar manager_test [ticket/12822] Add method for deleting avatars and use confirm_box [ticket/12822] Remove "None" option from avatar select boxes
| | * | | [ticket/12822] Fix test runs of avatar manager_testMarc Alexander2014-08-081-4/+11
| | | | | | | | | | | | | | | | | | | | PHPBB3-12822