aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-ascraeus' into developJoas Schilling2014-09-071-2/+2
|\ | | | | | | | | * develop-ascraeus: [ticket/13048] Only update session_page if request is not ajax
| * [ticket/13048] Only update session_page if request is not ajaxJakub Senko2014-09-071-2/+2
| | | | | | | | PHPBB3-13048
* | Merge branch 'develop-ascraeus' into developTristan Darricau2014-09-061-3/+21
|\ \ | |/ | | | | | | | | | | | | * 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-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 branch 'develop-ascraeus' into developTristan Darricau2014-09-061-7/+32
|\ \ \ | |/ / | | | | | | | | | | | | | | | * 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-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-051-7/+32
| |/ | | | | | | PHPBB3-13031
* | Merge branch 'develop-ascraeus' into developMarc Alexander2014-09-021-0/+4
|\ \ | |/
| * 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 branch 'develop-ascraeus' into developDhruv2014-08-296-9/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Dhruv Goel (1) and Marc Alexander (1) * develop-ascraeus: [ticket/12966] Sort by post_time and post_id where applicable [ticket/12966] Sort posts by post_id in addition to sorting by post_time
| * | Merge pull request #2865 from marc1706/ticket/12966Dhruv Goel2014-08-296-9/+9
| |\ \ | | | | | | | | [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-236-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This change was not applied to the search as this would require a larger rewrite of the search methods. PHPBB3-12966
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-281-54/+0
|\ \ \ \ | |/ / /
| * | | [ticket/11909] Remove unused function load_migrationsn-aleha2014-08-261-54/+0
| | | | | | | | | | | | | | | | | | | | | | | | Remove unused function load_migrations from \phpbb\db\migrator PHPBB3-11909
* | | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-241-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * 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-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 branch 'develop-ascraeus' into developMarc Alexander2014-08-241-0/+5
|\ \ \ \ | |/ / /
| * | | [ticket/12990] Disable all the notifications types which are not in the coreTristan Darricau2014-08-231-0/+5
| |/ / | | | | | | | | | PHPBB3-12990
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-221-4/+4
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/13003] Add missing language keys
| * | Merge pull request #2899 from Skouat/ticket/13003Andreas Fischer2014-08-221-4/+4
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | [ticket/13003] Add missing language keys * Skouat/ticket/13003: [ticket/13003] Add missing language keys
| | * | [ticket/13003] Add missing language keysMario Skouat2014-08-211-4/+4
| | | | | | | | | | | | | | | | PHPBB3-13003
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-211-12/+12
|\ \ \ \ | |/ / /
| * | | [ticket/12990] Use {$var} instead of ${var}Tristan Darricau2014-08-211-12/+12
| |/ / | | | | | | | | | PHPBB3-12990
* | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-2122-29/+142
|\ \ \ | |/ /
| * | [ticket/12990] Use protected instead of privateTristan Darricau2014-08-171-2/+2
| | | | | | | | | | | | PHPBB3-12990
| * | [ticket/12990] Use the full services name for the notification's typesTristan Darricau2014-08-1622-29/+142
| | | | | | | | | | | | PHPBB3-12990
* | | Merge branch 'develop-ascraeus' into developAndreas Fischer2014-08-161-2/+11
|\ \ \ | |/ / | | | | | | | | | * develop-ascraeus: [ticket/12975] Fix the construction of phpbb\auth\provider\db for Oauth
| * | [ticket/12975] Fix the construction of phpbb\auth\provider\db for OauthTristan Darricau2014-08-121-2/+11
| | | | | | | | | | | | PHPBB3-12975
* | | Merge branch 'develop-ascraeus' into developJoas Schilling2014-08-121-0/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-ascraeus: [prep-release-3.1.0-RC3] Update phpBB Version for RC4 development [prep-release-3.1.0-RC3] Add changelog for 3.1.0-RC3 [prep-release-3.1.0-RC3] Prepare Changelog [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3 [prep-release-3.1.0-RC3] Update version to 3.1.0-RC3 Conflicts: phpBB/styles/subsilver2/style.cfg
| * | [prep-release-3.1.0-RC3] Add migration for 3.1.0-RC3Joas Schilling2014-08-111-0/+35
| | |
* | | Merge branch 'develop-ascraeus' into developNils Adermann2014-08-115-4/+44
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-115-4/+44
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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] Add method for deleting avatars and use confirm_boxMarc Alexander2014-08-072-2/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The method will take care of the actual deletion process in the avatar manager. Additionally, we'll be using a confirm box while deleting the avatar to prevent users from accidentally deleting their avatars. PHPBB3-12822
| | * | [ticket/12822] Remove "None" option from avatar select boxesMarc Alexander2014-08-073-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This option is just used for deleting avatars for which we already have a checkbox. PHPBB3-12822
* | | | Merge branch 'develop-ascraeus' into developMarc Alexander2014-08-1115-14/+5971
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: phpBB/config/services.yml
| * | | [ticket/11854] Don't override get service name in nogdTristan Darricau2014-08-112-9/+1
| | | | | | | | | | | | | | | | PHPBB3-11854
| * | | [ticket/11854] Use a set_name method instead of overriding get_service_nameTristan Darricau2014-08-115-27/+36
| | | | | | | | | | | | | | | | PHPBB3-11854
| * | | [ticket/11854] Change the error message in reCaptchaTristan Darricau2014-08-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11854
| * | | [ticket/11854] Fix commentsTristan Darricau2014-08-111-4/+5
| | | | | | | | | | | | | | | | PHPBB3-11854
| * | | [ticket/11854] Base the migration on rc2Tristan Darricau2014-08-111-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11854
| * | | [ticket/11854] Fix the factory in \phpbb\auth\provider\dbTristan Darricau2014-08-111-2/+12
| | | | | | | | | | | | | | | | PHPBB3-11854
| * | | [ticket/11854] Remove unused globalsTristan Darricau2014-08-111-12/+12
| | | | | | | | | | | | | | | | PHPBB3-11854
| * | | [ticket/11854] Remove constants and use DI for QA tablesTristan Darricau2014-08-111-30/+48
| | | | | | | | | | | | | | | | PHPBB3-11854
| * | | [ticket/11854] Fix coding styleTristan Darricau2014-08-113-812/+30
| | | | | | | | | | | | | | | | PHPBB3-11854
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 09:05:50 +0000