aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
Commit message (Expand)AuthorAgeFilesLines
* [ticket/11181] Bump PHP requirement to 5.3.3 (from 5.3.2)Igor Wiedler2012-11-098-13/+13
* Merge PR #1044 branch 'develop-olympus' into developOleg Pudeyev2012-11-091-2/+0
|\
| * Merge PR #1044 branch 'bantu/ticket/11178' into develop-olympusOleg Pudeyev2012-11-091-2/+0
| |\
| | * [ticket/11178] Do not set error_reporting to E_ALL in database_updater.phpAndreas Fischer2012-11-091-2/+0
* | | Merge PR #1042 branch 'develop-olympus' into developOleg Pudeyev2012-11-092-11/+60
|\ \ \ | |/ /
| * | [ticket/10897] Combine bot updates and bot delete.Andreas Fischer2012-11-091-40/+31
| * | [ticket/10897] Use same code/query for deleting.Andreas Fischer2012-11-091-9/+6
| * | [ticket/10897] Make sure the user we're fetching is a bot.Andreas Fischer2012-11-091-2/+3
| * | [ticket/10897] Do not handle IP address. There is no need.Andreas Fischer2012-11-091-13/+7
| * | [ticket/10897] Update by user_id instead of bot_name.Andreas Fischer2012-11-091-7/+8
| * | [ticket/10897] Move bot delete data to the relevant foreach loop.Andreas Fischer2012-11-091-9/+9
| * | [ticket/10897] Add comment about what's going on.Andreas Fischer2012-11-091-0/+1
| * | [ticket/10897] Remove unnecessary string casting.Andreas Fischer2012-11-091-2/+2
| * | [ticket/10897] Add space after foreach.Andreas Fischer2012-11-091-2/+2
| * | [ticket/10897] Update bots during phpBB updateCarlo2012-11-091-0/+70
| * | [ticket/10897] Bot list updatedCarlo2012-11-091-11/+5
| |/
* | Merge remote-tracking branch 'github-p/ticket/11174' into developNils Adermann2012-11-091-0/+4
|\ \
| * | [ticket/11174] Started on search tests - keyword splitting.Oleg Pudeyev2012-11-081-0/+4
* | | Merge remote-tracking branch 'github-p/feature/prune-users' into developNils Adermann2012-11-097-167/+328
|\ \ \
| * | | [feature/prune-users] $author_id_sql is no longer needed here.Oleg Pudeyev2012-11-061-2/+0
| * | | Merge remote-tracking branch 'upstream/develop' into feature/prune-usersOleg Pudeyev2012-11-06770-17759/+27936
| |\ \ \
| * | | | [feature/prune-users] Move quote to the correct line.Oleg Pudeyev2012-04-251-2/+2
| * | | | [feature/prune-users] Split one line into two lines for readability.Oleg Pudeyev2012-04-191-1/+2
| * | | | [feature/prune-users] Use empty for checking array size.Oleg Pudeyev2012-04-191-1/+1
| * | | | [feature/prune-users] Fix issues with queries pointed out by bantu.Oleg Pudeyev2012-04-191-2/+6
| * | | | [feature/prune-users] Add spaces inside brackets.Oleg Pudeyev2012-04-191-1/+1
| * | | | [feature/prune-users] Use a map instead of performing array scans.Oleg Pudeyev2012-04-191-2/+4
| * | | | [feature/prune-users] Fix incorrect condition when deleting log entries.Oleg Pudeyev2012-04-191-1/+1
| * | | | [feature/prune-users] Non-cosmetic changes per bantu's review.Oleg Pudeyev2012-04-192-6/+6
| * | | | [feature/prune-users] Cosmetic changes per bantu's review.Oleg Pudeyev2012-03-252-7/+7
| * | | | [feature/prune-users] Minor UI adjustment and bug fixesjellydoughnut2012-01-062-14/+6
| * | | | [feature/prune_users] Moved set_config_count out of user loop.Oleg Pudeyev2011-05-081-1/+8
| * | | | [feature/prune-users] Fixed user id check in undelivered users loop.Oleg Pudeyev2011-05-081-1/+1
| * | | | [feature/prune-users] Call sql_is_set once for author ids in user_delete.Oleg Pudeyev2011-05-081-4/+6
| * | | | [feature/prune-users] Replaced missed occurrences of $user_id with $user_ids.Oleg Pudeyev2011-05-081-2/+2
| * | | | [feature/prune-users] Call sql_is_set for user ids once in user_delete.Oleg Pudeyev2011-05-081-7/+9
| * | | | [feature/prune-users] Fixed whitespace in language file.Oleg Pudeyev2011-05-081-8/+8
| * | | | Merge branch 'develop' into feature/prune-usersOleg Pudeyev2011-05-08117-2065/+3097
| |\ \ \ \
| * | | | | [feature/prune-users] Apply 904bcb86a054ab6256da565098eb9bd8ab20414b.Oleg Pudeyev2011-05-081-2/+2
| * | | | | Merge commit '47dc492839ea44cb9aa3d0ad23f09dd2fd0b4ed9' into feature/prune-usersOleg Pudeyev2011-05-081-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge commit '441755bf170e49799e311c71b2123ff263970d62' into feature/prune-usersOleg Pudeyev2011-05-084-14/+18
| |\ \ \ \ \ \
| * | | | | | | [feature/prune-users] Adjust some language strings for new featuresJosh Woody2011-05-084-45/+161
| * | | | | | | [feature/prune-users] Apply e6ed55a9c1ceb07ab2e87d4a53f9e688fda319c5.Oleg Pudeyev2011-05-081-40/+1
| * | | | | | | [feature/prune-users] Rework user_delete() functions_user.phpJosh Woody2011-05-083-126/+149
* | | | | | | | Merge remote-tracking branch 'p/ticket/11159' into developAndreas Fischer2012-11-082-2/+2
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | [ticket/11159] Static public is the currently approved order.Oleg Pudeyev2012-11-062-2/+2
* | | | | | | | Merge PR #1039 branch 'p/ticket/11154' into developOleg Pudeyev2012-11-071-1/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | [ticket/11154] Do not try to load any extensions when installing.Oleg Pudeyev2012-11-071-1/+11
* | | | | | | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-11-071-1/+1
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge remote-tracking branch 'p/ticket/11081' into develop-olympusAndreas Fischer2012-11-071-1/+1
| |\ \ \ \ \ \ \