aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developNils Adermann2011-07-161-1/+1
|\
| * Merge remote-tracking branch 'github-bantu/ticket/10274' into develop-olympusNils Adermann2011-07-161-1/+1
| |\
| | * [ticket/10274] Remove hardcoded module_id from U_VERSIONCHECK_FORCE on acp_mainAndreas Fischer2011-07-151-1/+1
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-162-9/+3
|\ \ \ | |/ /
| * | Merge remote-tracking branch 'github-bantu/ticket/10263' into develop-olympusNils Adermann2011-07-162-9/+3
| |\ \
| | * | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_main.phpAndreas Fischer2011-07-141-4/+1
| | * | [ticket/10263] Call phpbb_version_compare() from includes/acp/acp_update.phpAndreas Fischer2011-07-141-5/+2
| | |/
* | | Merge branch 'develop-olympus' into developNils Adermann2011-07-163-4/+4
|\ \ \ | |/ /
| * | [ticket/5506] Do not display an empty last page after deleting logs.Joas Schilling2011-07-143-4/+4
| |/
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-07-071-0/+1
|\ \ | |/
| * [ticket/10250] Destroy cached md5 hash of site_logo on refreshing an imagesetNils Adermann2011-07-051-0/+1
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-161-1/+1
|\ \ | |/
| * [ticket/10221] Append unit (seconds) after input field, remove from explanationNils Adermann2011-06-161-1/+1
* | Merge branch 'develop-olympus' into developAndreas Fischer2011-06-111-0/+3
|\ \ | |/
| * [ticket/9992] Adding a limit on login attempts per IP.Nils Adermann2011-06-101-0/+3
* | Merge branch 'develop-olympus' into developAndreas 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-051-2/+8
|\ \ | |/
| * [ticket/10067] Clarify language for user activation options in ACP.Oleg Pudeyev2011-04-301-2/+8
* | Merge remote-tracking branch 'nickvergessen/ticket/8542' into developOleg Pudeyev2011-05-202-1/+7
|\ \
| * | [ticket/8542] Display custom profile fields in private messagesJoas Schilling2011-05-202-1/+7
* | | Merge branch 'feature/rxu/attachment-management-no-reassignment' into developOleg Pudeyev2011-04-242-1/+230
|\ \ \
| * | | [feature/attachment-management-no-reassignment] Handle privacy and some more.rxu2011-04-241-9/+45
| * | | [feature/attachment-management-no-reassignment] Further feature adjustments.rxu2011-04-112-20/+57
| * | | [feature/attachment-management-no-reassignment] Fix some more errorsrxu2011-04-112-1/+3
| * | | [feature/attachment-management-no-reassignment] Fix minor flaws in the code.rxu2011-04-101-5/+4
| * | | [feature/attachment-management-no-reassignment] Attachments managementrxu2011-04-102-0/+155
| |/ /
* | | [ticket/10148] Turn TEMPLATE_BITFIELD into an instance variable.Oleg Pudeyev2011-04-241-2/+2
* | | Merge branch 'ticket/nickvergessen/9684' into developOleg Pudeyev2011-04-111-3/+2
|\ \ \
| * | | [ticket/9684] Remove code in some more files especially includes/Joas Schilling2011-04-071-3/+2
| |/ /
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-04-101-10/+35
|\ \ \ | | |/ | |/|
| * | Merge branch 'ticket/erikfrerejean/9581' into develop-olympusOleg Pudeyev2011-04-101-10/+35
| |\ \
| | * | [ticket/9581] Fix missing indexErik Frèrejean2011-03-241-1/+1
| | * | [ticket/9581] Slightly tweaked queriesErik Frèrejean2011-03-041-14/+35
| | * | [ticket/9581] Make banlist table select optionalErik Frèrejean2011-03-041-2/+2
| | * | [ticket/9581] Mass e-mail to banned usersErik Frèrejean2011-03-041-8/+12
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2011-04-081-0/+4
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | [ticket/10084] Add smilie/icon errors out when file is missingJoas Schilling2011-04-071-0/+4
* | | Merge branch 'develop-olympus' into developIgor Wiedler2011-03-231-0/+12
|\ \ \ | |/ /
| * | [ticket/10033] "Disallow usernames" does not check already disallowed names.Joas Schilling2011-03-231-0/+12
* | | Merge branch 'develop-olympus' into developAndreas Fischer2011-03-151-2/+16
|\ \ \ | |/ /
| * | [ticket/9685] Buffer posts for search indexing when using mssqlnative.Nils Adermann2011-03-151-2/+16
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-03-101-1/+1
|\ \ \ | |/ /
| * | [ticket/10035] ACP template edit feature allows to read any files on webserver.rxu2011-03-071-1/+1
| |/
* | Merge branch 'ticket/9549' into developOleg Pudeyev2011-03-012-0/+128
|\ \
| * | [ticket/9549] Throw an error when the given field-name is invalid.Joas Schilling2011-02-161-1/+1
| * | [ticket/9549] Make the class non static and extend delete_group function.Joas Schilling2011-02-161-5/+8
| * | [ticket/9549] Add the module and files for the ACP.Joas Schilling2011-02-162-0/+125
* | | [ticket/8641] Added/removed several commas for consistency in acp_board.php.mtrs2011-02-261-7/+7
* | | Merge branch 'develop-olympus' into developOleg Pudeyev2011-02-241-1/+1
|\ \ \ | | |/ | |/|