aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/p/9570' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ | | | | | | | | * ticket/p/9570: [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.
| * [ticket/9570] Changed "system" to "guest" timezone in ACP, added explanation.Oleg Pudeyev2010-07-061-1/+1
| | | | | | | | PHPBB3-9570
* | Merge branch 'ticket/bantu/9451' into develop-olympusAndreas Fischer2010-07-083-4/+7
|\ \ | | | | | | | | | | | | * ticket/bantu/9451: [ticket/9451] Add optional $can_upload parameter to avatar_process_user().
| * | [ticket/9451] Add optional $can_upload parameter to avatar_process_user().Thatbitextra2010-07-073-4/+7
| | | | | | | | | | | | | | | | | | | | | Avoid unnecessary overhead in avatar_process_user() by optionally passing in the value of $can_upload. PHPBB3-9451
* | | Merge branch 'ticket/nickvergessen/9578' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * ticket/nickvergessen/9578: [ticket/9578] ACP Posting tab is missing "Post settings" module.
| * | | [ticket/9578] ACP Posting tab is missing "Post settings" module.Joas Schilling2010-05-281-1/+1
| | | | | | | | | | | | | | | | PHPBB3-9578
* | | | Merge branch 'ticket/jellydoughnut/9695' into develop-olympusAndreas Fischer2010-07-081-2/+2
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9695: [ticket/9695] Correct the improper display of user input in mcp_ban.php
| * | | | [ticket/9695] Correct the improper display of user input in mcp_ban.phpJosh Woody2010-07-011-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Correct the improper display of "ban_reason" and "ban_give_reason" in mcp_ban.php PHPBB3-9695
* | | | Merge branch 'ticket/nickvergessen/9697' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/nickvergessen/9697: [ticket/9697] Backlink broken when the select parent forum does not exist.
| * | | | [ticket/9697] Backlink broken when the select parent forum does not exist.Joas Schilling2010-07-021-1/+1
| |/ / / | | | | | | | | | | | | PHPBB3-9697
* | | | Merge branch 'ticket/jellydoughnut/9703' into develop-olympusAndreas Fischer2010-07-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9703: [ticket/9703] Correct database leak where deleting user did not rm some PM data
| * | | | [ticket/9703] Correct database leak where deleting user did not rm some PM dataJosh Woody2010-07-031-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | Users' PM rules and PM folders were being left intact when deleting them. PHPBB3-9703
* | | | [ticket/9712] Future dates can be formatted as 'less than one minute ago'Chris Smith2010-07-071-2/+2
| |_|/ |/| | | | | | | | PHPBB3-9712
* | | [ticket/9659] Signature options in set_user_optionsRichard Foote2010-07-061-0/+3
|/ / | | | | | | | | | | The phpBB3 defaults are being used. PHPBB3-9659
* | Merge branch 'ticket/bantu/9655' into develop-olympusAndreas Fischer2010-06-201-2/+2
|\ \ | | | | | | | | | | | | * ticket/bantu/9655: [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
| * | [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.Andreas Fischer2010-06-141-2/+2
| | | | | | | | | | | | PHPBB3-9655
* | | Merge branch 'ticket/bantu/9656' into develop-olympusAndreas Fischer2010-06-201-2/+2
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9656: [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
| * | | [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.Andreas Fischer2010-06-201-2/+2
| |/ / | | | | | | | | | PHPBB3-9656
* | | Merge branch 'ticket/bantu/9643' into develop-olympusAndreas Fischer2010-06-201-1/+4
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9643: [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
| * | | [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.Andreas Fischer2010-06-081-1/+4
| |/ / | | | | | | | | | PHPBB3-9643
* | | Merge branch 'ticket/bantu/9112' into develop-olympusAndreas Fischer2010-06-201-0/+7
|\ \ \ | | | | | | | | | | | | | | | | * ticket/bantu/9112: [ticket/9112] Make sure current user can see most active forum/topic.
| * | | [ticket/9112] Make sure current user can see most active forum/topic.Andreas Fischer2010-06-151-0/+7
| | | | | | | | | | | | | | | | PHPBB3-9112
* | | | Merge branch 'ticket/jellydoughnut/9132' into develop-olympusAndreas Fischer2010-06-171-0/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/jellydoughnut/9132: [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings
| * | | | [ticket/9132] Oracle CLOB support is broken, preventing storage of long stringsJosh Woody2010-06-131-0/+5
| |/ / / | | | | | | | | | | | | | | | | | | | | This reverts Oracle support to the state it was in prior to phpBB 3.0.6. That is, storage of long strings works again (e.g. posts > 4 KB), but the database backup/restore functionality is broken. We feel that the ability to store long strings is more important than the DB restore, since Oracle 10g itself provides tools for backing up databases. PHPBB3-9132
* | | | Merge branch 'ticket/rxu/9606' into develop-olympusAndreas Fischer2010-06-171-3/+4
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/rxu/9606: [ticket/9606] Optimize unread search option.
| * | | | [ticket/9606] Optimize unread search option.rxu2010-05-171-3/+4
| | |_|/ | |/| | | | | | | | | | | | | | | | | | Get rid of redundant SQL query in search.php that should increase performance slightly. PHPBB3-9606
* | | | Merge branch 'ticket/jellydoughnut/9633' into develop-olympusAndreas Fischer2010-06-151-0/+1
|\ \ \ \
| * | | | [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member"Josh Woody2010-06-011-0/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | Due to an oversight, the default group was not properly checked in the user_add function. This fix corrects the check. No other changes are needed because they go direct to the database, this one used an array in memory. PHPBB3-9633
* | | | [ticket/9623] Proper UTF8 encoding for usernames in pruning sectionJosh Woody2010-06-151-4/+4
| |_|/ |/| | | | | | | | | | | | | | The username textboxes were not being properly encoded in UTF8. PHPBB3-9623
* | | 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-301-1/+25
|\ \ \ | | | | | | | | | | | | | | | | * 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-261-1/+25
| |/ / | | | | | | | | | | | | | | | 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/bantu/8792' into develop-olympusNils Adermann2010-05-301-1/+1
|\ \ \ | | | | | | | | | | | | | | | | * 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-161-1/+1
| |/ / | | | | | | | | | | | | | | | | | | | | | 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
* | | [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-161-1/+22
|/ / | | | | | | PHPBB3-7782
* | [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/bantu/9547' into develop-olympusNils Adermann2010-05-161-2/+3
|\ \ \ | | | | | | | | | | | | | | | | * 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-161-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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/9548' into develop-olympusNils Adermann2010-05-161-13/+20
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | * 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-181-13/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | invalid selection as the default PHPBB3-9548