aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11321] Recreate schema files with develop/create_schema_files.phpJoas Schilling2013-01-117-10/+10
| | | | PHPBB3-11321
* Merge PR #1181 branch 'marc1706/ticket/11313' into developOleg Pudeyev2013-01-091-1/+1
|\ | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/11313: [ticket/11313] Use correct object el instead of eel in alt_text callback
| * [ticket/11313] Use correct object el instead of eel in alt_text callbackMarc Alexander2013-01-081-1/+1
| | | | | | | | | | | | | | | | This typo was added by the PRs #860 and #1178. Only the object el exists and is correct. Due to this the text of links using the alt_text callback were not modified while executing the callback. PHPBB3-11313
* | Merge PR #1182 branch 'develop-olympus' into developOleg Pudeyev2013-01-091-1/+1
|\ \ | |/ |/| | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Oleg Pudeyev (1) * develop-olympus: [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
| * Merge PR #1182 branch 'bantu/ticket/11301' into develop-olympusOleg Pudeyev2013-01-091-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11301: [ticket/11301] Guidelines: Add spaces in front and after the / operator. [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.
| | * [ticket/11301] Guidelines: Add spaces in front and after the / operator.Andreas Fischer2013-01-081-1/+1
| | | | | | | | | | | | PHPBB3-11301
| | * [ticket/11301] Explicitly cast str offset to int to prevent E_NOTICE on 5.4.Andreas Fischer2013-01-081-1/+1
| |/ | | | | | | PHPBB3-11301
* | Merge PR #1178 branch 'marc1706/ticket/10949' into developOleg Pudeyev2013-01-086-226/+174
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander (2) and Callum Macrae (1) # Via Marc Alexander * marc1706/ticket/10949: [ticket/10949] Remove not needed comma [ticket/10949] Converted missing code to new JS coding guidelines [ticket/10949] Converted AJAX coding standards to new guidelines.
| * | [ticket/10949] Remove not needed commaMarc Alexander2013-01-051-1/+1
| | | | | | | | | | | | | | | | | | This comma might actually cause issues in browser. Therefore remove it. PHPBB3-10949
| * | [ticket/10949] Converted missing code to new JS coding guidelinesMarc Alexander2013-01-046-97/+89
| | | | | | | | | | | | | | | | | | A few missing semi-colons were also added where needed. PHPBB3-10949
| * | Merge remote-tracking branch 'callumacrae/ticket/10949' into ticket/10949Marc Alexander2013-01-042-129/+85
| |\ \ | | | | | | | | | | | | | | | | Conflicts: phpBB/assets/javascript/core.js
| | * | [ticket/10949] Converted AJAX coding standards to new guidelines.Callum Macrae2012-06-212-132/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Basically, moved parentheses to same line and changed variable names to camel case. PHPBB3-10949
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-061-0/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * develop-olympus: [ticket/11292] Fix: Newlines removed in display of PM reports
| * | | Merge remote-tracking branch 'gn36/ticket/11292' into develop-olympusAndreas Fischer2013-01-061-0/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * gn36/ticket/11292: [ticket/11292] Fix: Newlines removed in display of PM reports
| | * | | [ticket/11292] Fix: Newlines removed in display of PM reportsMartin Beckmann2012-12-241-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report text is run through make_clickable and bbcode_nl2br for PMs just as it is for posts. PHPBB3-11292
* | | | | Merge remote-tracking branch 'marc1706/ticket/11311' into developAndreas Fischer2013-01-061-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * marc1706/ticket/11311: [ticket/11311] Include asset core.js in subsilver2 overall_footer.html
| * | | | | [ticket/11311] Include asset core.js in subsilver2 overall_footer.htmlMarc Alexander2013-01-051-0/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Without the inclusion of core.js the timezone functions will not properly work. They refer to phpbb which is defined in core.js. PHPBB3-11311
* | | | | Merge PR #1177 branch 'erikfrerejean/ticket/11309' into developOleg Pudeyev2013-01-041-1/+3
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | # By Erik Frèrejean # Via Erik Frèrejean * erikfrerejean/ticket/11309: [ticket/11309] phpbb_extension_interface::disable_step correct docblock.
| * | | | [ticket/11309] phpbb_extension_interface::disable_step correct docblock.Erik Frèrejean2013-01-041-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | The `@return` documentation of the `phpbb_extension_interface::disable_step` method states incorrect that the method returns null, as it returns false or a state. PHPBB3-11309
* | | | Merge remote-tracking branch 'erikfrerejean/ticket/11283' into developAndreas Fischer2013-01-031-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * erikfrerejean/ticket/11283: [ticket/11283] Extension manager follow symlinks.
| * | | | [ticket/11283] Extension manager follow symlinks.Erik Frèrejean2012-12-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All extensions are located in the `phpBB/ext` directory, however the `phpbb_extension_manager::all_available()` method only looks into actual directories and ignores symlinks. Add the `RecursiveDirectoryIterator::FOLLOW_SYMLINKS` flag to the `new RecursiveDirectoryIterator` call so that you can store extensions in a different location and use symlinks so that phpBB can recognise them. PHPBB3-11283
* | | | | Merge PR #1153 branch 'marc1706/ticket/10805' into developOleg Pudeyev2013-01-021-1/+15
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/10805: [ticket/10805] Compare phpbbAlertTimer against null [ticket/10805] Clear loading alert timeout after ajax request finished
| * | | | | [ticket/10805] Compare phpbbAlertTimer against nullMarc Alexander2013-01-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10805
| * | | | | [ticket/10805] Clear loading alert timeout after ajax request finishedMarc Alexander2013-01-011-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The timeout for the "request timed out" popup should be cleared if it finished. Since it is currently not cleared, the timeout alert appears as an extra overlay if another ajaxified function is ran within 5 seconds of the initial function call. This patch will take care of clearing the timeout if either the success (function return_handler()) or error (function error_handler()) functions are called. PHPBB3-10805
* | | | | | Merge PR #1176 branch 'marc1706/ticket/11302' into developOleg Pudeyev2013-01-022-4/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Marc Alexander # Via Marc Alexander * marc1706/ticket/11302: [ticket/11302] Correctly select first timezone or selected timezone
| * | | | | | [ticket/11302] Correctly select first timezone or selected timezoneMarc Alexander2013-01-022-4/+4
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While registering, we should default to a given timezone. By selecting the first timezone by default, this is fulfilled. This doesn't happen currently, as only the "Select a timezone" selection appears. If a user selects a timezone during the registration process we should also make sure that the selected element is still selected; even if we have to return to the registration page, i.e. if there was an error while submitting the form. This is currently not the case. With this patch the javascript code will behave correctly. Additionally, a duplicate inclusion of timezone.js has been removed as it was not needed. PHPBB3-11302
* | | | | | Merge remote-tracking branch 'p/ticket/11305' into developIgor Wiedler2013-01-0220-87/+163
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11305: [ticket/11305] Mock container for cache driver in functional create_user() [ticket/11305] Check for $cache being null before using it in db drivers. [ticket/11305] Define hook finder as a service on the container. [ticket/11305] Adjust comment. [ticket/11305] Use phpbb_create_default_container. [ticket/11305] Create a normal container during final installation step. [ticket/11305] Retrieve cache driver from container rather than cache service. [ticket/11305] Extract hook finder from cache service.
| * | | | | | [ticket/11305] Mock container for cache driver in functional create_user()Igor Wiedler2013-01-021-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | create_user has calls to fetch the cache driver from the container. This PR mocks the container and returns a null cache driver in that case. PHPBB3-11305
| * | | | | | [ticket/11305] Check for $cache being null before using it in db drivers.Oleg Pudeyev2013-01-0210-41/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no reason why db drivers must have a cache to work. They query the database, that part works without caches. PHPBB3-11305
| * | | | | | [ticket/11305] Define hook finder as a service on the container.Oleg Pudeyev2013-01-024-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11305
| * | | | | | [ticket/11305] Adjust comment.Oleg Pudeyev2013-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11305
| * | | | | | [ticket/11305] Use phpbb_create_default_container.Oleg Pudeyev2013-01-021-12/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11305
| * | | | | | [ticket/11305] Create a normal container during final installation step.Oleg Pudeyev2013-01-022-5/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The final step calls a bunch of code which expects a full phpBB runtime environment. Also, by this step everything should be configured and database schema set up. Therefore, in the final step replace installer container with a normal phpBB container. PHPBB3-11305
| * | | | | | [ticket/11305] Retrieve cache driver from container rather than cache service.Oleg Pudeyev2013-01-024-9/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only covers some of the call sites. PHPBB3-11305
| * | | | | | [ticket/11305] Extract hook finder from cache service.Oleg Pudeyev2013-01-025-33/+90
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Unlike most other things in cache service, hook finder does not need a database connection. PHPBB3-11305
* | | | | | Merge PR #1175 branch 'igorw/ticket/11306' into developOleg Pudeyev2013-01-024-36/+60
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Igor Wiedler # Via Igor Wiedler * igorw/ticket/11306: [ticket/11306] Add docblocks to all container related functions [ticket/11306] Introduce phpbb_create_default_container
| * | | | | | [ticket/11306] Add docblocks to all container related functionsIgor Wiedler2013-01-021-0/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11306
| * | | | | | [ticket/11306] Introduce phpbb_create_default_containerIgor Wiedler2013-01-024-36/+19
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extracts default container construction to factory function, removing boilerplate duplication for container construction. PHPBB3-11306
* | | | | | Merge remote-tracking branch 'p/ticket/11037' into developAndreas Fischer2012-12-314-46/+77
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11037: [ticket/11037] Fix unit tests. [ticket/11037] Update services.yml. [ticket/11037] Add/update docblocks. [ticket/11037] Eliminate globals from cache service.
| * | | | | | [ticket/11037] Fix unit tests.Oleg Pudeyev2012-12-292-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11037
| * | | | | | [ticket/11037] Update services.yml.Oleg Pudeyev2012-12-261-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11037
| * | | | | | [ticket/11037] Add/update docblocks.Oleg Pudeyev2012-12-261-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11037
| * | | | | | [ticket/11037] Eliminate globals from cache service.Oleg Pudeyev2012-12-241-42/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11037
* | | | | | | Merge remote-tracking branch 'p/ticket/11188' into developAndreas Fischer2012-12-311-5/+48
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11188: [ticket/11188] Reduce waste. [ticket/11188] add result count query for author search [ticket/11188] add count query to postgres search
| * | | | | | | [ticket/11188] Reduce waste.Oleg Pudeyev2012-12-301-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11188
| * | | | | | | [ticket/11188] add result count query for author searchDhruv2012-12-301-1/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11188
| * | | | | | | [ticket/11188] add count query to postgres searchDhruv2012-12-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11188
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-12-311-0/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | / / / | | |_|_|/ / / | |/| | | | | * develop-olympus: [ticket/11293] Add a note that mysqli should be in front of mysql.
| * | | | | | Merge remote-tracking branch 'p/ticket/11293' into develop-olympusAndreas Fischer2012-12-311-0/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11293: [ticket/11293] Add a note that mysqli should be in front of mysql.
| | * | | | | | [ticket/11293] Add a note that mysqli should be in front of mysql.Oleg Pudeyev2012-12-251-0/+2
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | php 5.5 alpha 2 deprecated mysql extension, prefer mysqli if both are available. PHPBB3-11293