aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/11323] Enable tests for inclusion of defined variablesMarc Alexander2013-02-191-3/+0
| | | | PHPBB3-11323
* [ticket/11323] Correctly treat variables in template definesMarc Alexander2013-02-191-3/+9
| | | | | | | | Previously, any template variables that were used when defining a variable were treated as strings. This is a regression to phpBB 3.0. With this patch the template variables will be properly parsed. PHPBB3-11323
* Merge branch 'develop-olympus' into developAndreas Fischer2013-02-031-3/+3
|\ | | | | | | | | * develop-olympus: [ticket/11220] Improvement to the info pop-up from "list="
| * Merge remote-tracking branch 'Crizz0/ticket/11220' into develop-olympusAndreas Fischer2013-02-031-3/+3
| |\ | | | | | | | | | | | | * Crizz0/ticket/11220: [ticket/11220] Improvement to the info pop-up from "list="
| | * [ticket/11220] Improvement to the info pop-up from "list="Crizz02013-02-031-3/+3
| | | | | | | | | | | | | | | | | | | | | A improvement to the info popup which is displayed when the cursor is over the bbcode-button [list=] in the posting-editor PHPBB3-11220
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-311-1/+1
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/11233] prohibit selecting anonymous user as a PM recipient
| * | Merge remote-tracking branch 'dhruvgoel92/ticket/11233' into develop-olympusAndreas Fischer2013-01-311-1/+1
| |\ \ | | | | | | | | | | | | | | | | * dhruvgoel92/ticket/11233: [ticket/11233] prohibit selecting anonymous user as a PM recipient
| | * | [ticket/11233] prohibit selecting anonymous user as a PM recipientDhruv2013-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | While composing pm, it should not be allowed to add anonymous user as a PM recipient PHPBB3-11233
* | | | Merge branch 'develop-olympus' into developNathaniel Guse2013-01-301-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Senky # Via Nathaniel Guse (1) and Senky (1) * develop-olympus: [ticket/10050] removing prosilver edits [ticket/10050] adding .topicrow to template condition Conflicts: phpBB/styles/subsilver2/template/viewforum_body.html
| * | | Merge remote-tracking branch 'remotes/Senky/ticket/10050' into develop-olympusNathaniel Guse2013-01-301-1/+1
| |\ \ \ | | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | # By Senky # Via Senky * remotes/Senky/ticket/10050: [ticket/10050] removing prosilver edits [ticket/10050] adding .topicrow to template condition
| | * | [ticket/10050] removing prosilver editsSenky2013-01-241-1/+1
| | | | | | | | | | | | | | | | PHPBB3-10050
| | * | [ticket/10050] adding .topicrow to template conditionSenky2013-01-222-2/+2
| | | | | | | | | | | | | | | | PHPBB3-10050
* | | | Merge PR #1219 branch 'develop-olympus' into developOleg Pudeyev2013-01-271-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer (1) and Oleg Pudeyev (1) * develop-olympus: [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input.
| * | | Merge PR #1219 branch 'bantu/ticket/11343' into develop-olympusOleg Pudeyev2013-01-271-1/+1
| |\ \ \ | | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11343: [ticket/11343] Remove spare parentheses. [ticket/11343] Remove spare space. [ticket/11343] Use === when checking stored user_actkey against user input.
| | * | [ticket/11343] Remove spare parentheses.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11343
| | * | [ticket/11343] Remove spare space.Andreas Fischer2013-01-251-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11343
| | * | [ticket/11343] Use === when checking stored user_actkey against user input.Andreas Fischer2013-01-251-1/+1
| |/ / | | | | | | | | | | | | | | | | | | Use strict comparison when checking whether stored user_actkey is equal to user input. PHPBB3-11343
* | | Merge PR #1207 branch 'bantu/ticket/11295' into developOleg Pudeyev2013-01-261-2/+2
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11295: [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres.
| * | | [ticket/11295] Correct cases: replace postgres with phpbb_db_driver_postgres.Andreas Fischer2013-01-251-2/+2
|/ / / | | | | | | | | | PHPBB3-11295
* | | Merge PR #1201 branch 'develop-olympus' into developOleg Pudeyev2013-01-244-3/+60
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11337] Abort setup-webserver.sh script when an error occurs. [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. [ticket/11337] Silence nginx config file writing. [ticket/11337] php-fpm.conf is no longer owned by root. [ticket/11337] Run functional tests on travis using nginx and php-fpm. Conflicts: .travis.yml
| * | Merge PR #1201 branch 'bantu/ticket/11337' into develop-olympusOleg Pudeyev2013-01-244-2/+59
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11337: [ticket/11337] Abort setup-webserver.sh script when an error occurs. [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise. [ticket/11337] Silence nginx config file writing. [ticket/11337] php-fpm.conf is no longer owned by root. [ticket/11337] Run functional tests on travis using nginx and php-fpm.
| | * | [ticket/11337] Abort setup-webserver.sh script when an error occurs.Andreas Fischer2013-01-231-0/+1
| | | | | | | | | | | | | | | | PHPBB3-11337
| | * | [ticket/11337] Only run functional tests on 5.3.19 or higher. No FPM otherwise.Andreas Fischer2013-01-233-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no php-fpm for PHP 5.3.3. Make sure PHP version is at least 5.3.19, which is what 5.3 is currently aliased to. PHPBB3-11337
| | * | [ticket/11337] Silence nginx config file writing.Andreas Fischer2013-01-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11337
| | * | [ticket/11337] php-fpm.conf is no longer owned by root.Andreas Fischer2013-01-231-1/+1
| | | | | | | | | | | | | | | | PHPBB3-11337
| | * | [ticket/11337] Run functional tests on travis using nginx and php-fpm.Andreas Fischer2013-01-234-0/+56
| |/ / | | | | | | | | | PHPBB3-11337
* | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-231-0/+23
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11295] Drop tables rather than database for postgres in test suite. Conflicts: tests/test_framework/phpbb_database_test_connection_manager.php
| * | Merge remote-tracking branch 'p/ticket/11295' into develop-olympusAndreas Fischer2013-01-231-2/+25
| |\ \ | | | | | | | | | | | | | | | | * p/ticket/11295: [ticket/11295] Drop tables rather than database for postgres in test suite.
| | * | [ticket/11295] Drop tables rather than database for postgres in test suite.Oleg Pudeyev2012-12-261-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Doing so allows: 1. User running the tests no longer needs create database privilege. 2. Test database may be located in a non-default tablespace and generally have site-specific options applied to it. PHPBB3-11295
* | | | Merge PR #1203 branch 'bantu/ticket/11338' into developOleg Pudeyev2013-01-232-0/+22
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11338: [ticket/11338] Travis CI: Install PHP extension for redis key-value store.
| * | | | [ticket/11338] Travis CI: Install PHP extension for redis key-value store.Andreas Fischer2013-01-232-0/+22
| | | | | | | | | | | | | | | | | | | | PHPBB3-11338
* | | | | Merge PR #1202 branch 'bantu/ticket/11338' into developOleg Pudeyev2013-01-222-0/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | # By Andreas Fischer # Via Andreas Fischer * bantu/ticket/11338: [ticket/11338] Travis: Define Redis hostname so unit tests for Redis run.
| * | | | [ticket/11338] Travis: Define Redis hostname so unit tests for Redis run.Andreas Fischer2013-01-222-0/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-11338
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-220-0/+0
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/11323] Backport include_define test to olympus. Conflicts: tests/template/template_test.php
| * | | | Merge remote-tracking branch 'p/ticket/11323-olympus' into develop-olympusAndreas Fischer2013-01-222-0/+9
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/11323-olympus: [ticket/11323] Backport include_define test to olympus.
| | * | | | [ticket/11323] Backport include_define test to olympus.Oleg Pudeyev2013-01-132-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-11323
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2013-01-220-0/+0
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | * develop-olympus:
| * | | | Merge remote-tracking branch 'remotes/Sajaki/ticket/10854' into develop-olympusNathan Guse2013-01-151-0/+16
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Sajaki # Via Sajaki * remotes/Sajaki/ticket/10854: [ticket/10854] sql server drop default constraint when dropping column
* | \ \ \ \ Merge remote-tracking branch 'remotes/cyberalien/ticket/11329' into developNathan Guse2013-01-222-21/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11329: [ticket/11329] Moving colors to colours.css
| * | | | | | [ticket/11329] Moving colors to colours.cssVjacheslav Trushkin2013-01-212-21/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moving color values from buttons.css to colours.css PHPBB3-11329
* | | | | | | Merge remote-tracking branch 'remotes/cyberalien/ticket/11328' into developNathan Guse2013-01-224-8/+19
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Vjacheslav Trushkin # Via Vjacheslav Trushkin * remotes/cyberalien/ticket/11328: [ticket/11328] Replace long buttons text with short text [ticket/11328] Add language variables for buttons
| * | | | | | | [ticket/11328] Replace long buttons text with short textVjacheslav Trushkin2013-01-163-8/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace long buttons text with short text, like it was on images PHPBB3-11328
| * | | | | | | [ticket/11328] Add language variables for buttonsVjacheslav Trushkin2013-01-161-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | New language variables for buttons PHPBB3-11328
* | | | | | | | Merge remote-tracking branch 'remotes/nickv/ticket/9492' into developNathan Guse2013-01-225-33/+339
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # By Joas Schilling # Via Joas Schilling * remotes/nickv/ticket/9492: [ticket/9492] Fix missing phpbb_container in unit tests [ticket/9492] Fix typo in SQL query [ticket/9492] Ensure to delete the avatar/rank data when we change it [ticket/9492] Ensure to update all avatar values when the avatar is changed [ticket/9492] Fix undefined user_avatar_* values when updating the group avatar [ticket/9492] Add unit tests for custom ranks and avatars [ticket/9492] Retain custom ranks and avatars when setting users default group
| * | | | | | | [ticket/9492] Fix missing phpbb_container in unit testsJoas Schilling2013-01-201-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9492
| * | | | | | | [ticket/9492] Fix typo in SQL queryJoas Schilling2013-01-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9492
| * | | | | | | [ticket/9492] Ensure to delete the avatar/rank data when we change itJoas Schilling2013-01-171-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9492
| * | | | | | | [ticket/9492] Ensure to update all avatar values when the avatar is changedJoas Schilling2013-01-172-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9492
| * | | | | | | [ticket/9492] Fix undefined user_avatar_* values when updating the group avatarJoas Schilling2013-01-171-11/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9492
| * | | | | | | [ticket/9492] Add unit tests for custom ranks and avatarsJoas Schilling2013-01-172-0/+270
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9492
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 12:25:23 +0000