aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-07-013-3/+3
|\
| * [ticket/10773] ACP logo with registered trademark symbolPatrick Webster2012-06-303-3/+3
* | Merge remote-tracking branch 'github-dhruv/ticket/10308' into developNils Adermann2012-05-291-14/+19
|\ \ | |/
| * [ticket/10308] fixes indentationDhruv Goel2012-05-111-19/+19
| * [ticket/10308] fixes language variable nameDhruv Goel2012-05-101-1/+1
| * [ticket/10308] fixes sql query, limit it to 1Dhruv Goel2012-05-101-1/+1
| * [ticket/10308] fixes user deletion if no postsDhruv Goel2012-05-101-1/+1
| * [ticket/10308] renames language key to USER_NO_POSTS_DELETEDhruv Goel2012-05-101-1/+1
| * [ticket/10308] fix language and user's total postsDhruv Goel2012-05-101-3/+5
| * [ticket/10308] fixes language entity.Dhruv Goel2012-05-101-1/+1
| * [ticket/10308] Displays message to user if there are no posts.Dhruv Goel2012-05-101-0/+3
| * [ticket/10308] disable retain/ delete posts option when deleting a userDhruv Goel2012-05-101-1/+1
* | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-2/+2
|\ \ | |/
| * Merge remote-tracking branch 'cyberalien/ticket/10860' into develop-olympusAndreas Fischer2012-05-061-2/+2
| |\
| | * [ticket/10860] Fixing js error in updaterVjacheslav Trushkin2012-05-061-2/+2
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-13/+9
|\ \ \ | |/ /
| * | [ticket/10819] Remove support for older browsersPatrick Webster2012-04-171-4/+0
| * | [ticket/10819] Forgot this causes vertical scrollbars on IEPatrick Webster2012-04-151-1/+0
| * | [ticket/10819] Improve side-by-side diff stylingPatrick Webster2012-04-151-13/+14
| |/
* | Merge PR #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-191-1/+1
|\ \
| * | [ticket/10688] Changed version 3.0 to 3.1Shibu Lijack2012-04-111-1/+1
* | | Merge remote-tracking branch 'github-callumacrae/ticket/10783' into developNils Adermann2012-04-134-5/+5
|\ \ \
| * | | [ticket/10783] Added assets_version to ACP and simple_*.html.Callum Macrae2012-04-114-5/+5
* | | | [ticket/10784] Do not show ajax overlay unless neededMarc Alexander2012-04-121-4/+8
* | | | Merge remote-tracking branch 'github-cyberalien/ticket/10754' into developNils Adermann2012-04-091-2/+2
|\ \ \ \ | |/ / / |/| | |
| * | | [ticket/10754] Changing $style to $phpbb_styleVjacheslav Trushkin2012-04-031-2/+2
* | | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-041-5/+0
* | | | Merge remote-tracking branch 'rahulr92/ticket/10650' into developDavid King2012-04-041-0/+5
|\ \ \ \
| * | | | [ticket/10650] Displaying last topic on forum listRahul2012-04-051-0/+5
| |/ / /
* | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-04-042-2/+2
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | [ticket/10607] Added 'Powered by' translation string.Fyorl2012-04-043-2/+3
* | | [ticket/10665] Adding includejs to acp templatesVjacheslav Trushkin2012-04-011-1/+2
* | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-3117-30/+246
|\ \ \
| * | | [feature/ajax] Fix acp_styles activate_deactivate ajax callback nameIgor Wiedler2012-03-311-1/+1
| * | | [feature/ajax] Remove not working module enable/disable ajax codeIgor Wiedler2012-03-312-1/+4
| * | | [ticket/10270] Changing close button for ajax popupsVjacheslav Trushkin2012-03-313-4/+14
| * | | [feature/ajax] Generic error handling with a phpbb.alert boxIgor Wiedler2012-03-311-1/+1
| * | | [feature/ajax] Do not hard-code sorting images of acp_forums orderingIgor Wiedler2012-03-313-8/+43
| * | | [feature/ajax] Make phpbb.ajaxify signature use single object (more explicit)Igor Wiedler2012-03-311-5/+21
| * | | [feature/ajax] JavaScript strict modeIgor Wiedler2012-03-311-0/+1
| * | | [feature/ajax] Stylistic JavaScript adjustmentsIgor Wiedler2012-03-311-9/+16
| * | | [feature/ajax] Use attr('data-foo') instead of data('foo')Igor Wiedler2012-03-311-6/+6
| * | | [ticket/10272] Removed some duplication calls to $.fn.data.Callum Macrae2012-03-311-3/+3
| * | | [ticket/10270] Moved the AJAX error langyage entries to the footer.Callum Macrae2012-03-311-1/+1
| * | | [ticket/10272] Renamed AJAX callback act_deact to activate_deactivate.Callum Macrae2012-03-314-4/+4
| * | | [ticket/10270] Fixed JavaScript alerts in the ACP.Callum Macrae2012-03-313-4/+10
| * | | [ticket/10271] Started using .call for javascript callbacks.Callum Macrae2012-03-311-9/+8
| * | | [ticket/10271] data-ajax="false" is now ignored.Callum Macrae2012-03-311-2/+5
| * | | [ticket/10271] Reduced calls to $ in the AJAX JavaScript.Callum Macrae2012-03-311-13/+17
| * | | [ticket/10271] Added comments to AJAX callbacks.Callum Macrae2012-03-311-3/+21