aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'nickvergessen/ticket/12099' into develop-ascraeusMarc Alexander2014-06-264-36/+38
|\
| * [ticket/12099] Fix correction in path_helper testJoas Schilling2014-06-101-7/+11
| * [ticket/12099] Prepend ./ to path to fix assetsJoas Schilling2014-06-091-2/+4
| * [ticket/12099] Deduplicate path generationJoas Schilling2014-06-091-20/+7
| * [ticket/12099] Fix clean_path() ".." stripping when previous directory was "."Joas Schilling2014-05-291-1/+1
| * [ticket/12099] Break clean_path tests with a simple testJoas Schilling2014-05-291-0/+2
| * [ticket/12099] Clean paths in testsJoas Schilling2014-05-291-14/+16
| * [ticket/12099] Correctly fix go back to root before prepending the root pathJoas Schilling2014-05-291-9/+13
| * [ticket/12099] Clean some paths before using themJoas Schilling2014-05-291-2/+2
| * [ticket/12099] Fix several issues in path_helper testJoas Schilling2014-05-291-3/+4
* | Merge remote-tracking branch 'nickvergessen/ticket/12462' into develop-ascraeusMarc Alexander2014-06-256-5/+6
|\ \
| * | [ticket/12462] Do not use string "None" for different optionsJoas Schilling2014-06-256-5/+6
|/ /
* | Merge pull request #2567 from Crizz0/ticket/12680Joas Schilling2014-06-256-5/+9
|\ \
| * | [ticket/12680] Adds variable for guest userCrizzo2014-06-231-0/+1
| * | [ticket/12680] Brings back get_username_string()Crizzo2014-06-231-1/+1
| * | [ticket/12680] Solves last bugs. viewprofile: contact --> contact nicknameCrizzo2014-06-232-2/+1
| * | [ticket/12680] Still some problems with displaying the nickname in ucpCrizzo2014-06-152-2/+2
| * | [ticket/12680] Little changes, but some issues are still thereCrizzo2014-06-143-4/+5
| * | [ticket/12680] Removes unnessesary $user->lang from CONTACT_USERCrizzo2014-06-101-1/+1
| * | [ticket/12680] Adds alternativ text with new variable to contact:Crizzo2014-06-102-1/+3
| * | [ticket/12680] Adds second alternativ text and font-size: 0 to remove textCrizzo2014-06-092-10/+3
| * | [ticket/12680] Adds alternative text to contact icon in viewtopic.phpCrizzo2014-06-092-1/+9
* | | Merge pull request #2649 from VSEphpbb/ticket/12760Joas Schilling2014-06-252-1/+2
|\ \ \
| * | | [ticket/12760] Fix wording for unapproved posts icon...Matt Friedman2014-06-242-1/+2
* | | | Merge pull request #2650 from PayBas/ticket/12766Joas Schilling2014-06-253-2/+4
|\ \ \ \
| * | | | [ticket/12766] Event exporter does not like RCx as versionPayBas2014-06-253-2/+4
|/ / / /
* | | | Merge branch 'prep-release-3.1.0-RC1' into develop-ascraeusJoas Schilling2014-06-258-38/+198
|\ \ \ \
| * | | | [prep-release-3.1.0-RC1] Update phpBB Version for RC2 developmentJoas Schilling2014-06-253-5/+5
| * | | | [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-246-8/+8
|/ / / /
* | | | Merge pull request #2648 from dhruvgoel92/ticket/12562Andreas Fischer2014-06-242-6/+4
|\ \ \ \
| * | | | [ticket/12562] Revert "Add max-width to proSilver"Dhruv2014-06-252-6/+4
| |/ / /
* | | | Merge branch 'develop-olympus' into develop-ascraeusAndreas Fischer2014-06-243-2/+31
|\ \ \ \ | |/ / / |/| | |
| * | | Merge pull request #2633 from marc1706/ticket/12755Andreas Fischer2014-06-243-2/+31
| |\ \ \
| | * | | [ticket/12755] Apply de morgan to conditionalMarc Alexander2014-06-241-1/+1
| | * | | [ticket/12755] Terminate upload loop if upload reaches filesizeMarc Alexander2014-06-241-2/+12
| | * | | [ticket/12755] Change upload in remote_upload() method to fit get_remote_fileMarc Alexander2014-06-241-12/+14
| | * | | [ticket/12755] Add language string for timed out remote uploadMarc Alexander2014-06-233-1/+3
| | * | | [ticket/12755] Add timeout to remote upload to prevent infinite loopMarc Alexander2014-06-211-0/+15
| |/ / /
* | | | Merge pull request #2646 from prototech/ticket/12750Andreas Fischer2014-06-242-2/+6
|\ \ \ \
| * | | | [ticket/12750] Center installation page copyright text.Cesar G2014-06-242-2/+6
* | | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12612' into develop...Nils Adermann2014-06-2416-97/+109
|\ \ \ \ \
| * | | | | [ticket/12612] Prefix check_ids() with phpbb_Joas Schilling2014-06-236-17/+17
| * | | | | [ticket/12612] Prefix mcp_sorting() with phpbb_Joas Schilling2014-06-236-7/+7
| * | | | | [ticket/12612] Prefix get_*_data() with phpbb_ and delete unused globalJoas Schilling2014-06-2310-39/+39
| * | | | | [ticket/12612] Prefix module url functions with phpbb_Joas Schilling2014-06-234-27/+31
| * | | | | [ticket/12612] Prefix upload_popup() with phpbb_Joas Schilling2014-06-232-3/+3
| * | | | | [ticket/12612] Prefix handle_post_delete() with phpbb and remove unused globalJoas Schilling2014-06-232-4/+4
generated by cgit v1.2.1 (git 2.21.0) at 2024-11-14 14:23:42 +0000