aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Collapse)AuthorAgeFilesLines
* [task/coding-guidelines] Coding guideline update: Class names, eval, VCS, EOFNils Adermann2010-07-041-111/+67
| | | | | | | | | | | | - Class names need to be prefixed with phpbb_ - eval should not be used in any form - there should be newlines at the end of file - the closing php tag should be ommited - array elements should always have a trailing comma - the phpBB VCS is now git - removed the coding guidelines changelog PHPBB3-9557
* Merge branch 'ticket/bantu/8212' into developAndreas Fischer2010-06-201-1/+1
|\ | | | | | | | | * ticket/bantu/8212: [ticket/8212] Tiny 'typo in comment' fix
| * [ticket/8212] Tiny 'typo in comment' fixAndreas Fischer2010-05-201-1/+1
| | | | | | | | PHPBB3-8212
* | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-205-6/+16
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value. [ticket/9665] Allow preview of signature when it is the string "0". [ticket/9112] Make sure current user can see most active forum/topic. [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action. [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address. Conflicts: phpBB/styles/subsilver2/template/ucp_profile_signature.html phpBB/styles/subsilver2/template/viewtopic_body.html
| * \ 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/9665' into develop-olympusAndreas Fischer2010-06-202-2/+2
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9665: [ticket/9665] Allow preview of signature when it is the string "0".
| | * | | [ticket/9665] Allow preview of signature when it is the string "0".Andreas Fischer2010-06-202-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since only the SIGNATURE_PREVIEW parameter is evaluated in the templates <!-- IF SIGNATURE_PREVIEW --> will not allow the signature to be "0". <!-- IF SIGNATURE_PREVIEW != '' --> however does allow "0". PHPBB3-9665
| * | | | 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/9653' into develop-olympusAndreas Fischer2010-06-201-1/+1
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | * ticket/bantu/9653: [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
| | * | | | [ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signaturesAndreas Fischer2010-06-201-1/+1
| | |/ / / | | | | | | | | | | | | | | | PHPBB3-9653
| * | | | 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 'develop-olympus' into developAndreas Fischer2010-06-173-15/+16
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9132] Oracle CLOB support is broken, preventing storage of long strings [ticket/9606] Optimize unread search option.
| * | | | 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-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 'task/naderman/drop-subsilver2' into developAndreas Fischer2010-06-17196-9394/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * task/naderman/drop-subsilver2: [task/drop-subsilver2] Removing subsilver2 for Ascraeus development. Conflicts: phpBB/styles/subsilver2/template/ucp_pm_message_footer.html phpBB/styles/subsilver2/template/ucp_pm_viewfolder.html
| * | | | | | [task/drop-subsilver2] Removing subsilver2 for Ascraeus development.Nils Adermann2010-05-16196-9390/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The discussion about this has taken place on area51: http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=32496 PHPBB3-9607
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-172-4/+4
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9587] Replace '0px' with '0'. [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
| * | | | | | [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 'develop-olympus' into developAndreas Fischer2010-06-172-1/+6
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [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: "" [ticket/9587] Prosilver overrides reCaptcha class. [ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
| * | | | | | | 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 'develop-olympus' into developAndreas Fischer2010-06-154-6/+6
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9623] Proper UTF8 encoding for usernames in pruning section [ticket/9633] Newly Registered Group Colour not used in "Our Newest Member" [ticket/9179] Remove unnecessary newline. [ticket/9147] "Change topic type"-option "Normal" always selected.
| * | | | | | 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 'develop-olympus' into developNils Adermann2010-05-309-16/+81
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/9094] Hide "Copy permissions" message, when permissions were copied. [ticket/9135] Fix report-icon for moderators in PM folders. [ticket/8936] Subsilver2 missing reply-to-all feature. [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/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
| * | | | | 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
| * | | | | [ticket/7782] Return 404 HTTP status code for nonexistent attachments.Oleg Pudeyev2010-05-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-7782