aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-0/+4
|\
| * [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-231-0/+4
* | [ticket/11008] Remove eval() calls to get document[id]Igor Wiedler2012-07-211-5/+1
* | Merge pull request #843 from nickvergessen/feature/new-tz-handlingNils Adermann2012-07-193-9/+31
|\ \
| * \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/new-tz-h...Joas Schilling2012-07-183-3/+3
| |\ \
| * | | [feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicatesJoas Schilling2012-06-192-33/+9
| * | | [feature/new-tz-handling] Add doc blocks to js functionsJoas Schilling2012-06-181-0/+8
| * | | [feature/new-tz-handling] Use jQuery and INCLUDEJS for javascriptJoas Schilling2012-06-182-17/+14
| * | | [feature/new-tz-handling] Fix timezone option when editing a user in the ACPJoas Schilling2012-06-183-4/+50
| * | | Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into fe...Joas Schilling2012-06-041-5/+0
| |\ \ \
| | * | | [feature/new-tz-handling] Removed DST options from templates.Oleg Pudeyev2012-03-141-5/+0
* | | | | [feature/pagination-as-list] Various fixes and improvementsDrae2012-07-188-100/+24
* | | | | [ticket/10968] Render pagination within the templateDrae2012-07-187-25/+123
| |_|/ / |/| | |
* | | | 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