aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12854] Don't show contact page link if board emails are disabledOliver Schramm2014-07-151-2/+2
| | | | PHPBB3-12854
* [prep-release-3.1.0-RC2] Update phpBB Version for RC3 developmentJoas Schilling2014-07-111-1/+1
|
* [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2Joas Schilling2014-07-111-1/+1
|
* Merge pull request #2701 from Nicofuma/ticket/12818Andreas Fischer2014-07-111-2/+2
|\ | | | | | | | | | | | | | | | | | | [ticket/12818] Deleting a log entry in MCP produces a General error * Nicofuma/ticket/12818: [ticket/12818] Use assertGreaterThanOrEqual in the tests [ticket/12818] Don't use the id for i= [ticket/12818] Add tests [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logs
| * [ticket/12818] Fix the conditions in the call to $log->delete() in mcp_logsTristan Darricau2014-07-061-2/+2
| | | | | | | | PHPBB3-12818
* | Merge pull request #2671 from Nicofuma/ticket/12775Andreas Fischer2014-07-113-346/+4
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12775] Replace functions_container with a container_builder class. * Nicofuma/ticket/12775: (34 commits) [ticket/12775] Set dbal.conn.driver as synthetic during installation [ticket/12775] Add the definition of dbal.conn in fixtures/config/services.yml [ticket/12775] Inject the connection when created in the container [ticket/12775] Extract the vars later in install/install_update.php [ticket/12775] Rename config_php_handler to config_php_file container_builder [ticket/12775] Set defined_vars as a property of config_php_file [ticket/12775] Fix doc blocks in the container builder [ticket/12775] Remove useless includes of config.php [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file class [ticket/12775] Fix comments [ticket/12775] Update doc blocks [ticket/12775] Fix container_builder [ticket/12775] Rename config_php to config_php_file [ticket/12775] Renamed to \phpbb\di\container_builder [ticket/12775] Remove the last include of functions_container [ticket/12775] Fix unit tests [ticket/12775] Add tests for \phpbb\config_php [ticket/12775] Add tests for the container factory [ticket/12775] Use a field instead of a local var in load_config_var() [ticket/12775] Update container and config in install/ ...
| * | [ticket/12775] Remove useless includes of config.phpTristan Darricau2014-07-071-3/+1
| | | | | | | | | | | | PHPBB3-12775
| * | [ticket/12775] Move phpbb_convert_30_dbms_to_31 into the config file classTristan Darricau2014-07-072-48/+5
| | | | | | | | | | | | PHPBB3-12775
| * | [ticket/12775] Add tests for the container factoryTristan Darricau2014-07-071-291/+0
| | | | | | | | | | | | PHPBB3-12775
| * | [ticket/12775] Update phpBB/install/database_update.phpTristan Darricau2014-07-071-296/+290
| |/ | | | | | | PHPBB3-12775
* | Merge branch 'develop-olympus' into develop-ascraeusTristan Darricau2014-07-101-0/+1
|\ \ | | | | | | | | | | | | * develop-olympus: [ticket/12695] Add viewtopic language file for parse_attachments in mcp_post
| * | [ticket/12695] Add viewtopic language file for parse_attachments in mcp_postMarc Alexander2014-07-101-0/+1
| | | | | | | | | | | | PHPBB3-12695
* | | [ticket/12804] Dont use ternary formPayBas2014-07-071-1/+1
| | | | | | | | | | | | PHPBB3-12804
* | | [ticket/12804] Hide Jabber from UCP & member search when disabledPayBas2014-07-071-2/+3
| | | | | | | | | | | | PHPBB3-12804
* | | Merge pull request #2697 from n-aleha/ticket/12816Andreas Fischer2014-07-071-1/+1
|\ \ \ | |_|/ |/| | | | | | | | | | | | | | [ticket/12816] Fix comment about logs in user_ban function * n-aleha/ticket/12816: [ticket/12816] Fix comment about logs in user_ban function
| * | [ticket/12816] Fix comment about logs in user_ban functionn-aleha2014-07-051-1/+1
| |/ | | | | | | PHPBB3-12816
* | Merge remote-tracking branch 'github-nicofuma/ticket/12446' into ↵Nils Adermann2014-07-0417-48/+54
|\ \ | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nicofuma/ticket/12446: [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_exts
| * | [ticket/12446] Unnecessary db connect inphpbb_bootstrap_enabled_extsTristan Darricau2014-06-2617-48/+54
| | | | | | | | | | | | PHPBB3-12446
* | | [ticket/12013] Use the correct variable for the forum id.Cesar G2014-07-041-1/+1
| | | | | | | | | | | | PHPBB3-12013
* | | [ticket/12013] Use path helper.Cesar G2014-07-041-4/+5
| | | | | | | | | | | | PHPBB3-12013
* | | [ticket/12013] Use new dropdown for quickmod tools and jumpbox.Cesar G2014-07-041-7/+11
| | | | | | | | | | | | PHPBB3-12013
* | | Merge remote-tracking branch 'PayBas/ticket/12662' into develop-ascraeusCesar G2014-07-032-2/+3
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PayBas/ticket/12662: (29 commits) [ticket/12662] Hide quick-links when empty [ticket/12662] Fix white-space issue to make dropdowns uniform [ticket/12662] Remove last remaining linklist outside navbars [ticket/12662] Use data-last-responsive attr instead of hardcoded list [ticket/12662] Remove <li> container from logged_out_content event [ticket/12662] Username <span> fix for list columns [ticket/12662] Fix notifications dropdown positioning for RTL [ticket/12662] Update tests that utilize get_username_string [ticket/12662] Update subsilver2 index template event names [ticket/12662] Update events docs from b5 to rc1/rc2 [ticket/12662] Move dropdown container from <li> to new inner div [ticket/12662] Remove linklist container and update template events [ticket/12662] Add span containers to all usernames for consistency [ticket/12662] IE8 fixes [ticket/12662] Fix responsive positioning of notifications dropdown [ticket/12662] Remove inherited props from ddown-extendended [ticket/12662] Change CSS selectors to direct descendants for linklist [ticket/12662] Reorder icon CSS rules alphabetically [ticket/12662] Use slack variable to determine line-break sensitivity [ticket/12662] Change new event names and fix events.md ...
| * | | [ticket/12662] Add span containers to all usernames for consistencyPayBas2014-06-251-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12662
| * | | [ticket/12662] Improve template checksPayBas2014-06-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | And changed _CLEAN to _SIMPLE, and move teamlink events PHPBB3-12662
| * | | [ticket/12662] Initial setupPayBas2014-06-251-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12662
* | | | Merge pull request #2674 from Nicofuma/ticket/12784Joas Schilling2014-07-031-0/+31
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12784] Allow the extensions to add a custom auto loader * Nicofuma/ticket/12784: [ticket/12784] Shearch the "vendor" folders and then the autoload.php files [ticket/12784] Allow the extensions to add a custom auto loader
| * | | | [ticket/12784] Shearch the "vendor" folders and then the autoload.php filesTristan Darricau2014-07-031-3/+7
| | | | | | | | | | | | | | | | | | | | PHPBB3-12784
| * | | | [ticket/12784] Allow the extensions to add a custom auto loaderTristan Darricau2014-07-011-0/+27
| | | | | | | | | | | | | | | | | | | | PHPBB3-12784
* | | | | [ticket/12674] Use user's colour in 'Last edited' line in sent PMsOliver Schramm2014-06-301-1/+10
| | | | | | | | | | | | | | | | | | | | PHPBB3-12674
* | | | | Merge pull request #2669 from Nicofuma/ticket/12777Joas Schilling2014-06-291-6/+6
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12777] Rename extension status functions and add is_configured() * Nicofuma/ticket/12777: [ticket/12777] Add tests for unavailable extension [ticket/12777] Add tests [ticket/12777] Add is_purged() [ticket/12777] Update doc block of is_configured() [ticket/12777] Rename extension status functions and add is_configured()
| * | | | [ticket/12777] Rename extension status functions and add is_configured()Tristan Darricau2014-06-271-6/+6
| | |/ / | |/| | | | | | | | | | PHPBB3-12777
* | | | [ticket/12196] Fix typo in "referrer"Joas Schilling2014-06-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Referer is a typo in the HTTP RFC and should not be used in the UI PHPBB3-12196
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-261-1/+1
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * develop-olympus: [ticket/12196] Revert Fix typo "referer" in acp/attachments
| * | | [ticket/12196] Revert Fix typo "referer" in acp/attachmentsDhruv2014-06-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2. https://tracker.phpbb.com/browse/PHPBB3-12196 PHPBB3-12196
* | | | Merge branch 'develop-olympus' into develop-ascraeusDhruv2014-06-261-1/+1
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | | | | | | # By Joas Schilling # Via Dhruv (1) and Joas Schilling (1) * develop-olympus: [ticket/12196] Fix typo "referer" in acp/attachments
| * | [ticket/12196] Fix typo "referer" in acp/attachmentsJoas Schilling2014-06-251-1/+1
| | | | | | | | | | | | PHPBB3-12196
* | | Merge pull request #2567 from Crizz0/ticket/12680Joas Schilling2014-06-251-0/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Ticket/12680] - Adds alternative text to contact icon in viewtopic.php * Crizz0/ticket/12680: [ticket/12680] Adds variable for guest user [ticket/12680] Brings back get_username_string() [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname [ticket/12680] Still some problems with displaying the nickname in ucp [ticket/12680] Little changes, but some issues are still there [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER [ticket/12680] Adds alternativ text with new variable to contact: [ticket/12680] Adds second alternativ text and font-size: 0 to remove text [ticket/12680] Adds alternative text to contact icon in viewtopic.php
| * | | [ticket/12680] Solves last bugs. viewprofile: contact --> contact nicknameCrizzo2014-06-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12680
| * | | [ticket/12680] Still some problems with displaying the nickname in ucpCrizzo2014-06-151-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12680
| * | | [ticket/12680] Little changes, but some issues are still thereCrizzo2014-06-141-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12680
* | | | Merge pull request #2649 from VSEphpbb/ticket/12760Joas Schilling2014-06-251-1/+1
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | [ticket/12760] Fix wording for unapproved posts icon... * VSEphpbb/ticket/12760: [ticket/12760] Fix wording for unapproved posts icon...
| * | | [ticket/12760] Fix wording for unapproved posts icon...Matt Friedman2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | in last post column of forum lists. https://tracker.phpbb.com/browse/PHPBB3-12760 PHPBB3-12760
* | | | [prep-release-3.1.0-RC1] Update phpBB Version for RC2 developmentJoas Schilling2014-06-251-1/+1
| | | |
* | | | [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1Joas Schilling2014-06-241-1/+1
| | | |
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-241-2/+29
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| | | | | | | | | | | | | * develop-olympus: [ticket/12755] Apply de morgan to conditional [ticket/12755] Terminate upload loop if upload reaches filesize [ticket/12755] Change upload in remote_upload() method to fit get_remote_file [ticket/12755] Add language string for timed out remote upload [ticket/12755] Add timeout to remote upload to prevent infinite loop
| * | [ticket/12755] Apply de morgan to conditionalMarc Alexander2014-06-241-1/+1
| | | | | | | | | | | | PHPBB3-12755
| * | [ticket/12755] Terminate upload loop if upload reaches filesizeMarc Alexander2014-06-241-2/+12
| | | | | | | | | | | | | | | | | | | | | Terminate the upload loop if the expected filesize has been reached instead of trying to read more bytes until the timeout has been reached. PHPBB3-12755
| * | [ticket/12755] Change upload in remote_upload() method to fit get_remote_fileMarc Alexander2014-06-241-12/+14
| | | | | | | | | | | | PHPBB3-12755
| * | [ticket/12755] Add language string for timed out remote uploadMarc Alexander2014-06-231-1/+1
| | | | | | | | | | | | PHPBB3-12755
| * | [ticket/12755] Add timeout to remote upload to prevent infinite loopMarc Alexander2014-06-211-0/+15
| | | | | | | | | | | | PHPBB3-12755