aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'vsephpbb/ticket/12029' into developJoas Schilling2014-03-131-6/+0
|\ | | | | | | | | * vsephpbb/ticket/12029: [ticket/12029] Remove ellipsis and wrap long sidebar items in ACP
| * [ticket/12029] Remove ellipsis and wrap long sidebar items in ACPMatt Friedman2014-03-131-6/+0
| | | | | | | | PHPBB3-12029
* | Merge remote-tracking branch 'vsephpbb/ticket/11111' into developJoas Schilling2014-03-131-0/+1
|\ \ | | | | | | | | | | | | * vsephpbb/ticket/11111: [ticket/11111] Prosilver posting textarea may only be resized vertically
| * | [ticket/11111] Prosilver posting textarea may only be resized verticallyMatt Friedman2014-03-131-0/+1
| |/ | | | | | | | | | | | | | | The resize element displays a mechanism for allowing the user to resize the element. Setting this to vertical means it may only be resized vertically. PHPBB3-11111
* | Merge remote-tracking branch 'vsephpbb/ticket/12073' into developJoas Schilling2014-03-131-0/+4
|\ \ | |/ |/| | | | | * vsephpbb/ticket/12073: [ticket/12073] Increase size of samp and code tags in ACP
| * [ticket/12073] Increase size of samp and code tags in ACPMatt Friedman2014-03-131-0/+4
|/ | | | PHPBB3-12073
* Merge remote-tracking branch 'crizz0/ticket/8785' into developJoas Schilling2014-03-135-71/+120
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * crizz0/ticket/8785: [ticket/8785] Deletes additional add and add_bcc buttons [ticket/8785] Fixed problem with add empty.png and travis will now pass [ticket/8785] and again a fresh line [ticket/8785] Just one blank line [ticket/8785] pm_layout.html back to more standard code [ticket/8785] <hr /> will only displayed when needed [ticket/8785] Adds blank lines at file end [ticket/8785] Adds a new optical improvement, new file and fixes html bugs [ticket/8785] Adds two <hr /> to seperate recipients and BCC [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200px [ticket/8785] Little spaces mistake [ticket/8785] Rebuilding posting_editor pm head + new language vars
| * [ticket/8785] Deletes additional add and add_bcc buttonsCrizzo2014-03-111-2/+0
| | | | | | | | PHPBB3-8785
| * [ticket/8785] Fixed problem with add empty.png and travis will now passCrizzo2014-03-092-3/+3
| | | | | | | | PHPBB3-8785
| * [ticket/8785] and again a fresh lineCrizzo2014-03-091-0/+1
| | | | | | | | PHPBB3-8785
| * [ticket/8785] Just one blank lineCrizzo2014-03-091-0/+1
| | | | | | | | PHPBB3-8785
| * [ticket/8785] pm_layout.html back to more standard codeCrizzo2014-03-093-11/+12
| | | | | | | | PHPBB3-8785
| * [ticket/8785] <hr /> will only displayed when neededCrizzo2014-03-091-1/+1
| | | | | | | | PHPBB3-8785
| * [ticket/8785] Adds blank lines at file endCrizzo2014-03-092-2/+2
| | | | | | | | PHPBB3-8785
| * [ticket/8785] Adds a new optical improvement, new file and fixes html bugsCrizzo2014-03-094-93/+105
| | | | | | | | PHPBB3-8785
| * [ticket/8785] Adds two <hr /> to seperate recipients and BCCCrizzo2014-03-041-1/+2
| | | | | | | | PHPBB3-8785
| * [ticket/8785] Scrollbar to Reciepients and BCC with max-height: 200pxCrizzo2014-03-031-0/+2
| | | | | | | | PHPBB3-8785
| * [ticket/8785] Little spaces mistakeCrizzo2014-03-031-1/+1
| | | | | | | | PHPBB3-8785
| * [ticket/8785] Rebuilding posting_editor pm head + new language varsCrizzo2014-03-033-36/+69
| | | | | | | | PHPBB3-8785
* | Merge pull request #2110 from nickvergessen/ticket/12168Andreas Fischer2014-03-133-2/+3
|\ \ | | | | | | | | | | | | | | | | | | [ticket/12168] Move padding-top to ul.linklist li * nickvergessen/ticket/12168: [ticket/12168] Move padding-top to ul.linklist li
| * | [ticket/12168] Move padding-top to ul.linklist liJoas Schilling2014-03-113-2/+3
| | | | | | | | | | | | PHPBB3-12168
* | | Merge pull request #2113 from nickvergessen/ticket/8041Andreas Fischer2014-03-138-10/+13
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/8041] Merge item name into "Return to" string for better translations * nickvergessen/ticket/8041: [ticket/8041] Add space/tabs after => in array list [ticket/8041] Wrap forum name, topic title and pm folder name with quotes [ticket/8041] Merge item name into "Return to" string for better translations
| * | | [ticket/8041] Add space/tabs after => in array listJoas Schilling2014-03-131-3/+3
| | | | | | | | | | | | | | | | PHPBB3-8041
| * | | [ticket/8041] Wrap forum name, topic title and pm folder name with quotesJoas Schilling2014-03-122-2/+2
| | | | | | | | | | | | | | | | PHPBB3-8041
| * | | [ticket/8041] Merge item name into "Return to" string for better translationsJoas Schilling2014-03-129-9/+12
| | | | | | | | | | | | | | | | PHPBB3-8041
* | | | Merge pull request #2115 from Elsensee/ticket/12267Andreas Fischer2014-03-131-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12267] Replace $php_ext with $phpEx * Elsensee/ticket/12267: [ticket/12267] Replace $php_ext with $phpEx
| * | | | [ticket/12267] Replace $php_ext with $phpExOliver Schramm2014-03-131-2/+2
|/ / / / | | | | | | | | | | | | PHPBB3-12267
* | | | Merge branch 'develop-olympus' into developJoas Schilling2014-03-134-2/+63
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12176] Reword comment about config entries. [ticket/12176] Add newest_user_colour to config array to ensure it exists [ticket/12176] Display correct message when trying to delete founder. [ticket/12176] Add functional test for founder deletion message. Conflicts: tests/test_framework/phpbb_functional_test_case.php
| * \ \ \ Merge remote-tracking branch 'bantu/ticket/12176' into develop-olympusJoas Schilling2014-03-134-2/+62
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * bantu/ticket/12176: [ticket/12176] Reword comment about config entries. [ticket/12176] Add newest_user_colour to config array to ensure it exists [ticket/12176] Display correct message when trying to delete founder. [ticket/12176] Add functional test for founder deletion message.
| | * | | | [ticket/12176] Reword comment about config entries.Andreas Fischer2014-03-131-4/+6
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12176
| | * | | | Merge pull request #6 from nickvergessen/ticket/bantu/12176Andreas Fischer2014-03-131-0/+7
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [ticket/12176] Add newest_user_colour to config array to ensure it exists * nickvergessen/ticket/bantu/12176: [ticket/12176] Add newest_user_colour to config array to ensure it exists
| | | * | | | [ticket/12176] Add newest_user_colour to config array to ensure it existsJoas Schilling2014-03-121-0/+7
| | |/ / / / | | | | | | | | | | | | | | | | | | PHPBB3-12176
| | * | | | [ticket/12176] Display correct message when trying to delete founder.Andreas Fischer2014-02-152-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12176
| | * | | | [ticket/12176] Add functional test for founder deletion message.Andreas Fischer2014-02-151-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12176
* | | | | | Merge pull request #2104 from nickvergessen/ticket/12261Nathan Guse2014-03-125-4/+50
|\ \ \ \ \ \ | | | | | | | | | | | | | | [ticket/12261] Remove web root path from login redirect url
| * | | | | | [ticket/12261] Mark test as incomplete, something is wrong with sessionsJoas Schilling2014-03-111-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12261
| * | | | | | [ticket/12261] Fix doc blockJoas Schilling2014-03-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12261
| * | | | | | [ticket/12261] Validate the redirect hidden field before submitting the formJoas Schilling2014-03-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12261
| * | | | | | [ticket/12261] Add a functional test for redirect after using login_box()Joas Schilling2014-03-105-5/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12261
| * | | | | | [ticket/12261] Remove web root path from login redirect urlJoas Schilling2014-03-101-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The redirect url must be relative to the ucp.php and not relative to the current page. PHPBB3-12261
* | | | | | | Merge remote-tracking branch 'vsephpbb/ticket/12244' into developJoas Schilling2014-03-121-1/+1
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12244: [ticket/12244] Rename extensions manager tab [ticket/12244] Rename link to Extensions Manager in the ACP
| * | | | | | | [ticket/12244] Rename extensions manager tabMatt Friedman2014-03-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12244
| * | | | | | | [ticket/12244] Rename link to Extensions Manager in the ACPMatt Friedman2014-03-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12244
* | | | | | | | Merge remote-tracking branch 'EXreaction/ticket/11716' into developJoas Schilling2014-03-122-0/+190
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/11716: [ticket/11716] Correct license URL [ticket/11716] Fix dependencies in migration files [ticket/11716] Rename migration files and add note that it's converting a MOD [ticket/11716] Convert Soft Delete Mod to post/topic visibility
| * | | | | | | | [ticket/11716] Correct license URLNathan Guse2014-03-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11716
| * | | | | | | | [ticket/11716] Fix dependencies in migration filesNathan Guse2014-03-112-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11716
| * | | | | | | | [ticket/11716] Rename migration files and add note that it's converting a MODNathan Guse2014-02-032-2/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11716
| * | | | | | | | [ticket/11716] Convert Soft Delete Mod to post/topic visibilityNathan Guse2014-02-032-0/+186
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11716
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2014-03-122-2/+2
|\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | / / / | |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10549] using correct variable in includes/functions_module.php too [ticket/10549] changed "right" to "incorrect" Conflicts: phpBB/includes/functions_module.php
| * | | | | | | Merge remote-tracking branch 'Crizz0/ticket/10549' into develop-olympusAndreas Fischer2014-03-122-2/+2
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Crizz0/ticket/10549: [ticket/10549] using correct variable in includes/functions_module.php too [ticket/10549] changed "right" to "incorrect"
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 02:19:44 +0000