aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2011-06-101-2/+2
|\
* \ Merge branch 'develop-olympus' into developNils Adermann2011-06-101-18/+23
|\ \ | |/
| * Merge branch 'ticket/bantu/9802' into develop-olympusNils Adermann2011-06-101-18/+23
| |\
| | * [ticket/9802] Remove unnecessary htmlspecialchars() call on REMOTE_ADDR.Andreas Fischer2011-04-191-1/+1
| | * [ticket/9802] Only check for IPv4-mapped address when address is IPv6.Andreas Fischer2011-04-191-14/+19
| | * [ticket/9802] Fix tiny logic bug in loop determining REMOTE_ADDR.Andreas Fischer2011-04-191-2/+2
| | * [ticket/9802] Remove redundant character class definition from preg_replace.Andreas Fischer2011-04-191-2/+2
| | * [ticket/9802] Fix redundant str_replace call. No need to replace ' ' with ' '.Andreas Fischer2011-04-191-2/+2
* | | Merge branch 'develop-olympus' into developNils Adermann2011-06-101-0/+102
|\ \ \ | |/ /
| * | Merge branch 'ticket/rxu/6712' into develop-olympusNils Adermann2011-06-101-0/+102
| |\ \
| | * | [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_timerxu2011-05-011-10/+21
| | * | [ticket/6712] Pass $post_data by the value instead of by the reference.rxu2011-04-031-1/+1
| | * | [ticket/6712] Bump does not create new topic icon on index.rxu2010-10-181-0/+91
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-091-2/+9
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/rxu/217' into develop-olympusNils Adermann2011-06-091-2/+9
| |\ \ \
| | * | | [ticket/217] Silence errors in tests, not code.Oleg Pudeyev2011-06-061-1/+1
| | * | | [ticket/217] Use positive parameter statement for bbcode_init()rxu2011-06-061-2/+2
| | * | | [ticket/217] Adjust patch, add testsrxu2011-06-061-3/+8
| | * | | [ticket/217] Multiline [url] not convertedrxu2011-06-061-1/+3
* | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | Merge remote-tracking branch 'naderman/ticket/7057' into develop-olympusAndreas Fischer2011-06-091-4/+12
| |\ \ \ \
| | * | | | [ticket/7057] Use GET for quicksearch and add session id to hidden fieldsNils Adermann2011-06-021-0/+8
| | * | | | [ticket/7057] Remove trailing whitespace in functions.phpNils Adermann2011-06-021-4/+4
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-092-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'naderman/ticket/8138' into develop-olympusAndreas Fischer2011-06-091-1/+1
| |\ \ \ \ \
| | * | | | | [ticket/8138] Add autocomplete="off" to acp_board and ldap settingsNils Adermann2011-06-031-1/+1
| | | |/ / / | | |/| | |
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-1/+13
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'naderman/ticket/10005' into develop-olympusAndreas Fischer2011-06-091-1/+13
| |\ \ \ \ \
| | * | | | | [ticket/10005] Add validation of dropdown custom profile field valuesNils Adermann2011-06-021-1/+13
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-062-10/+11
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'naderman/ticket/10067' into develop-olympusAndreas Fischer2011-06-061-8/+9
| |\ \ \ \ \ \
| | * | | | | | [ticket/10067] Add separator to h_radio to place options on individual linesNils Adermann2011-06-051-8/+9
* | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-052-1/+17
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge branch 'ticket/bantu/10042' into develop-olympusNils Adermann2011-06-052-1/+17
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/10042] GD CAPTCHA: Call phpbb_mt_rand() where required.Andreas Fischer2011-03-051-1/+1
| | * | | | | | | [ticket/10042] GD CAPTCHA: Round offset to the next pixel.Andreas Fischer2011-03-051-1/+1
| | * | | | | | | [ticket/10042] Add mt_rand() wrapper which allows swapping $min and $max.Andreas Fischer2011-03-051-0/+16
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-051-2/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'ticket/p/10067' into develop-olympusNils Adermann2011-06-051-2/+8
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| | * | | | | | | [ticket/10067] Clarify language for user activation options in ACP.Oleg Pudeyev2011-04-301-2/+8
* | | | | | | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-053-7/+34
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge branch 'ticket/nickvergessen/10158' into develop-olympusNils Adermann2011-06-052-7/+28
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/10158] Remove some code duplication from generating the message.Nils Adermann2011-06-051-28/+10
| | * | | | | | | | [ticket/10158] Only view "Return to" links if they are useful.Joas Schilling2011-05-231-8/+34
| | * | | | | | | | [ticket/10158] Add return-link to folder, when the user replied from a folder.Joas Schilling2011-05-092-7/+17
| | * | | | | | | | [ticket/10158] Add "Return to Inbox"-link to "PM send"-message.Joas Schilling2011-05-051-2/+5
| * | | | | | | | | Merge branch 'ticket/bantu/10195' into develop-olympusNils Adermann2011-06-051-0/+6
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| | * | | | | | | | [ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.Andreas Fischer2011-05-261-0/+6
| | | |_|_|/ / / / | | |/| | | | | |
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-031-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'naderman/ticket/9950' into develop-olympusAndreas Fischer2011-06-031-2/+2
| |\ \ \ \ \ \ \ \