aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/7782] Added phpdoc comment for send_status_line function.Oleg Pudeyev2010-05-161-0/+20
| | | | PHPBB3-7782
* [ticket/7782] Send status line using refactored download/file.php logic.Oleg Pudeyev2010-05-162-10/+23
| | | | PHPBB3-7782
* [develop-olympus] Move rxu and nickvergessen to DevelopersJoas Schilling2010-05-161-2/+2
|
* Merge branch 'feature/notify_status' into develop-olympusNils Adermann2010-05-163-11/+16
|\ | | | | | | | | * feature/notify_status: [feature/notify_status] Define'd constants for notify_status
| * [feature/notify_status] Define'd constants for notify_statusMark2010-05-163-11/+16
|/ | | | | | | define'd constants NOTIFY_YES, NOTIFY_NO to replace magic numbers in forums_watch table and topics_watch table PHPBB3-9179
* Merge branch 'ticket/p/7782' into develop-olympusNils Adermann2010-05-161-0/+5
|\ | | | | | | | | * ticket/p/7782: [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
| * [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is ↵Oleg Pudeyev2010-05-161-0/+5
| | | | | | | | | | | | requested. PHPBB3-7782
* | Merge branch 'ticket/nickvergessen/9530' into develop-olympusNils Adermann2010-05-163-2/+63
|\ \ | | | | | | | | | | | | | | | * ticket/nickvergessen/9530: [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
| * | [ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.jsJoas Schilling2010-05-161-1/+2
| | | | | | | | | | | | PHPBB3-9530
| * | [ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when ↵Joas Schilling2010-05-163-1/+61
| | | | | | | | | | | | | | | | | | bbcodes are disabled. PHPBB3-9530
* | | Merge branch 'ticket/nickvergessen/9531' into develop-olympusNils Adermann2010-05-166-6/+7
|\ \ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9531: [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
| * | | [ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" ↵Joas Schilling2010-05-166-6/+7
| |/ / | | | | | | | | | | | | | | | line when quoting from topic-review. PHPBB3-9531
* | | Merge branch 'ticket/bantu/9547' into develop-olympusNils Adermann2010-05-162-4/+5
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9547: [ticket/9547] Use separate constants for display/enable active topics.
| * | | [ticket/9547] Use separate constants for display/enable active topics.Andreas Fischer2010-05-162-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Split S_DISPLAY_ACTIVE_TOPICS into S_DISPLAY_ACTIVE_TOPICS and S_ENABLE_ACTIVE_TOPICS so we have correct default values when changing the forum type. PHPBB3-9547
* | | | Merge branch 'ticket/nickvergessen/9535' into develop-olympusNils Adermann2010-05-163-24/+24
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9535: [ticket/9535] Also fix the margin in the install_update.html [ticket/9535] Fix some more rtl margin issues. [ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
| * | | | [ticket/9535] Also fix the margin in the install_update.htmlJoas Schilling2010-05-161-19/+19
| | | | | | | | | | | | | | | | | | | | PHPBB3-9535
| * | | | [ticket/9535] Fix some more rtl margin issues.Joas Schilling2010-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | PHPBB3-9535
| * | | | [ticket/9535] Correctly set margin of textarea in ACP > Users signature for ↵Joas Schilling2010-05-161-3/+3
| | |/ / | |/| | | | | | | | | | | | | | | | | | RTL languages. PHPBB3-9535
* | | | Merge branch 'ticket/nickvergessen/9548' into develop-olympusNils Adermann2010-05-162-14/+21
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9548: [ticket/9548] Delete user quicktool drop down should have an empty or invalid selection as the default
| * | | | [ticket/9548] Delete user quicktool drop down should have an empty or ↵Joas Schilling2010-04-182-14/+21
| |/ / / | | | | | | | | | | | | | | | | | | | | invalid selection as the default PHPBB3-9548
* | | | Merge branch 'ticket/aptx/9525' into develop-olympusNils Adermann2010-05-162-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/aptx/9525: [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
| * | | | [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting ↵Marek A. Ruszczyński2010-05-162-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | with :: :: can replace 1 or more groups (not 2 or more) PHPBB3-9524
* | | | | [ticket/9510] Unable to copy permissions from and to forums you cannot seeJosh Woody2010-05-161-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010). It also rolls back the changes from branch "bug/58415", which are no longer needed. PHPBB3-9510
* | | | | [ticket/9510] Unable to copy permissions from and to forums you cannot seeJosh Woody2010-05-161-5/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010). It also rolls back the changes from branch "bug/58415", which are no longer needed. PHPBB3-9510
* | | | | Merge branch 'ticket/bantu/9545' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9545: [ticket/9545] Initial forum should display active topics by default.
| * | | | | [ticket/9545] Initial forum should display active topics by default.Andreas Fischer2010-05-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The initial forum 'Your first forum' should show topics (especially the 'Welcome to phpBB3' topic) in the active topics list after installing phpBB because this is the default setting for new forums (but not categories). The default database column value for forum_flags is 32 = FORUM_FLAG_POST_REVIEW, we therefore have to explicitly set forum_flags to FORUM_FLAG_POST_REVIEW + FORUM_FLAG_ACTIVE_TOPICS = 48 for this forum. PHPBB3-9545
* | | | | | Merge branch 'ticket/nickvergessen/9546' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9546: [ticket/9546] Also delete bookmarks, when a topic is deleted.
| * | | | | | [ticket/9546] Also delete bookmarks, when a topic is deleted.Joas Schilling2010-05-161-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | PHPBB3-9546
* | | | | | Merge branch 'ticket/rxu/9567' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9567: [ticket/9567] Newly registered users group description rewording.
| * | | | | | [ticket/9567] Newly registered users group description rewording.rxu2010-05-021-1/+1
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Reword 'NEW_MEMBER_GROUP_DEFAULT_EXPLAIN' language entry to make it more linguistically correct. PHPBB3-9567
* | | | | | Merge branch 'ticket/nickvergessen/9529' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9529: [ticket/9529] Topic review is not showing all selected posts.
| * | | | | | [ticket/9529] Topic review is not showing all selected posts.Joas Schilling2010-05-161-1/+1
| | |/ / / / | |/| | | | | | | | | | | | | | | | PHPBB3-9529
* | | | | | Merge branch 'ticket/nickvergessen/9528' into develop-olympusNils Adermann2010-05-161-0/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9528: [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
| * | | | | | [ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are ↵Joas Schilling2010-05-161-0/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | disabled. PHPBB3-9528
* | | | | | Merge branch 'ticket/nickvergessen/9146' into develop-olympusNils Adermann2010-05-161-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9146: [ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
| * | | | | | [ticket/9146] Fix double occurring tabindex="6" in prosilver's QRJoas Schilling2010-05-161-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9146
* | | | | | Merge branch 'ticket/nickvergessen/9119' into develop-olympusNils Adermann2010-05-161-17/+35
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9119: [ticket/9119] Respect language selection on automated update.
| * | | | | | [ticket/9119] Respect language selection on automated update.Joas Schilling2010-05-161-17/+35
| |/ / / / / | | | | | | | | | | | | | | | | | | PHPBB3-9119
* | | | | | Merge branch 'ticket/nickvergessen/8894' into develop-olympusNils Adermann2010-05-162-2/+2
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | * ticket/nickvergessen/8894: [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
| * | | | | [ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if ↵Joas Schilling2010-05-162-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | BBCodes are not allowed. PHPBB3-8894
* | | | | Merge branch 'ticket/bantu/9174' into develop-olympusNils Adermann2010-05-141-4/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9174: [ticket/9173] No longer limit scope of numbers we store in the config table on
| * | | | | [ticket/9173] No longer limit scope of numbers we store in the config table onAndreas Fischer2010-05-141-4/+1
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | PostgreSQL and Firebird when using set_config_count(). Since we're using a VARCHAR(255) column to store the numbers we have to CAST the varchar string to a type we can do maths on. Using int4 or integer as the type however limits the scope to 4-byte-integer = 32-bit. Using DECIMAL(255, 0) allows the 'full' scope of decimals in varchar(255). PHPBB3-9173
* | | | | Merge branch 'ticket/nickvergessen/7717' into develop-olympusNils Adermann2010-05-144-13/+59
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/7717: [ticket/7717] Localise default extension groups for attachments
| * | | | | [ticket/7717] Localise default extension groups for attachmentsJoas Schilling2010-05-144-13/+59
| | |/ / / | |/| | | | | | | | | | | | | PHPBB3-7717
* | | | | Merge branch 'ticket/bantu/9598' into develop-olympusNils Adermann2010-05-141-11/+7
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9598: [ticket/9598] checkdnsrr() is now available on Windows with PHP 5.3 or later. Change if block order to always call checkdnsrr() if the function is available.
| * | | | | [ticket/9598] checkdnsrr() is now available on Windows with PHP 5.3 or ↵Andreas Fischer2010-05-141-11/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | later. Change if block order to always call checkdnsrr() if the function is available. PHPBB3-9598
* | | | | | Merge branch 'ticket/bantu/9536' into develop-olympusNils Adermann2010-05-141-2/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9536: [ticket/9536] Small improvement for query against user/session tables when managing users from the ACP.
| * | | | | | [ticket/9536] Small improvement for query against user/session tables when ↵Andreas Fischer2010-05-141-2/+2
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | managing users from the ACP. There can be multiple entries in the session table for one user_id. We only need and also only fetch one. Using LIMIT 1 should therefore increase performance slightly. This is especially true when editing the anonymous user account because the session table can have many entries for the user_id ANONYMOUS. PHPBB3-9536
* | | | | | Merge branch 'ticket/bantu/9526' into develop-olympusNils Adermann2010-05-141-0/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9526: [ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists.
| * | | | | | [ticket/9526] If an admin changes a user's 'user_allow_viewonline' flag to ↵Andreas Fischer2010-05-141-0/+25
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'hide me' the admin usually wants that user to be hidden immediately. We therefore have to update his session if one exists. In the UCP this is not necessary, because there is code in $user->setup() that updates the session table on the next page reload. Since we cannot tell if the user generally wants to be hidden or the user only wants to be hidden for one session, we only update the session table when setting the flag to 'hide me', but not 'show me' - equivalent to how it works in the UCP. If the user is a bot we however also update the session when setting the flag to 'show me' because bots cannot login at all. PHPBB3-9526