aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ticket/bantu/8212' into developAndreas Fischer2010-06-201-1/+1
|\
| * [ticket/8212] Tiny 'typo in comment' fixAndreas Fischer2010-05-201-1/+1
* | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-204-5/+15
|\ \
| * \ Merge branch 'ticket/bantu/9655' into develop-olympusAndreas Fischer2010-06-201-2/+2
| |\ \
| | * | [ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.Andreas Fischer2010-06-141-2/+2
| * | | Merge branch 'ticket/bantu/9656' into develop-olympusAndreas Fischer2010-06-201-2/+2
| |\ \ \
| | * | | [ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.Andreas Fischer2010-06-201-2/+2
| | |/ /
| * | | Merge branch 'ticket/bantu/9643' into develop-olympusAndreas Fischer2010-06-201-1/+4
| |\ \ \
| | * | | [ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.Andreas Fischer2010-06-081-1/+4
| | |/ /
| * | | Merge branch 'ticket/bantu/9112' into develop-olympusAndreas Fischer2010-06-201-0/+7
| |\ \ \
| | * | | [ticket/9112] Make sure current user can see most active forum/topic.Andreas Fischer2010-06-151-0/+7
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-172-3/+9
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/jellydoughnut/9132' into develop-olympusAndreas Fischer2010-06-171-0/+5
| |\ \ \ \
| | * | | | [ticket/9132] Oracle CLOB support is broken, preventing storage of long stringsJosh Woody2010-06-131-0/+5
| | |/ / /
| * | | | Merge branch 'ticket/rxu/9606' into develop-olympusAndreas Fischer2010-06-171-3/+4
| |\ \ \ \
| | * | | | [ticket/9606] Optimize unread search option.rxu2010-05-171-3/+4
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2010-06-154-6/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
| | | |/ / / | | |/| | |
| * | | | | [ticket/9623] Proper UTF8 encoding for usernames in pruning sectionJosh Woody2010-06-151-4/+4
| | |_|/ / | |/| | |
| * | | | Merge branch 'feature/notify_status' into develop-olympusNils Adermann2010-05-301-1/+0
| |\ \ \ \
| | * | | | [ticket/9179] Remove unnecessary newline.Andreas Fischer2010-05-301-1/+0
| | | |/ / | | |/| |
| * | | | Merge branch 'ticket/nickvergessen/9147' into develop-olympusNils Adermann2010-05-301-1/+1
| |\ \ \ \
| | * | | | [ticket/9147] "Change topic type"-option "Normal" always selected.Joas Schilling2010-05-281-1/+1
| | |/ / /
* | | | | Merge branch 'develop-olympus' into developNils Adermann2010-05-304-6/+73
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | |
| * | | Merge branch 'ticket/nickvergessen/9135' into develop-olympusNils Adermann2010-05-301-1/+25
| |\ \ \
| | * | | [ticket/9135] Fix report-icon for moderators in PM folders.Joas Schilling2010-05-261-1/+25
| | |/ /
| * | | Merge branch 'ticket/nickvergessen/9094' into develop-olympusNils Adermann2010-05-301-2/+4
| |\ \ \
| | * | | [ticket/9094] Hide "Copy permissions" message, when permissions were copied.Joas Schilling2010-05-271-2/+4
| | |/ /
| * | | Merge branch 'ticket/bantu/8792' into develop-olympusNils Adermann2010-05-301-1/+1
| |\ \ \
| | * | | [ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.Andreas Fischer2010-05-161-1/+1
| | |/ /
| * | | [ticket/7782] Return 404 HTTP status code for nonexistent attachments.Oleg Pudeyev2010-05-171-1/+1
| * | | [ticket/7782] Added spaces.Oleg Pudeyev2010-05-171-1/+1
| * | | [ticket/7782] Added phpdoc comment for send_status_line function.Oleg Pudeyev2010-05-161-0/+20
| * | | [ticket/7782] Send status line using refactored download/file.php logic.Oleg Pudeyev2010-05-161-1/+22
| |/ /
* | | Merge branch 'develop-olympus' into developNils Adermann2010-05-168-37/+51
|\ \ \ | |/ /
| * | [feature/notify_status] Define'd constants for notify_statusMark2010-05-163-11/+16
| * | Merge branch 'ticket/p/7782' into develop-olympusNils Adermann2010-05-161-0/+5
| |\ \
| | * | [ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is reque...Oleg Pudeyev2010-05-161-0/+5
| * | | Merge branch 'ticket/bantu/9547' into develop-olympusNils Adermann2010-05-161-2/+3
| |\ \ \
| | * | | [ticket/9547] Use separate constants for display/enable active topics.Andreas Fischer2010-05-161-2/+3
| * | | | Merge branch 'ticket/nickvergessen/9548' into develop-olympusNils Adermann2010-05-161-13/+20
| |\ \ \ \
| | * | | | [ticket/9548] Delete user quicktool drop down should have an empty or invalid...Joas Schilling2010-04-181-13/+20
| | | |/ / | | |/| |
| * | | | Merge branch 'ticket/aptx/9525' into develop-olympusNils Adermann2010-05-161-1/+1
| |\ \ \ \
| | * | | | [ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting wit...Marek A. RuszczyƄski2010-05-161-1/+1
| * | | | | [ticket/9510] Unable to copy permissions from and to forums you cannot seeJosh Woody2010-05-161-2/+2
| * | | | | [ticket/9510] Unable to copy permissions from and to forums you cannot seeJosh Woody2010-05-161-5/+1
| * | | | | Merge branch 'ticket/nickvergessen/9546' into develop-olympusNils Adermann2010-05-161-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/9546] Also delete bookmarks, when a topic is deleted.Joas Schilling2010-05-161-1/+1
| | | |/ / / | | |/| | |
| * | | | | Merge branch 'ticket/nickvergessen/9529' into develop-olympusNils Adermann2010-05-161-1/+1
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |