aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/12645] Replace support links in SUPPORT_BODY with 3.1 linksJoas Schilling2014-06-271-1/+1
| | | | PHPBB3-12645
* Merge pull request #2665 from nickvergessen/ticket/12196-ascraeusAndreas Fischer2014-06-263-4/+4
|\ | | | | | | | | | | | | [ticket/12196] Fix typo in "referrer" * nickvergessen/ticket/12196-ascraeus: [ticket/12196] Fix typo in "referrer"
| * [ticket/12196] Fix typo in "referrer"Joas Schilling2014-06-263-4/+4
| | | | | | | | | | | | 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-262-3/+3
| |\ | | | | | | | | | | | | * develop-olympus: [ticket/12196] Revert Fix typo "referer" in acp/attachments
| | * [ticket/12196] Revert Fix typo "referer" in acp/attachmentsDhruv2014-06-272-3/+3
| | | | | | | | | | | | | | | | | | | | | This reverts commit 9bc1f7924d5ef00fb988b81347d4c5c730b25eb2. https://tracker.phpbb.com/browse/PHPBB3-12196 PHPBB3-12196
| * | Merge branch 'develop-olympus' into develop-ascraeusDhruv2014-06-262-3/+3
| |\ \ | | |/ | | | | | | | | | | | | | | | # 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-252-3/+3
| | | | | | | | | | | | PHPBB3-12196
* | | [ticket/12773] Fix language variable name in cli extension enable commandn-aleha2014-06-261-1/+1
|/ / | | | | | | PHPBB3-12773
* | Merge remote-tracking branch 'nickvergessen/ticket/12099' into develop-ascraeusMarc Alexander2014-06-262-20/+13
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/12099: [ticket/12099] Fix correction in path_helper test [ticket/12099] Prepend ./ to path to fix assets [ticket/12099] Deduplicate path generation [ticket/12099] Fix clean_path() ".." stripping when previous directory was "." [ticket/12099] Break clean_path tests with a simple test [ticket/12099] Clean paths in tests [ticket/12099] Correctly fix go back to root before prepending the root path [ticket/12099] Clean some paths before using them [ticket/12099] Fix several issues in path_helper test
| * | [ticket/12099] Prepend ./ to path to fix assetsJoas Schilling2014-06-091-2/+4
| | | | | | | | | | | | PHPBB3-12099
| * | [ticket/12099] Deduplicate path generationJoas Schilling2014-06-091-20/+7
| | | | | | | | | | | | PHPBB3-12099
| * | [ticket/12099] Fix clean_path() ".." stripping when previous directory was "."Joas Schilling2014-05-291-1/+1
| | | | | | | | | | | | PHPBB3-12099
| * | [ticket/12099] Correctly fix go back to root before prepending the root pathJoas Schilling2014-05-291-9/+13
| | | | | | | | | | | | | | | | | | This allows moving app.php outside of phpBB and still work as expected PHPBB3-12099
| * | [ticket/12099] Clean some paths before using themJoas Schilling2014-05-291-2/+2
| | | | | | | | | | | | PHPBB3-12099
* | | [ticket/12462] Do not use string "None" for different optionsJoas Schilling2014-06-256-5/+6
| | | | | | | | | | | | | | | | | | ... it limits translations. PHPBB3-12462
* | | Merge pull request #2567 from Crizz0/ticket/12680Joas Schilling2014-06-256-5/+9
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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] Adds variable for guest userCrizzo2014-06-231-0/+1
| | | | | | | | | | | | | | | | PHPBB3-12680
| * | | [ticket/12680] Brings back get_username_string()Crizzo2014-06-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12680
| * | | [ticket/12680] Solves last bugs. viewprofile: contact --> contact nicknameCrizzo2014-06-232-2/+1
| | | | | | | | | | | | | | | | PHPBB3-12680
| * | | [ticket/12680] Still some problems with displaying the nickname in ucpCrizzo2014-06-152-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12680
| * | | [ticket/12680] Little changes, but some issues are still thereCrizzo2014-06-143-4/+5
| | | | | | | | | | | | | | | | PHPBB3-12680
| * | | [ticket/12680] Removes unnessesary $user->lang from CONTACT_USERCrizzo2014-06-101-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12680
| * | | [ticket/12680] Adds alternativ text with new variable to contact:Crizzo2014-06-102-1/+3
| | | | | | | | | | | | | | | | PHPBB3-12680
| * | | [ticket/12680] Adds second alternativ text and font-size: 0 to remove textCrizzo2014-06-092-10/+3
| | | | | | | | | | | | | | | | PHPBB3-12680
| * | | [ticket/12680] Adds alternative text to contact icon in viewtopic.phpCrizzo2014-06-092-1/+9
| | | | | | | | | | | | | | | | PHPBB3-12680
* | | | Merge pull request #2649 from VSEphpbb/ticket/12760Joas Schilling2014-06-252-1/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [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-242-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | in last post column of forum lists. https://tracker.phpbb.com/browse/PHPBB3-12760 PHPBB3-12760
* | | | | [ticket/12766] Event exporter does not like RCx as versionPayBas2014-06-252-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-12766
* | | | | [prep-release-3.1.0-RC1] Update phpBB Version for RC2 developmentJoas Schilling2014-06-252-2/+2
| | | | |
* | | | | [prep-release-3.1.0-RC1] Add changelog for 3.1.0-RC1Joas Schilling2014-06-241-0/+118
| | | | |
* | | | | [prep-release-3.1.0-RC1] Prepare ChangelogJoas Schilling2014-06-241-28/+31
| | | | |
* | | | | [prep-release-3.1.0-RC1] Add migration for 3.1.0-RC1Joas Schilling2014-06-241-0/+39
| | | | |
* | | | | [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1Joas Schilling2014-06-245-7/+7
| | | | |
* | | | | Merge pull request #2648 from dhruvgoel92/ticket/12562Andreas Fischer2014-06-242-6/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert "[ticket/12562] Add max-width to proSilver" * dhruvgoel92/ticket/12562: [ticket/12562] Revert "Add max-width to proSilver"
| * | | | | [ticket/12562] Revert "Add max-width to proSilver"Dhruv2014-06-252-6/+4
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | https://tracker.phpbb.com/browse/PHPBB3-12562 PHPBB3-12562
* | | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-243-2/+31
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | | | | | | | | | | | | | | | | * 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-233-1/+3
| | | | | | | | | | | | | | | | PHPBB3-12755
| * | | [ticket/12755] Add timeout to remote upload to prevent infinite loopMarc Alexander2014-06-211-0/+15
| | | | | | | | | | | | | | | | PHPBB3-12755
* | | | Merge pull request #2646 from prototech/ticket/12750Andreas Fischer2014-06-242-2/+6
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12750] Center installation page copyright text. * prototech/ticket/12750: [ticket/12750] Center installation page copyright text.
| * | | | [ticket/12750] Center installation page copyright text.Cesar G2014-06-242-2/+6
| | | | | | | | | | | | | | | | | | | | PHPBB3-12750
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12612' into ↵Nils Adermann2014-06-2416-97/+109
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-ascraeus * github-nickvergessen/ticket/12612: [ticket/12612] Prefix check_ids() with phpbb_ [ticket/12612] Prefix mcp_sorting() with phpbb_ [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused global [ticket/12612] Prefix module url functions with phpbb_ [ticket/12612] Prefix upload_popup() with phpbb_ [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused global [ticket/12612] Prefix custom UCP module function with phpbb_ [ticket/12612] Prefix _sort_last_active() with phpbb_ [ticket/12612] Prefix show_profile() with phpbb and delete unused global
| * | | | | [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-2310-39/+39
| | | | | | | | | | | | | | | | | | | | | | | | 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-232-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12612
| * | | | | [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused globalJoas Schilling2014-06-232-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12612