aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ticket/rxu/9606' into develop-olympusAndreas Fischer2010-06-172-15/+11
|\ | | | | | | | | * ticket/rxu/9606: [ticket/9606] Optimize unread search option.
| * [ticket/9606] Optimize unread search option.rxu2010-05-172-15/+11
| | | | | | | | | | | | Get rid of redundant SQL query in search.php that should increase performance slightly. PHPBB3-9606
* | Merge branch 'ticket/bantu/9626' into develop-olympusAndreas Fischer2010-06-176-0/+375
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9626: [ticket/9626] Adding tests for the URL regular expression. [ticket/9626] Add missing class prefix. [ticket/9626] A few tests for the email regular expression. [ticket/9626] More IPv6 regex tests. [ticket/9626] Adding tests for the IPv4 regular expression. [ticket/9626] Adding tests for regular expressions.
| * | [ticket/9626] Adding tests for the URL regular expression.Andreas Fischer2010-05-252-0/+36
| | | | | | | | | | | | PHPBB3-9626
| * | [ticket/9626] Add missing class prefix.Andreas Fischer2010-05-254-6/+6
| | | | | | | | | | | | PHPBB3-9626
| * | [ticket/9626] A few tests for the email regular expression.Andreas Fischer2010-05-252-0/+80
| | | | | | | | | | | | PHPBB3-9626
| * | [ticket/9626] More IPv6 regex tests.Andreas Fischer2010-05-251-4/+62
| | | | | | | | | | | | PHPBB3-9626
| * | [ticket/9626] Adding tests for the IPv4 regular expression.Andreas Fischer2010-05-252-0/+74
| | | | | | | | | | | | PHPBB3-9626
| * | [ticket/9626] Adding tests for regular expressions.Andreas Fischer2010-05-253-0/+127
| |/ | | | | | | | | | | Adding tests for the IPv6 regular expression returned by get_preg_expression() PHPBB3-9626
* | Merge branch 'ticket/bantu/9587' into develop-olympusAndreas Fischer2010-06-171-1/+1
|\ \ | | | | | | | | | | | | * ticket/bantu/9587: [ticket/9587] Replace '0px' with '0'.
| * | [ticket/9587] Replace '0px' with '0'.Andreas Fischer2010-06-171-1/+1
|/ / | | | | | | | | | | This has been introduced by merge of c7a25c58b893fc72ffb3746374ece9de1d388531, which was not supposed to be merged. 1b2a65333b5be1f6086bbd1d438e061041bd2b75 was supposed to be merged instead. PHPBB3-9587
* | Merge branch 'ticket/nickvergessen/9605' into develop-olympusAndreas Fischer2010-06-171-3/+3
|\ \ | | | | | | | | | | | | * ticket/nickvergessen/9605: [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
| * | [ticket/9605] Wrong class added to topiclist, when there's no announcement ↵Joas Schilling2010-06-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | topic. Compare the topic_type on their real value, to ensure there is no MOD causing problems, because of a new topic-type. PHPBB3-9605
* | | Merge branch 'ticket/nickvergessen/9605' into develop-olympusAndreas Fischer2010-06-171-1/+1
|\ \ \ | |/ / | | | | | | | | | * ticket/nickvergessen/9605: [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
| * | [ticket/9605] Wrong class added to topiclist, when there's no announcement ↵Joas Schilling2010-05-241-1/+1
| |/ | | | | | | | | | | | | | | topic. Just added a check whether the type is announcement or higher. PHPBB3-9605
* | Merge branch 'ticket/nickvergessen/9587' into develop-olympusAndreas Fischer2010-06-171-0/+5
|\ \ | | | | | | | | | | | | * ticket/nickvergessen/9587: [ticket/9587] Prosilver overrides reCaptcha class.
| * | [ticket/9587] Prosilver overrides reCaptcha class.Joas Schilling2010-05-241-0/+5
| |/ | | | | | | PHPBB3-9587
* | Merge branch 'feature/bantu/dbal-tests' into develop-olympusAndreas Fischer2010-06-171-19/+181
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * feature/bantu/dbal-tests: [feature/dbal-tests] Follow the coding guidelines and ... [feature/dbal-tests] Update data [feature/dbal-tests] Multi insert [feature/dbal-tests] Delete data [feature/dbal-tests] Insert data [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
| * | [feature/dbal-tests] Follow the coding guidelines and ...Joas Schilling2010-06-171-50/+88
| | | | | | | | | | | | | | | | | | resolved a bug caused by a missing order-by. PHPBB3-9625
| * | [feature/dbal-tests] Update dataJoas Schilling2010-06-171-0/+42
| | | | | | | | | | | | PHPBB3-9625
| * | [feature/dbal-tests] Multi insertJoas Schilling2010-06-171-0/+26
| | | | | | | | | | | | PHPBB3-9625
| * | [feature/dbal-tests] Delete dataJoas Schilling2010-06-171-0/+30
| | | | | | | | | | | | PHPBB3-9625
| * | [feature/dbal-tests] Insert dataJoas Schilling2010-06-171-0/+34
| | | | | | | | | | | | PHPBB3-9625
| * | [feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""Joas Schilling2010-06-171-16/+8
| | | | | | | | | | | | PHPBB3-9625
* | | 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
* | | Merge branch 'ticket/jellydoughnut/9623' into develop-olympusAndreas Fischer2010-06-151-4/+4
|\ \ \
| * | | [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-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