aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2420 from prototech/ticket/9388Joas Schilling2014-05-112-6/+8
|\
| * [ticket/9388] Display only the settings for the selected search backend.Cesar G2014-05-081-4/+6
| * [ticket/9388] Display only the settings for the auth method that's selected.Cesar G2014-05-081-2/+2
* | [ticket/12476] Increase assets also from acp_styles and phpbbclin-aleha2014-05-091-0/+1
* | [ticket/12476] Increase asset version on cache purgen-aleha2014-05-091-1/+1
|/
* Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeusCesar G2014-05-051-1/+1
|\
| * [ticket/12332] Restore some changes back to original stateMatt Friedman2014-04-262-2/+2
| * [ticket/12332] Accomplish all word creaking in template and CSSMatt Friedman2014-04-262-3/+3
| * [ticket/12332] Fix displaying attachments with long file namesMatt Friedman2014-04-252-2/+2
* | Merge pull request #2267 from prototech/ticket/10737Joas Schilling2014-05-031-0/+1
|\ \
| * | [ticket/10737] Add config setting to disable live searches.Cesar G2014-04-231-0/+1
| |/
* | [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queriesJoas Schilling2014-05-021-1/+1
* | [feature/sqlite3] Add support for SQLite 3Patrick Webster2014-05-025-1/+119
* | Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into dev...Nils Adermann2014-05-021-0/+1
|\ \
| * | [ticket/8558] Fix field length in ACPOliver Schramm2014-04-171-1/+1
| * | [ticket/8558] Add display name in emails from boardMarkus Stenudd2014-04-171-0/+1
* | | Merge remote-tracking branch 'github-rxu/ticket/12409' into develop-ascraeusNils Adermann2014-05-021-25/+65
|\ \ \
| * | | [ticket/12409] Add acp_users.php core events to modify users preferences datarxu2014-04-171-25/+65
| |/ /
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/12273' into develop...Nils Adermann2014-05-023-13/+31
|\ \ \
| * | | [ticket/12273] Update since version to 3.1.0-a* styleJoas Schilling2014-04-252-11/+11
| * | | [ticket/12273] Update existing eventsJoas Schilling2014-04-252-5/+20
| * | | [ticket/12273] Fix long $vars lines for existing eventsJoas Schilling2014-04-242-2/+5
| |/ /
* | | Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into develop...Nils Adermann2014-05-022-2/+3
|\ \ \
| * | | [ticket/12371] Fix SQL queryJoas Schilling2014-04-251-1/+1
| * | | [ticket/12052] Use different visibility when post was editedJoas Schilling2014-04-252-2/+3
| | |/ | |/|
* | | [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.Andreas Fischer2014-04-2919-55/+36
|/ /
* | [ticket/12201] Add link to resync file stats after error.Cesar G2014-04-151-6/+9
|/
* Merge remote-tracking branch 'github-nickvergessen/ticket/12113' into develop...Nils Adermann2014-04-101-10/+6
|\
| * [ticket/12113] Correctly use plurals when deleting user warningsJoas Schilling2014-04-011-10/+6
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12282' into develop...Nils Adermann2014-04-101-1/+1
|\ \
| * | [ticket/12282] Use interface for type hintingJoas Schilling2014-04-011-1/+1
| |/
* | Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeusJoas Schilling2014-04-061-0/+9
|\ \
| * | [ticket/12150] Use shorter column names for prune settingsMarc Alexander2014-03-291-9/+9
| * | [ticket/12150] Add missing prune settings variables in acp_forumsMarc Alexander2014-03-291-0/+6
| * | [ticket/12150] Add options to acpMarc Alexander2014-03-291-0/+3
| |/
* | Merge remote-tracking branch 'Elsensee/ticket/7707' into develop-ascraeusJoas Schilling2014-04-053-9/+5
|\ \
| * | [ticket/7707] Fix undefined variable: perm_fromOliver Schramm2014-04-041-1/+3
| * | [ticket/7707] Add comma to last entry of arraysOliver Schramm2014-04-011-2/+2
| * | [ticket/7707] Remove unnecessary variablesOliver Schramm2014-03-261-3/+1
| * | [ticket/7707] Add get_username_string() where possibleOliver Schramm2014-03-163-8/+4
* | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-04-041-1/+1
|\ \ \
| * | | [ticket/12353] Fix displayed attachments in ACPOliver Schramm2014-04-041-1/+1
* | | | [ticket/12043] Correct try/catch exceptions for invalid extensionsMatt Friedman2014-03-291-49/+49
* | | | [ticket/12043] Sort Extensions by Display Name in ACP Extension manangerMatt Friedman2014-03-291-3/+30
| |_|/ |/| |
* | | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-221-0/+1
|\ \ \ | |/ /
| * | [ticket/12035] Correcting the conditiongeetakshi2014-03-201-1/+1
| * | [ticket/12035] Adding necessary conditionsgeetakshi2014-03-201-1/+1
| * | [ticket/12035] Adding link to user posts to ACP pagegeetakshi2014-03-171-0/+1
* | | [ticket/12292] Improve style details pageMatt Friedman2014-03-201-0/+3
* | | Merge pull request #2137 from geetakshi/ticket/8309Dhruv Goel2014-03-201-2/+2
|\ \ \