aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | | | [ticket/10346] Add drop_tables to perform_schema_changes and add testsNils Adermann2011-08-292-0/+77
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10346
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-273-9/+15
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10253' into develop-olympusOleg Pudeyev2011-08-273-9/+15
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/10253: [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.
| | * | | | | | [ticket/10253] Fix IE9 handling in javascript, to correctly quote text.Joas Schilling2011-07-303-9/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since IE9 IE supports textarea.selectionStart and window.getSelection. The only problem is, that the values are still incorrect. Therefore we need to ensure that it is still treated the old way, until IE fixes this completely. PHPBB3-10253
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-262-0/+12
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
| * | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10335' into develop-olympusNils Adermann2011-08-262-0/+12
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10335: [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.
| | * | | | | | | [ticket/10335] Add X-PHPBB-IS-BOT header so reverse proxies know about bots.Andreas Fischer2011-08-242-0/+12
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | PHPBB3-10335
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-253-24/+40
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10320] Exclude passworded forums when determining "Most active topic". [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
| * | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10320' into develop-olympusNils Adermann2011-08-253-24/+40
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10320: [ticket/10320] Exclude passworded forums when determining "Most active topic". [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.
| | * | | | | | | [ticket/10320] Exclude passworded forums when determining "Most active topic".Andreas Fischer2011-08-251-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10320
| | * | | | | | | [ticket/10320] Move phpbb_feed_base::get_passworded_forums() to user class.Andreas Fischer2011-08-252-23/+35
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10320
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-251-15/+27
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9995] Do not run forum SQL query when marking the whole board read. [ticket/9995] Always continue when harvesting $forum_ids for markread(). [ticket/9995] Remove useless statement from display_forums() Conflicts: phpBB/includes/functions_display.php
| * | | | | | | Merge remote-tracking branch 'github-bantu/ticket/9995' into develop-olympusNils Adermann2011-08-251-17/+29
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/9995: [ticket/9995] Do not run forum SQL query when marking the whole board read. [ticket/9995] Always continue when harvesting $forum_ids for markread(). [ticket/9995] Remove useless statement from display_forums()
| | * | | | | | | [ticket/9995] Do not run forum SQL query when marking the whole board read.Andreas Fischer2011-08-261-14/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9995
| | * | | | | | | [ticket/9995] Always continue when harvesting $forum_ids for markread().Andreas Fischer2011-08-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9995
| | * | | | | | | [ticket/9995] Remove useless statement from display_forums()Andreas Fischer2011-08-261-2/+0
| | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The $forum_ids array is only used if $mark_read == 'forums'. When $mark_read == 'forums', we either continue when $auth->acl_get('f_list', $forum_id) is false or true. So this statement is never useful. PHPBB3-9995
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-251-0/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10222] Also build language and styles changes in diff/patch format.
| * | | | | | | Merge remote-tracking branch 'github-bantu/ticket/10222' into develop-olympusNils Adermann2011-08-251-0/+9
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | * github-bantu/ticket/10222: [ticket/10222] Also build language and styles changes in diff/patch format.
| | * | | | | | [ticket/10222] Also build language and styles changes in diff/patch format.Andreas Fischer2011-08-251-0/+9
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | PHPBB3-10222
* | | | | | | Merge remote-tracking branch 'bantu/ticket/10329' into developIgor Wiedler2011-08-214-6/+6
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | * bantu/ticket/10329: [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.
| * | | | | | [ticket/10329] Add phpbb_ prefix to new pcre_utf8_support() function.Andreas Fischer2011-08-214-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduced by 6b4d0a254218e8d40151ca1bdff8c439f89502e9. PHPBB3-10329
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-211-1/+9
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / / | | | | | | * develop-olympus: [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/8177' into develop-olympusAndreas Fischer2011-08-211-1/+9
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nickvergessen/ticket/8177: [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.
| | * | | | | [ticket/8177] Display birthdays of 29th february on 28th in non-leap years.Joas Schilling2011-08-211-1/+9
| | | |/ / / | | |/| | | | | | | | | | | | | | | PHPBB3-8177
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-211-3/+0
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10240] Reverted a commit which added buggy code.
| * | | | | Merge remote-tracking branch 'callumacrae/ticket/10240' into develop-olympusAndreas Fischer2011-08-211-3/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/10240: [ticket/10240] Reverted a commit which added buggy code.
| | * | | | | [ticket/10240] Reverted a commit which added buggy code.Callum Macrae2011-08-211-3/+0
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit f9dbe33fa7917b6220a85a01ed9f395f3f1bb888. The code which was added also removed new lines and tabs. PHPBB3-10240
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-08-213-6/+8
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10309] Update .gitignore and move .gitkeep. [ticket/10309] Coding guidelines fix. [ticket/10309] Write unicode data to tests/tmp. Conflicts: .gitignore
| * | | | | Merge remote-tracking branch 'p/ticket/10309' into develop-olympusAndreas Fischer2011-08-212-1/+1
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10309: [ticket/10309] Update .gitignore and move .gitkeep.
| | * | | | | [ticket/10309] Update .gitignore and move .gitkeep.Oleg Pudeyev2011-08-202-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10309
| * | | | | | Merge branch 'develop-olympus' of git://github.com/phpbb/phpbb3 into ↵Andreas Fischer2011-08-215-7/+7
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | develop-olympus * 'develop-olympus' of git://github.com/phpbb/phpbb3: [ticket/9978] Added semicolons to JavaScript in overall_header. [ticket/8571] Show age as 0 in birthday list when birthday is in the future. [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future. [ticket/8571] Also display age on memberlist/viewprofile when age is 0.
| * | | | | | Merge remote-tracking branch 'p/ticket/10309' into develop-olympusAndreas Fischer2011-08-161-4/+7
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | * p/ticket/10309: [ticket/10309] Coding guidelines fix. [ticket/10309] Write unicode data to tests/tmp.
| | * | | | | [ticket/10309] Coding guidelines fix.Oleg Pudeyev2011-08-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-10309
| | * | | | | [ticket/10309] Write unicode data to tests/tmp.Oleg Pudeyev2011-08-071-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the tests are run by a different user than the one which owns phpbb source tree, writes will go into a single, known directory. PHPBB3-10309
* | | | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-08-201-2/+2
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9978] Added semicolons to JavaScript in overall_header.
| * | | | | | Merge remote-tracking branch 'callumacrae/ticket/9978' into develop-olympusOleg Pudeyev2011-08-201-2/+2
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * callumacrae/ticket/9978: [ticket/9978] Added semicolons to JavaScript in overall_header.
| | * | | | | | [ticket/9978] Added semicolons to JavaScript in overall_header.Callum Macrae2011-08-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Semicolons have been added to the anonymous functions in the javascript in overall_header.html. This makes JSLint happier, and also makes the code easier to minify. PHPBB3-9978
* | | | | | | | Merge remote-tracking branch 'github-igorw/feature/request-class' into developNils Adermann2011-08-1823-143/+362
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-igorw/feature/request-class: [feature/request-class] Fix session_testable_factory [feature/request-class] Adjust code base to do html decoding manually [feature/request-class] Remove $html_encode arg, force manual decoding [feature/request-class] Do not html escape user agent in header_filename [feature/request-class] Make use of the is_secure() method [feature/request-class] Add is_secure method to request for HTTPS [feature/request-class] Make server() use the $html_encode parameter [feature/request-class] Remove useless condition [feature/request-class] Minor spacing CS adjustments [feature/request-class] Add server(), header() and is_ajax() to request
| * | | | | | | | [feature/request-class] Fix session_testable_factoryIgor Wiedler2011-08-191-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9716
| * | | | | | | | [feature/request-class] Adjust code base to do html decoding manuallyIgor Wiedler2011-08-1810-30/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9716
| * | | | | | | | [feature/request-class] Remove $html_encode arg, force manual decodingIgor Wiedler2011-08-186-45/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9716
| * | | | | | | | [feature/request-class] Do not html escape user agent in header_filenameIgor Wiedler2011-08-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9716
| * | | | | | | | Merge branch 'develop' into feature/request-classIgor Wiedler2011-08-18130-2372/+3557
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (157 commits) [ticket/10316] Resolve inconsistent move topic behavior [ticket/9297] Add network to class name of unit tests. [ticket/9297] Fix typo in localhost. [ticket/9297] Rename test class to reflect its contents. [ticket/9297] Adjust comment - IPv6 is needed for IPv6 connections to work. [ticket/9297] Fix markTestSkipped call in setUpBeforeClass. [ticket/9608] Remove use of references in topic_review [ticket/9297] Skip FTP PASV/EPSV test if FTP connection fails. [ticket/9297] Separate ipv4 and ipv6 tests into separate functions. [ticket/9297] Update copyright year of unit test file. [feature/template-engine] Delete _get_locator function. [feature/template-engine] Clean up template locator usage in bbcode. [ticket/9297] Make EPSV unit tests work without IPv6. [ticket/9297] Unit tests for ftp_fsock PASV and EPSV. [ticket/9297] Add support for Extended Passive Mode (EPSV) in ftp_fsock class. [ticket/10312] Un-check the shadow option while moving. [feature/template-engine] Need to call set_template on template. [feature/template-engine] Update installer for template engine changes. [feature/template-engine] Dependency inject locator into template. [feature/template-engine] Delete useless code from set_template. ... Conflicts: phpBB/includes/functions.php
| * | | | | | | | | [feature/request-class] Make use of the is_secure() methodIgor Wiedler2011-08-184-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9716
| * | | | | | | | | [feature/request-class] Add is_secure method to request for HTTPSIgor Wiedler2011-08-184-0/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9716
| * | | | | | | | | [feature/request-class] Make server() use the $html_encode parameterIgor Wiedler2011-08-062-2/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | $request->server() should not auto html-escape values. header() however should. Also introduce some tests for this behaviour. Thanks to nn- for catching this. PHPBB3-9716
| * | | | | | | | | [feature/request-class] Remove useless conditionIgor Wiedler2011-07-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9716
| * | | | | | | | | [feature/request-class] Minor spacing CS adjustmentsIgor Wiedler2011-07-162-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-9716
| * | | | | | | | | [feature/request-class] Add server(), header() and is_ajax() to requestIgor Wiedler2011-07-1523-151/+317
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extend the request class with helpers for reading server vars (server()) and HTTP request headers (header()). Refactor the existing code base to make use of these helpers, make $_SERVER a deactivated super global. Also introduce an is_ajax() method, which checks the X-Requested-With header for the value 'XMLHttpRequest', which is sent by JavaScript libraries, such as jQuery. PHPBB3-9716
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-08-184-6/+9
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | / / / / / / | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/8571] Show age as 0 in birthday list when birthday is in the future. [ticket/8571] Show 'Age: 0' on viewprofile when birthday is in the future. [ticket/8571] Also display age on memberlist/viewprofile when age is 0. Conflicts: phpBB/index.php
generated by cgit v1.2.1 (git 2.21.0) at 2026-04-20 20:21:41 +0000