aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [feature/dbal-tests] Make some tests for return_on_error on SELECT-queriesJoas Schilling2010-03-261-8/+208
|
* [feature/dbal-tests] Tests for $db->sql_query_limit()Joas Schilling2010-03-262-1/+47
|
* [feature/dbal-tests] Load phpbb-schema after creating the connection to the ↵Joas Schilling2010-03-262-3/+53
| | | | database
* [feature/dbal-tests] Added tests for dbal fetchrow and fetchfield.Joas Schilling2010-03-264-0/+100
|
* [feature/dbal-tests] Added database test & refactored test frameworkJoas Schilling2010-03-264-20/+137
| | | | | | There is now a phpbb_database_test_case which can be used as a base class for tests that require database access. You have to set up a test_config.php file in your tests/ directory containing host, user, pass etc. Extra test functionality has been moved to phpbb_test_case_helpers to provide the same functionality in database tests and regular tests without duplicating the code. This is achieved through delegation of method calls.
* [develop-olympus] Make this test run on windows with backslash-paths.Joas Schilling2010-03-261-1/+1
|
* Merge branch 'bug/cs278/58685' into develop-olympusNils Adermann2010-03-181-2/+2
|\ | | | | | | | | * bug/cs278/58685: [bug/58685] Correct spelling errors in append_sid() comments.
| * [bug/58685] Correct spelling errors in append_sid() comments.Chris Smith2010-03-181-2/+2
| |
* | Merge branch 'bug/cs278/58025' into develop-olympusNils Adermann2010-03-182-0/+7
|\ \ | | | | | | | | | | | | | | | | | | | | | * bug/cs278/58025: [bug/58025] Search robots are now redirected if they send a SID in the request Conflicts: phpBB/docs/CHANGELOG.html
| * | [bug/58025] Search robots are now redirected if they send a SID in the requestChris Smith2010-03-132-0/+7
| | | | | | | | | | | | | | | | | | | | | Previously search robots could stumble upon a board link somewhere on the web containing a SID they'd follow it and end up indexing that page with the SID in the request URI, this fix prevents that by redirecting them to the same URI just without the SID.
* | | Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympusNils Adermann2010-03-181-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * feature/arstechnica/memcache-multi-server: [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the changelog.
| * | | [feature/arstechnica/memcache-multi-server] Add memcache-multi-server to the ↵Nils Adermann2010-03-181-0/+1
| | | | | | | | | | | | | | | | changelog.
* | | | Merge branch 'feature/arstechnica/memcache-multi-server' into develop-olympusNils Adermann2010-03-181-2/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | * feature/arstechnica/memcache-multi-server: [feature/memcache-multi-server] Changing format for multiple memcache hosts. Fixing code style issues in changes. [feature/memcache-multi-server] Adding support for multiple memcache servers to acm_memcache.php
| * | | [feature/memcache-multi-server] Changing format for multiple memcache hosts. ↵mrkurt2010-03-181-6/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing code style issues in changes. Host and ports are now represented like this in config: host1/port1,host2/port2,host3/port3
| * | | [feature/memcache-multi-server] Adding support for multiple memcache servers ↵mrkurt2010-03-181-2/+10
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to acm_memcache.php You can define multiple memcache servers in your config using this format: host::port,host::port,host::port Example: @define(PHPBB_ACM_MEMCACHE, '127.0.0.1::11211,10.0.0.2::11211,memcache1::11211'
* | | Merge branch 'bug/jellydoughnut/58415' into develop-olympusNils Adermann2010-03-172-2/+3
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | * bug/jellydoughnut/58415: Allow setting parent forums regardless of permission settings. (Bug #58415) Conflicts: phpBB/docs/CHANGELOG.html
| * | Allow setting parent forums regardless of permission settings. (Bug #58415)Josh Woody2010-03-172-2/+3
| | |
* | | [develop-olympus] Backported 3.1 unit tests to 3.0.Nils Adermann2010-03-1029-0/+1766
| | | | | | | | | | | | | | | Start adding unit tests for bugs you fix! Tests for anything are welcome really. We have to work on these a lot.
* | | Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into ↵Nils Adermann2010-03-081-2/+2
|\ \ \ | | | | | | | | | | | | develop-olympus
| * | | Add feature/ support to branchname hookIgor Wiedler2010-03-081-2/+2
| | | | | | | | | | | | | | | | | | | | The previously introduced branchname hook now will also use feature/ branch names, in addition to the existing bug/.
* | | | Merge branch 'develop-olympus' of git://github.com/evil3/phpbb3 into ↵Nils Adermann2010-03-081-0/+24
|\ \ \ \ | |/ / / | | | | | | | | develop-olympus
| * | | Adding a branchname prepare-commit-msg hookIgor Wiedler2010-03-081-0/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Git supports several hooks, some of which are client-side. The prepare-commit-msg hook is run right after a `git commit` call, before the editor is opened. This allows the initial message to be altered. This hook will check if the current branch name begins with `bug/`, in which case it will prepend `[$branchname]` to the commit message. This makes it easier to create proper commit messages. http://wiki.phpbb.com/Git#Commit_Messages For more information refer to the hook source.
* | | | Merge branch 'bug/dpward/58755' into develop-olympusNils Adermann2010-03-072-1/+2
|\ \ \ \
| * | | | Adding the bugfix for #58755 to the changelog.Nils Adermann2010-03-071-0/+1
| | | | |
| * | | | [bug/58755] Fix a redirection bug that can occur after loginDavid Ward2010-03-071-1/+1
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This issue affects any forum (i.e. https://myforum/phpBB3/) where: - the forum is located in a directory underneath the web root (i.e., NOT https://myforum/) - a user accesses the forum with a URI pointing to a directory rather than a script (i.e., NOT https://myforum/phpBB3/index.php) - the URI used ends in a slash (i.e., NOT https://myforum/phpBB3) If these conditions are met, after successful login the user is redirected to an invalid URI (i.e., https://myforum/phpBB3/phpBB3?sid=). This change fixes extract_current_page() to handle the case correctly where the URI ends in a slash and is not the web root. So after successful login, the redirection back to the main page will work (i.e., https://myforum/phpBB3/?sid=)
* | | | Merge branch 'bug/evil3/12531' into develop-olympusNils Adermann2010-03-072-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | [bug/12531] proposed solution for bug #12531Igor Wiedler2010-03-062-2/+3
| | | |
| * | | Oops, forgot the changelog for #57105Cullen Walsh2010-03-061-0/+1
| | |/ | |/|
* | | Merge branch 'master' into develop-olympusNils Adermann2010-03-067-9/+15
|\ \ \
| * \ \ Merge commit 'release-3.0.7-PL1'Nils Adermann2010-03-0610-13/+27
| |\ \ \
| | * | | exclude the image file with text in the name from having newlines fixedNils Adermann2010-03-051-1/+1
| | | | |
| | * | | Incrementing the version number to 3.0.7-PL1Nils Adermann2010-03-057-10/+16
| | | | |
| | * | | Mark the bugfix #58595 as a security fixNils Adermann2010-03-051-1/+2
| | | | |
| | * | | Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.Andreas Fischer2010-03-052-2/+9
| | | | |
* | | | | Merge branch 'bug/evil3/51555' into develop-olympusNils Adermann2010-03-062-1/+2
|\ \ \ \ \
| * | | | | [bug/51555] proposed fix for bug #51555Igor Wiedler2010-03-062-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge branch 'bug/bantu/58595' into develop-olympusNils Adermann2010-03-052-2/+9
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Mark the bugfix #58595 as a security fixNils Adermann2010-03-051-2/+8
| | | | |
| * | | | Fix Bug #58595 - ATOM Feed exposes forum content under some circumstances.Andreas Fischer2010-03-052-1/+2
|/ / / /
* | | | Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105Nils Adermann2010-03-021-0/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Oops, forgot the changelog for #57105Cullen Walsh2010-03-021-0/+1
| | | |
* | | | Merge remote branch 'github-ckwalsh/bug/57105' into bug/ckwalsh/57105Nils Adermann2010-03-021-1/+1
|\ \ \ \ | |/ / /
| * | | Parse urls in signature taking into account the allow_sig_links config ↵Cullen Walsh2010-03-021-1/+1
| | | | | | | | | | | | | | | | option introduced in phpBB 3.0.6, per bug #57105
* | | | Merge branch 'bug/aptx/54945' into develop-olympusNils Adermann2010-03-021-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Bug #54945 again: MySQL 4 does not support aggregation in ORDER BY.Marek A. Ruszczyński2010-03-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Moved the MIN(smiley_order) to the SELECT column list now, so it can be used for sorting on MySQL 4, but also still works on MSSQL, which the bug was originally about.
| * | | Missed one half of bug #54855 whoopsChris Smith2010-03-022-1/+2
| | | |
* | | | Merge remote branch 'github-cs278/bug/54855' into bug/cs278/54855Nils Adermann2010-03-022-1/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Missed one half of bug #54855 whoopsChris Smith2010-03-022-1/+2
| | | |
* | | | Merging master after 3.0.7 release into develop-olympus to make sure there ↵Nils Adermann2010-03-023-5/+5
|\ \ \ \ | |/ / / |/| / / | |/ / are no inconsistencies.
| * | Merge commit 'release-3.0.7'Nils Adermann2010-03-0210-21/+76
| |\ \
generated by cgit v1.2.1 (git 2.21.0) at 2025-11-12 11:21:59 +0000