aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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-103-30/+104
|\ \ \ | |/ /
| * | Merge branch 'ticket/rxu/6712' into develop-olympusNils Adermann2011-06-103-30/+104
| |\ \
| | * | [ticket/6712] Properly explain result of setting the bump interval to 0.Nils Adermann2011-06-101-1/+1
| | * | [ticket/6712] Add phpbb_ function name prefix, more docs, rename current_timerxu2011-05-012-11/+22
| | * | [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-182-29/+92
* | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-095-5/+6
|\ \ \ \ | |/ / /
| * | | Merge branch 'ticket/adamreyher/9878' into develop-olympusNils Adermann2011-06-095-5/+6
| |\ \ \
| | * | | [ticket/9878] Remove IE7 emulation from prosilver/subSilver2Adam Reyher2011-06-095-5/+6
* | | | | Merge branch 'develop-olympus' into developNils Adermann2011-06-093-2/+92
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'ticket/rxu/217' into develop-olympusNils Adermann2011-06-093-2/+92
| |\ \ \ \
| | * | | | [ticket/217] Use positive assertions in tests.Oleg Pudeyev2011-06-061-9/+27
| | * | | | [ticket/217] Silence errors in tests, not code.Oleg Pudeyev2011-06-063-1/+25
| | * | | | [ticket/217] Use positive parameter statement for bbcode_init()rxu2011-06-062-3/+3
| | * | | | [ticket/217] Adjust patch, add testsrxu2011-06-062-3/+49
| | * | | | [ticket/217] Multiline [url] not convertedrxu2011-06-061-1/+3
* | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-092-6/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge remote-tracking branch 'nickvergessen/ticket/10068' into develop-olympusAndreas Fischer2011-06-092-6/+2
| |\ \ \ \ \
| | * | | | | [ticket/10068] Style links posted in posts the same way as in signatures.Joas Schilling2011-06-062-6/+2
* | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-5/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge remote-tracking branch 'nickvergessen/ticket/10171' into develop-olympusAndreas Fischer2011-06-091-5/+7
| |\ \ \ \ \ \
| | * | | | | | [ticket/10171] Fix displaying the "PM marking colours" in Firefox4.Joas Schilling2011-05-051-5/+7
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-095-8/+24
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'naderman/ticket/7888' into develop-olympusAndreas Fischer2011-06-095-8/+24
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/7888] Swap in-forum/topic search to GET forms.Nils Adermann2011-06-095-8/+24
| | | |_|_|/ / / | | |/| | | | |
* | | | | | | | Merge remote-tracking branch 'nickvergessen/ticket/8138' into developAndreas Fischer2011-06-091-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/8138] Fix unit test for build_cfg_templateJoas Schilling2011-06-091-1/+1
|/ / / / / / / /
* | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-092-1/+9
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Merge remote-tracking branch 'naderman/ticket/7057' into develop-olympusAndreas Fischer2011-06-092-5/+13
| |\ \ \ \ \ \ \
| | * | | | | | | [ticket/7057] Use GET for quicksearch and add session id to hidden fieldsNils Adermann2011-06-022-1/+9
| | * | | | | | | [ticket/7057] Remove trailing whitespace in functions.phpNils Adermann2011-06-021-4/+4
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-094-8/+8
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'naderman/ticket/8138' into develop-olympusAndreas Fischer2011-06-094-8/+8
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/8138] Add autocomplete="off" to acp_board and ldap settingsNils Adermann2011-06-032-2/+2
| | * | | | | | | | [ticket/8138] Add autocomplete="off" to a user and forum ACP.Nils Adermann2011-06-032-6/+6
| | | |_|_|_|/ / / | | |/| | | | | |
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-094-1/+100
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Merge remote-tracking branch 'naderman/ticket/10005' into develop-olympusAndreas Fischer2011-06-094-1/+100
| |\ \ \ \ \ \ \ \
| | * | | | | | | | [ticket/10005] Add description to test casesNils Adermann2011-06-031-10/+13
| | * | | | | | | | [ticket/10005] Add validation of dropdown custom profile field valuesNils Adermann2011-06-024-1/+97
* | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge remote-tracking branch 'naderman/ticket/10204' into develop-olympusAndreas Fischer2011-06-091-1/+1
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / | |/| | | | | | | |
| | * | | | | | | | [ticket/10204] Detect binary file changes in dirs with names containing dotsNils Adermann2011-06-091-1/+1
* | | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-091-2/+2
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /