aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2925 from nickvergessen/ticket/12983Marc Alexander2014-09-072-6/+22
|\ | | | | | | Ticket/12983 UCP preferences, Display posts ordering by: input is not properly validated
| * [ticket/12983] Correctly validate sorting options in the UCPJoas Schilling2014-09-052-6/+22
| | | | | | | | PHPBB3-12983
* | Merge pull request #2919 from Senky/ticket/12852Tristan Darricau2014-09-061-3/+21
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | [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 space after ifJakub Senko2014-09-041-1/+1
| | | | | | | | | | | | PHPBB3-12852
| * | [ticket/12852] Remove whitespaceJakub Senko2014-09-041-1/+1
| | | | | | | | | | | | PHPBB3-12852
| * | [ticket/12852] Make get_url_parts handle get variable with no valueJakub Senko2014-09-041-3/+21
| |/ | | | | | | PHPBB3-12852
* | Merge pull request #2918 from marc1706/ticket/13031Tristan Darricau2014-09-062-8/+38
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13031] Only use mimetype guesser guess if it helps us * marc1706/ticket/13031: [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-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Guess with all mimetype guessers and pick best guessMarc Alexander2014-09-052-9/+34
| | | | | | | | | | | | PHPBB3-13031
| * | [ticket/13031] Only use mimetype guesser guess if it helps usMarc Alexander2014-09-031-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge pull request #2748 from carlo94it/ticket/12765Marc Alexander2014-09-051-142/+3
|\ \ \ | | | | | | | | | | | | [ticket/12765] Use db_tools instead of generating queries at moment
| * | | [ticket/12765] Execute query directly from db toolsCarlo2014-08-101-4/+2
| | | | | | | | | | | | | | | | PHPBB3-12765
| * | | [ticket/12765] Use db_tools instead of generating queries at momentCarlo2014-08-101-142/+5
| | | | | | | | | | | | | | | | PHPBB3-12765
* | | | Merge pull request #2868 from rxu/ticket/12969Marc Alexander2014-09-053-0/+20
|\ \ \ \ | |_|_|/ |/| | | | | | | [ticket/12969] Add template events around username link on composing pm
| * | | [ticket/12969] Add template events around username link on composing pmrxu2014-09-023-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template event before/after find username link on composing pm to allow extensions perform additional actions on user finding. PHPBB3-12969
* | | | Merge pull request #2917 from bantu/ticket/13032Marc Alexander2014-09-042-166/+137
|\ \ \ \ | |_|_|/ |/| | | | | | | [ticket/13032] Update Symfony Components to 2.3.19
| * | | [ticket/13032] Also update symfony/css-selector and pin it down.Andreas Fischer2014-09-032-12/+11
| | | | | | | | | | | | | | | | PHPBB3-13032
| * | | [ticket/13032] Update Symfony Components to 2.3.19Andreas Fischer2014-09-031-154/+126
| | | | | | | | | | | | | | | | PHPBB3-13032
* | | | Merge pull request #2908 from Pico/t/12661Marc Alexander2014-09-021-0/+4
|\ \ \ \ | | | | | | | | | | | | | | | [ticket/12661] Load extensions templates from "all" folder by render()
| * | | | [ticket/12661] Add template testPico882014-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12661
| * | | | [ticket/12661] Load extensions templates from "all" folder by render()Pico882014-08-241-0/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-12661
* | | | | Merge pull request #2887 from Pico/ticket/12991Marc Alexander2014-09-015-0/+50
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | [ticket/12991] Have events after/before "add warning" field - user and post
| * | | | | [ticket/12991] Correct language mistakesPico2014-08-301-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12991
| * | | | | [ticket/12991] Have events after/before "add warning" field - user and postPico882014-08-175-0/+50
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12991
* | | | | | Merge pull request #2913 from Nicofuma/ticket/13024Marc Alexander2014-08-313-0/+12
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [ticket/13024] Add template event viewtopic_body_postrow_post_content_footer
| * | | | | | [ticket/13024] Add template event viewtopic_body_postrow_post_content_footerTristan Darricau2014-08-303-0/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13024
* | | | | | | Merge pull request #2826 from brunoais/ticket/12928Marc Alexander2014-08-301-0/+21
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | [ticket/12928] core.mcp_reports_gather_query_before
| * | | | | | [ticket/12928] Update to RC4brunoais2014-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12928
| * | | | | | [ticket/12928] core.mcp_reports_gather_query_beforebrunoais2014-08-081-0/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the core.mcp_reports_gather_query_before event to mcp backend. PHPBB3-12928
* | | | | | | Merge pull request #2865 from marc1706/ticket/12966Dhruv Goel2014-08-2915-33/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| * | | | | | | [ticket/12966] Sort by post_time and post_id where applicableMarc Alexander2014-08-2315-32/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was not applied to the search as this would require a larger rewrite of the search methods. PHPBB3-12966
| * | | | | | | [ticket/12966] Sort posts by post_id in addition to sorting by post_timeMarc Alexander2014-08-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should make sure that posts with the same post time are properly sorted on database backends like postgres. PHPBB3-12966
* | | | | | | | [ticket/11909] Remove unused function load_migrationsn-aleha2014-08-261-54/+0
| |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove unused function load_migrations from \phpbb\db\migrator PHPBB3-11909
* | | | | | | Merge remote-tracking branch 'PayBas/ticket/12506' into develop-ascraeusCesar G2014-08-257-9/+51
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12506: [ticket/12506] Fix search result h3 margin [ticket/12506] Fix responsive profile min-height (no avatar) [ticket/12506] Reposition buttons to make room for "online" banner [ticket/12506] Reposition post-buttons for compact layout
| * | | | | | | [ticket/12506] Fix search result h3 marginPayBas2014-08-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are no buttons present, so don't need to do all this stuff. PHPBB3-12506
| * | | | | | | [ticket/12506] Fix responsive profile min-height (no avatar)PayBas2014-08-071-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12506
| * | | | | | | [ticket/12506] Reposition buttons to make room for "online" bannerPayBas2014-08-072-8/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12506
| * | | | | | | [ticket/12506] Reposition post-buttons for compact layoutPayBas2014-08-078-4/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12506
* | | | | | | | Merge pull request #2905 from Nicofuma/ticket/13008Andreas Fischer2014-08-241-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Use an absolute path with the FileLocator for the routing filesTristan Darricau2014-08-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13008
* | | | | | | | Merge pull request #2907 from marc1706/ticket/13010Tristan Darricau2014-08-241-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock * marc1706/ticket/13010: [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblock
| * | | | | | | | [ticket/13010] Specifiy correct clean_row() call in phpbb_get_avatar docblockMarc Alexander2014-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13010
* | | | | | | | | Merge pull request #2904 from Nicofuma/ticket/12990Marc Alexander2014-08-241-0/+5
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | | | | | | | | | [ticket/12990] Disable all the notifications types which are not in the core
| * | | | | | | | [ticket/12990] Disable all the notifications types which are not in the coreTristan Darricau2014-08-231-0/+5
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12990
* | | | | | | | Merge pull request #2783 from hanakin/ticket/12862Andreas Fischer2014-08-238-19/+11
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12862] Fix pop-up box wraps * hanakin/ticket/12862: [ticket/12862] Remove remaining simple-wrap id [ticket/12862] Resize popups consistently [ticket/12862] Add Border
| * | | | | | | [ticket/12862] Remove remaining simple-wrap idMichael Miday2014-08-111-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12862
| * | | | | | | [ticket/12862] Resize popups consistentlyhanakin2014-07-306-14/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12862
| * | | | | | | [ticket/12862] Add Borderhanakin2014-07-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12862
* | | | | | | | Merge pull request #2899 from Skouat/ticket/13003Andreas Fischer2014-08-222-4/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13003] Add missing language keys * Skouat/ticket/13003: [ticket/13003] Add missing language keys
| * | | | | | | | [ticket/13003] Add missing language keysMario Skouat2014-08-212-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-13003