aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* [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
* | | [ticket/12612] Prefix check_ids() with phpbb_Joas Schilling2014-06-236-17/+17
| | | | | | | | | | | | PHPBB3-12612
* | | [ticket/12612] Prefix mcp_sorting() with phpbb_Joas Schilling2014-06-236-7/+7
| | | | | | | | | | | | PHPBB3-12612
* | | [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused globalJoas Schilling2014-06-239-38/+38
| | | | | | | | | | | | PHPBB3-12612
* | | [ticket/12612] Prefix module url functions with phpbb_Joas Schilling2014-06-234-27/+31
| | | | | | | | | | | | PHPBB3-12612
* | | [ticket/12612] Prefix upload_popup() with phpbb_Joas Schilling2014-06-231-1/+1
| | | | | | | | | | | | PHPBB3-12612
* | | [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused globalJoas Schilling2014-06-231-2/+2
| | | | | | | | | | | | PHPBB3-12612
* | | [ticket/12612] Prefix custom UCP module function with phpbb_Joas Schilling2014-06-232-2/+10
| | | | | | | | | | | | PHPBB3-12612
* | | [ticket/12612] Prefix _sort_last_active() with phpbb_Joas Schilling2014-06-231-1/+1
| | | | | | | | | | | | PHPBB3-12612
* | | [ticket/12612] Prefix show_profile() with phpbb and delete unused globalJoas Schilling2014-06-231-2/+2
| | | | | | | | | | | | PHPBB3-12612
* | | Merge pull request #2574 from lucifer4o/ticket/12690Joas Schilling2014-06-231-0/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12690] Add core.submit_pm_after event * lucifer4o/ticket/12690: [ticket/12690] Find a space [ticket/12690] Remove $msg_id and chmod [ticket/12690] Add other info to core.submit_pm_after [ticket/12690] Add core.submit_pm_after event
| * | | [ticket/12690] Find a spaceStanislav Atanasov2014-06-221-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Lost a spce there ... found it ... PHPBB3-12690
| * | | [ticket/12690] Remove $msg_id and chmodStanislav Atanasov2014-06-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove inneded $msg_id Chmod file to 644 PHPBB3-12690
| * | | [ticket/12690] Add other info to core.submit_pm_afterStanislav Atanasov2014-06-221-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added $mode Added $subject Added $data Added $pm_data PHPBB3-12690
| * | | [ticket/12690] Add core.submit_pm_after eventStanislav Atanasov2014-06-221-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add core.submit_pm_after to funtion submit_pm. Event will return just submited msg_id. It should be plased just before return $data['msg_id']; Justification: Using only core.submit_pm_before does not allow to follow up after message submission. The message ID is recieved at DB submission. Some times we need the MSG_ID as identifier PHPBB3-12690
* | | | Merge pull request #2571 from Crizz0/ticket/12563Dhruv Goel2014-06-231-2/+2
|\ \ \ \ | | | | | | | | | | [ticket/12563] Changes 2 style specific language variables for better understanding
| * | | | [ticket/12563] Adds « and » to the links in acp_styles.phpCrizzo2014-06-221-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12563
| * | | | [ticket/12563] Removes strintf in acp_styles.php and shorts up <a>Crizzo2014-06-121-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12563
| * | | | [ticket/12563] Changes 2 language variables to better understandable namesCrizzo2014-06-101-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12563
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12612-ascraeus' ↵Nils Adermann2014-06-234-0/+983
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into develop-ascraeus * github-nickvergessen/ticket/12612-ascraeus: [ticket/12612] Move functions from mcp.php to functions_mcp.php [ticket/12612] Move function from ucp.php to functions_user.php [ticket/12612] Move functions from memberlist.php to functions_display.php [ticket/12612] Move functions from posting.php to functions_posting.php
| * | | | | [ticket/12612] Move functions from mcp.php to functions_mcp.phpJoas Schilling2014-06-181-0/+666
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12612
| * | | | | [ticket/12612] Move function from ucp.php to functions_user.phpJoas Schilling2014-06-181-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12612
| * | | | | [ticket/12612] Move functions from memberlist.php to functions_display.phpJoas Schilling2014-06-181-0/+163
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12612
| * | | | | [ticket/12612] Move functions from posting.php to functions_posting.phpJoas Schilling2014-06-181-0/+134
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12612
* | | | | | [ticket/12761] Remove the execute bit from functions_user.phpn-aleha2014-06-231-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12761
* | | | | | Merge pull request #2629 from nickvergessen/ticket/12747Andreas Fischer2014-06-229-367/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12747] Drop support for Firebird * nickvergessen/ticket/12747: [ticket/12747] Remove some methods which are not used anymore [ticket/12747] Drop support for Firebird Conflicts: phpBB/phpbb/db/driver/firebird.php
| * | | | | | [ticket/12747] Drop support for FirebirdJoas Schilling2014-06-209-367/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12747
* | | | | | | Merge pull request #2591 from rxu/ticket/12704Joas Schilling2014-06-221-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12704] Improve the load time information in the footer when enabled * rxu/ticket/12704: [ticket/12704] Improve the load time information in the footer when enabled
| * | | | | | | [ticket/12704] Improve the load time information in the footer when enabledrxu2014-06-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PR #2570 has added new constant to display load time information without debug mode is being on (https://tracker.phpbb.com/browse/PHPBB3-12687). This patch expands the total load time info with SQL/PHP load times, while hiding the additional info with <abbr> element. PHPBB3-12704