aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signaturesAndreas Fischer2010-06-201-1/+1
| | | | PHPBB3-9653
* Merge branch 'feature/notify_status' into develop-olympusNils Adermann2010-05-301-1/+0
|\ | | | | | | | | * feature/notify_status: [ticket/9179] Remove unnecessary newline.
| * [ticket/9179] Remove unnecessary newline.Andreas Fischer2010-05-301-1/+0
| | | | | | | | | | | | cc8d22bed6bdba0a8f5797eef3627a62c240a48f added one empty line too much. PHPBB3-9179
* | Merge branch 'ticket/nickvergessen/9147' into develop-olympusNils Adermann2010-05-301-1/+1
|\ \ | | | | | | | | | | | | * ticket/nickvergessen/9147: [ticket/9147] "Change topic type"-option "Normal" always selected.
| * | [ticket/9147] "Change topic type"-option "Normal" always selected.Joas Schilling2010-05-281-1/+1
| | | | | | | | | | | | PHPBB3-9147
* | | Merge branch 'ticket/nickvergessen/9135' into develop-olympusNils Adermann2010-05-304-2/+30
|\ \ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9135: [ticket/9135] Fix report-icon for moderators in PM folders.
| * | | [ticket/9135] Fix report-icon for moderators in PM folders.Joas Schilling2010-05-264-2/+30
| |/ / | | | | | | | | | | | | | | | There was a S_TOPIC_REPORTED switch in the template of prosilver, which should indicate whether the PM is reported. But the variable was neither filled, nor named correctly. Now it is filled with a boolean and a link to the report is displayed for permitted users. PHPBB3-9135
* | | Merge branch 'ticket/nickvergessen/9094' into develop-olympusNils Adermann2010-05-301-2/+4
|\ \ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9094: [ticket/9094] Hide "Copy permissions" message, when permissions were copied.
| * | | [ticket/9094] Hide "Copy permissions" message, when permissions were copied.Joas Schilling2010-05-271-2/+4
| |/ / | | | | | | | | | | | | | | | When creating a forum, you afterwards read "Forum created successfully. Now you are able to set permissions for this forum.", also when you already copied the permissions from another forum. PHPBB3-9094
* | | Merge branch 'ticket/nickvergessen/8936' into develop-olympusNils Adermann2010-05-301-0/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/8936: [ticket/8936] Subsilver2 missing reply-to-all feature.
| * | | [ticket/8936] Subsilver2 missing reply-to-all feature.Joas Schilling2010-05-241-0/+1
| |/ / | | | | | | | | | PHPBB3-8936
* | | Merge branch 'ticket/bantu/8792' into develop-olympusNils Adermann2010-05-302-1/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/8792: [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
| * | | [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.Andreas Fischer2010-05-162-1/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | No longer use LDAP_NO_SERVER_CONNECTION in case ldap_search() fails. Add and use LDAP_SEARCH_FAILED instead, so users can tell the difference between ldap_connect() failing and ldap_search() failing. PHPBB3-8792
* | | Merge branch 'ticket/p/7782' into develop-olympusNils Adermann2010-05-292-11/+44
|\ \ \ | |/ / |/| | | | | | | | | | | | | | | | | * ticket/p/7782: [ticket/7782] Return 404 HTTP status code for nonexistent attachments. [ticket/7782] Added spaces. [ticket/7782] Added phpdoc comment for send_status_line function. [ticket/7782] Send status line using refactored download/file.php logic.
| * | [ticket/7782] Return 404 HTTP status code for nonexistent attachments.Oleg Pudeyev2010-05-171-1/+1
| | | | | | | | | | | | PHPBB3-7782
| * | [ticket/7782] Added spaces.Oleg Pudeyev2010-05-171-1/+1
| | | | | | | | | | | | PHPBB3-7782
| * | [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