aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1366 from asperous/ticket/11129Nils Adermann2013-04-241-2/+17
|\ | | | | [ticket/11129] Added headers to empty subscription state
| * [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-0/+1
| | | | | | | | | | | | Added a newline to better seperate the two headers. PHPBB3-11129
| * [ticket/11129] Added headers to empty subscription stateasperous2013-04-231-2/+16
| | | | | | | | | | | | | | | | "You are not subscribed to any forums". While correct, could lead to confusion. What's missing is a header right above the message that says "Watched Topics" to match the "Watched Forums" header above. This will assert the idea that there are two separate watchable sections. As is, it looks like that message is talking about the "Watched Forums" section, since it's listed under that header. PHPBB3-11129
* | Merge remote-tracking branch 'github-asperous/ticket/9975' into developNils Adermann2013-04-247-8/+12
|\ \ | | | | | | | | | | | | | | | | | | | | | * github-asperous/ticket/9975: [ticket/9975] Moved a few E_USER_ERROR errors to /language Conflicts: phpBB/includes/user.php
| * | [ticket/9975] Moved a few E_USER_ERROR errors to /languageasperous2013-04-238-9/+14
| |/ | | | | | | | | | | There were a few error messages that a user could experience that would, previously, be without any the ability to be localized. There are some more E_USER_ERRORs that I did not change to a constant, for example the error message that is displayed if there aren't any folders in /language. PHPBB3-9975
* | Merge branch 'develop-olympus' into developNils Adermann2013-04-242-1/+2
|\ \ | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9975] Translate missing style error message Conflicts: phpBB/includes/session.php
| * \ Merge pull request #1358 from MGaetan89/ticket/9975Nils Adermann2013-04-242-1/+2
| |\ \ | | | | | | | | [ticket/9975] Translate missing style error message
| | * | [ticket/9975] Translate missing style error messageGaëtan Muller2013-04-212-1/+2
| |/ / | | | | | | | | | | | | | | | | | | The error message about missing style data was not translated PHPBB3-9975
* | | Merge pull request #1326 from dhruvgoel92/ticket/11485Nils Adermann2013-04-241-0/+28
|\ \ \ | | | | | | | | [ticket/11485] add columns to update_schema before adding data
| * | | [ticket/11485] add revert_schema for the updated columnsDhruv2013-04-091-0/+14
| | | | | | | | | | | | | | | | PHPBB3-11485
| * | | [ticket/11485] add columns to styles table during updating schema beforeDhruv2013-04-091-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | updating the data PHPBB3-10485
* | | | Merge pull request #1324 from nickvergessen/ticket/10844-2Nils Adermann2013-04-248-4/+92
|\ \ \ \ | | | | | | | | | | Ticket/10844 Extensions are not located when front-end file has a diffferent phpbb_root_path
| * | | | [ticket/10844] Increase prefix to not match template/ in finder testJoas Schilling2013-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10844
| * | | | [ticket/10844] Add extension template file to locateJoas Schilling2013-04-221-0/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10844
| * | | | [ticket/10844] Add unit tests for different root_pathsJoas Schilling2013-04-122-0/+68
| | | | | | | | | | | | | | | | | | | | PHPBB3-10844
| * | | | [ticket/10844] Make sure ext_path has no trailing slashJoas Schilling2013-04-121-0/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10844
| * | | | [ticket/10844] Add phpbb_root_path to phpbb_style_extension_path_providerJoas Schilling2013-04-124-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The phpbb_root_path needs to be removed from the style path, before giving the path to the finder, because the finder prepends it later again and is therefor unable to find style files when the root path is not ./ PHPBB3-10844
* | | | | Merge pull request #1290 from nickvergessen/ticket/11362Nils Adermann2013-04-2413-30/+123
|\ \ \ \ \ | |_|_|_|/ |/| | | | Correctly sanitise the directory path in finder
| * | | | [ticket/11362] Use container when available instead of creating a new instanceJoas Schilling2013-04-221-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11362
| * | | | [ticket/11362] Add compatibility function phpbb_clean_path() againJoas Schilling2013-04-181-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The function first depends on the container, but also works without it and without autoload. The reason for this is, it might be used before that stuff is set up, like it has been in our common.php PHPBB3-11362
| * | | | [ticket/11362] Fix service description of finderJoas Schilling2013-04-171-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-11362
| * | | | [ticket/11362] Extension manager depends on filesystemJoas Schilling2013-04-178-3/+12
| | | | | | | | | | | | | | | | | | | | PHPBB3-11362
| * | | | [ticket/11362] Replace other calls to phpbb_clean_pathJoas Schilling2013-04-171-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to instantiate the object manually here, as the container is not yet set up. PHPBB3-11362
| * | | | [ticket/11362] Use new filesystem class in finderJoas Schilling2013-04-171-2/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-11362
| * | | | [ticket/11362] Move phpbb_clean_path into a simple filesystem serviceJoas Schilling2013-04-174-38/+68
| | | | | | | | | | | | | | | | | | | | PHPBB3-11362
| * | | | [ticket/11362] Add unit test for ../ in directory pathsJoas Schilling2013-03-121-0/+16
| | | | | | | | | | | | | | | | | | | | PHPBB3-11362
| * | | | [ticket/11362] Correctly sanitise the directory pathJoas Schilling2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We need to correctly remove ../ form the path if possible by removing the previous folder aswell. Otherwise the finder is unable to locate /adm/style directories in extensions as he is looking for /adm/../adm/style instead. PHPBB3-11362
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/10966-2' into developAndreas Fischer2013-04-193-86/+67
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10966-2: [ticket/10966] Introduce MSSQL base class for native and ODBC
| * | | | | [ticket/10966] Introduce MSSQL base class for native and ODBCJoas Schilling2013-04-193-86/+67
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-10966
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/11501' into developAndreas Fischer2013-04-183-13/+6
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11501: [ticket/11501] Remove test_ prefix from data provider methods [ticket/11501] Assert the variables instead of fail() with the condition
| * | | | | [ticket/11501] Remove test_ prefix from data provider methodsJoas Schilling2013-04-192-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11501
| * | | | | [ticket/11501] Assert the variables instead of fail() with the conditionJoas Schilling2013-04-191-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11501
* | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10966' into developAndreas Fischer2013-04-183-246/+148
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | | | | | | | | | | | | * nickvergessen/ticket/10966: [ticket/10966] Introduce MySQL base class
| * | | | | [ticket/10966] Introduce MySQL base classJoas Schilling2013-04-173-246/+148
|/ / / / / | | | | | | | | | | | | | | | PHPBB3-10966
* | | | | Merge remote-tracking branch 'nickvergessen/ticket/11491' into developAndreas Fischer2013-04-151-10/+24
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11491: [ticket/11491] Copy files back only if we saved them previously [ticket/11491] Only copy files from phpBB/ext/ the directory exists [ticket/11491] Correctly remove the store/temp_ext/ directory after use [ticket/11491] Fix path to the ext/ folder [ticket/11491] Add extension_acp_test.php to functional group [ticket/11491] Fix class name of functional test [ticket/11491] Move file to correct directory
| * | | | | [ticket/11491] Copy files back only if we saved them previouslyJoas Schilling2013-04-121-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11491
| * | | | | [ticket/11491] Only copy files from phpBB/ext/ the directory existsJoas Schilling2013-04-121-4/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11491
| * | | | | [ticket/11491] Correctly remove the store/temp_ext/ directory after useJoas Schilling2013-04-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11491
| * | | | | [ticket/11491] Fix path to the ext/ folderJoas Schilling2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11491
| * | | | | [ticket/11491] Add extension_acp_test.php to functional groupJoas Schilling2013-04-121-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11491
| * | | | | [ticket/11491] Fix class name of functional testJoas Schilling2013-04-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11491
| * | | | | [ticket/11491] Move file to correct directoryJoas Schilling2013-04-121-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11491
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-04-151-0/+3
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11493] add checks for Notice and Warning [ticket/11493] add check for phpBB Debug in functional tests
| * | | | | Merge remote-tracking branch 'dhruvgoel92/ticket/11493' into develop-olympusAndreas Fischer2013-04-151-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11493: [ticket/11493] add checks for Notice and Warning [ticket/11493] add check for phpBB Debug in functional tests
| | * | | | | [ticket/11493] add checks for Notice and WarningDhruv2013-04-151-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11493
| | * | | | | [ticket/11493] add check for phpBB Debug in functional testsDhruv2013-04-151-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11493
* | | | | | | Merge remote-tracking branch 'marc1706/ticket/11488' into developAndreas Fischer2013-04-152-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11488: [ticket/11488] Use correct base class in email notification method
| * | | | | | | [ticket/11488] Use correct base class in email notification methodMarc Alexander2013-04-152-2/+2
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In ticket/11451 this was not correctly changed to reflect the new class phpbb_notifcation_method_messenger_base. Additionally, an undefined variable error has been fixed in messenger_base.php (change should be confirmed by bantu though). PHPBB3-11488
* | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/11494' into developAndreas Fischer2013-04-141-14/+35
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/11494: [ticket/11494] Filter crawler in first place [ticket/11494] Use functions instead of repeating [ticket/11494] Fix memberlist leaders functional tests
| * | | | | | | [ticket/11494] Filter crawler in first placeJoas Schilling2013-04-151-23/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11494
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-27 08:37:04 +0000