aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1361 from MGaetan89/ticket/11471Nils Adermann2013-04-2520-54/+10
|\ | | | | [ticket/11471] Unrelated text in e-mail templates
| * [ticket/11471] Unrelated text in e-mail templatesGaëtan Muller2013-04-2420-54/+10
| | | | | | | | | | | | | | Some e-mail templates contain text unrelated with the subject of the e-mail PHPBB3-11471
* | Merge pull request #1368 from EXreaction/ticket/11479Nils Adermann2013-04-251-1/+7
|\ \ | | | | | | [ticket/11479] Fix install/update (rebuild container)
| * | [ticket/11479] Use phpbb_create_default_containerNathan Guse2013-04-241-12/+1
| | | | | | | | | | | | PHPBB3-11479
| * | [ticket/11479] Fix install/update (rebuild container)Nathaniel Guse2013-04-241-1/+18
| |/ | | | | | | | | | | Code copied from fix in 11305 PHPBB3-11479
* | Merge pull request #1369 from EXreaction/ticket/11335Nils Adermann2013-04-2517-40/+40
|\ \ | | | | | | Ticket/11335
| * | [ticket/11335] Replace "$phpEx" with $phpExNathaniel Guse2013-04-245-8/+8
| | | | | | | | | | | | PHPBB3-11335
| * | [ticket/11335] (more) Make php_ext 'php' not '.php'Nathan Guse2013-04-241-1/+1
| | | | | | | | | | | | PHPBB3-11335
| * | [ticket/11335] (more class loader) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-7/+7
| | | | | | | | | | | | PHPBB3-11335
| * | [ticket/11335] (avatars) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-9/+9
| | | | | | | | | | | | PHPBB3-11335
| * | [ticket/11335] (kernel request subscriber) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-4/+4
| | | | | | | | | | | | PHPBB3-11335
| * | [ticket/11335] (hook finder) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-2/+2
| | | | | | | | | | | | PHPBB3-11335
| * | [ticket/11335] (extension manager/finder) Make php_ext 'php' not '.php'Nathan Guse2013-04-244-9/+9
| | | | | | | | | | | | PHPBB3-11335
| * | [ticket/11335] (controller/helper.php) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-2/+2
| | | | | | | | | | | | PHPBB3-11335
| * | [ticket/11335] (class loader) Make php_ext 'php' not '.php'Nathan Guse2013-04-242-6/+6
| | | | | | | | | | | | PHPBB3-11335
* | | Merge pull request #1367 from EXreaction/ticket/11454Nils Adermann2013-04-2513-22/+39
|\ \ \ | |/ / |/| | Ticket/11454 - Jabber notifications are not working at all
| * | [ticket/11454] Check if the fields are setNathaniel Guse2013-04-241-4/+4
| | | | | | | | | | | | PHPBB3-11454
| * | [ticket/11454] Use set_addresses in other applicable areasNathan Guse2013-04-2410-20/+13
| | | | | | | | | | | | | | | | | | | | | | | | This should fix some other bugs that may not have yet been recognized--some areas only set to(), but sent according to user_notify_type, which is not necessarily email. PHPBB3-11454
| * | [ticket/11454] Add messenger function set_addressesNathaniel Guse2013-04-242-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | Automatically fills to/im from a user row Send messenger the Jabber address if using Jabber notifications PHPBB3-11454
| * | [ticket/11454] Correct jabber global available checkNathaniel Guse2013-04-241-1/+7
| |/ | | | | | | | | | | Copied from msg_jabber() PBPBB3-11454
* | 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-246-5/+9
|\ \ | | | | | | | | | | | | | | | | | | | | | * 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-237-6/+11
| |/ | | | | | | | | | | 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
| * | [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-244-3/+22
|\ \ \ \ | | | | | | | | | | Ticket/10844 Extensions are not located when front-end file has a diffferent phpbb_root_path
| * | | | [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-246-21/+88
|\ \ \ \ \ | |_|_|_|/ |/| | | | 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-172-2/+5
| | | | | | | | | | | | | | | | | | | | 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-173-30/+56
| | | | | | | | | | | | | | | | | | | | 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
* | | | | [ticket/10966] Introduce MSSQL base class for native and ODBCJoas Schilling2013-04-193-86/+67
| | | | | | | | | | | | | | | | | | | | PHPBB3-10966
* | | | | [ticket/10966] Introduce MySQL base classJoas Schilling2013-04-173-246/+148
| | | | | | | | | | | | | | | | | | | | PHPBB3-10966
* | | | | [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 'hjpotter92/ticket/11225' into developAndreas Fischer2013-04-131-19/+0
|\ \ \ \ \ | |_|/ / / |/| | | | | | | | | | | | | | * hjpotter92/ticket/11225: [ticket/11225] Deletion of unused mcp_jumpbox.html file
| * | | | [ticket/11225] Deletion of unused mcp_jumpbox.html filehjpotter922013-04-111-19/+0
| | |/ / | |/| | | | | | | | | | | | | | | | | | The file/template is no longer used(as mentioned in it). PHPBB3-11225
* | | | Merge pull request #1184 from marc1706/ticket/11314Nils Adermann2013-04-1212-866/+511
|\ \ \ \ | | | | | | | | | | [ticket/11314] Improve readability and code cleanup in new JavaScript files
| * \ \ \ Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11314Marc Alexander2013-03-26179-2512/+12719
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: phpBB/styles/prosilver/template/timezone.js
| * | | | | [ticket/11314] Modify files to comply with coding standardsMarc Alexander2013-03-268-734/+352
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11314
generated by cgit v1.2.1 (git 2.21.0) at 2026-01-04 10:17:44 +0000