aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'develop-olympus' into developAndreas Fischer2012-07-231-0/+4
|\ | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1 [ticket/10965] Introduce a new profile field option to display no value Conflicts: phpBB/includes/acp/acp_profile.php
| * [ticket/10965] Introduce a new profile field option to display no valueNils Adermann2012-07-231-0/+4
| | | | | | | | | | | | | | | | By default the 3.0.10 behaviour is kept, profile fields will not show up if they have either not yet been selected or in case of an optional dropdown field if the novalue option was selected. PHPBB3-10965
* | [ticket/11008] Remove eval() calls to get document[id]Igor Wiedler2012-07-211-5/+1
| | | | | | | | PHPBB3-11008
* | Merge pull request #843 from nickvergessen/feature/new-tz-handlingNils Adermann2012-07-193-9/+31
|\ \ | | | | | | Feature/new tz handling
| * \ Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ↵Joas Schilling2012-07-183-3/+3
| |\ \ | | | | | | | | | | | | feature/new-tz-handling
| * | | [feature/new-tz-handling] Use asset in acp and subsilver2 and remove duplicatesJoas Schilling2012-06-192-33/+9
| | | | | | | | | | | | | | | | PHPBB3-9558
| * | | [feature/new-tz-handling] Add doc blocks to js functionsJoas Schilling2012-06-181-0/+8
| | | | | | | | | | | | | | | | PHPBB3-9558
| * | | [feature/new-tz-handling] Use jQuery and INCLUDEJS for javascriptJoas Schilling2012-06-182-17/+14
| | | | | | | | | | | | | | | | PHPBB3-9558
| * | | [feature/new-tz-handling] Fix timezone option when editing a user in the ACPJoas Schilling2012-06-183-4/+50
| | | | | | | | | | | | | | | | PHPBB3-9558
| * | | Merge branch 'feature/new-tz-handling' of https://github.com/p/phpbb3 into ↵Joas Schilling2012-06-041-5/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | feature/new-tz-handling Conflicts: phpBB/includes/functions_profile_fields.php phpBB/includes/session.php phpBB/install/database_update.php
| | * | | [feature/new-tz-handling] Removed DST options from templates.Oleg Pudeyev2012-03-141-5/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-9558
* | | | | [feature/pagination-as-list] Various fixes and improvementsDrae2012-07-188-100/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extracted common template code for prosilver as per subsilver2. Various other fixups and oversight corrections, changed name of the "new" template function and re-introduced existing version. Altered on_page to compensate for removal of some templating vars from pagination routine. PHPBB3-10968
* | | | | [ticket/10968] Render pagination within the templateDrae2012-07-187-25/+123
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since phpBB 2 pagination has been rendered mostly within the source. This limits just what designers can do with pagination. The current form is also questionable in terms of "best practice". The aim is to move rendering completely to the template via the use of a block element. Enabling S_ template vars also allows for control over specific aspects of the pagination output such as next, previous, active and ellipsis. Related to this - merging the capabilities of the topic_generate_pagination with generate_pagination removes an element of duplication. PHPBB3-10968
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-07-013-3/+3
|\ \ \ \ | |/ / / |/| | / | | |/ | |/| * develop-olympus: [ticket/10773] ACP logo with registered trademark symbol
| * | [ticket/10773] ACP logo with registered trademark symbolPatrick Webster2012-06-303-3/+3
| | | | | | | | | | | | PHPBB3-10773
* | | Merge remote-tracking branch 'github-dhruv/ticket/10308' into developNils Adermann2012-05-291-14/+19
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | By Dhruv Goel via Dhruv Goel * github-dhruv/ticket/10308: [ticket/10308] fixes indentation [ticket/10308] fixes language variable name [ticket/10308] makes variable boolean [ticket/10308] fixes sql query, limit it to 1 [ticket/10308] fixes user deletion if no posts [ticket/10308] renames language key to USER_NO_POSTS_DELETE [ticket/10308] fix language and user's total posts [ticket/10308] fixes language entity. [ticket/10308] Displays message to user if there are no posts. [ticket/10308] disable retain/ delete posts option when deleting a user
| * | [ticket/10308] fixes indentationDhruv Goel2012-05-111-19/+19
| | | | | | | | | | | | | | | | | | | | | indentation is fixed and user_posts variable is compared as a boolean variable. PHPBB3-10308
| * | [ticket/10308] fixes language variable nameDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | Language variable has be renamed for better understanding PHPBB3-10308
| * | [ticket/10308] fixes sql query, limit it to 1Dhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | instead of fetching all posts by user we limit the query to 1 to check if a user has posts or not PHPBB3-10308
| * | [ticket/10308] fixes user deletion if no postsDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | introduces a hidden input field with retain posts as the mode in case user has no posts. PHPBB3-10308
| * | [ticket/10308] renames language key to USER_NO_POSTS_DELETEDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | language key renamed to make its usability more clearer. PHPBB3-10308
| * | [ticket/10308] fix language and user's total postsDhruv Goel2012-05-101-3/+5
| | | | | | | | | | | | | | | | | | | | | language modified to be clear and select box disappears in case no posts by user. user's total posts are fetched using a new query. PHPBB3-10308
| * | [ticket/10308] fixes language entity.Dhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | Language key has been changed and has been made more specific to avoid conflicts PHPBB3-10308
| * | [ticket/10308] Displays message to user if there are no posts.Dhruv Goel2012-05-101-0/+3
| | | | | | | | | | | | | | | | | | | | | While deletng the user, if the user has no posts in addition to the options being disabled an added message is displayed. PHPBB3-10308
| * | [ticket/10308] disable retain/ delete posts option when deleting a userDhruv Goel2012-05-101-1/+1
| | | | | | | | | | | | | | | | | | | | | When deleting a user, it asks whether the posts by user should be retained or deleted. The selection should be disable if the user has no posts. PHPBB3-10308
* | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-2/+2
|\ \ \ | |/ / | | | | | | | | | * develop-olympus: [ticket/10860] Fixing js error in updater
| * | Merge remote-tracking branch 'cyberalien/ticket/10860' into develop-olympusAndreas Fischer2012-05-061-2/+2
| |\ \ | | | | | | | | | | | | | | | | * cyberalien/ticket/10860: [ticket/10860] Fixing js error in updater
| | * | [ticket/10860] Fixing js error in updaterVjacheslav Trushkin2012-05-061-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixing javascript error in side-by-side diff styling in updater: resizing inner block instead of outer block and increasing height by inner/outer block difference. PHPBB3-10860
* | | | Merge branch 'develop-olympus' into developAndreas Fischer2012-05-061-13/+9
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10819] Remove support for older browsers [ticket/10819] Forgot this causes vertical scrollbars on IE [ticket/10819] Improve side-by-side diff styling
| * | | [ticket/10819] Remove support for older browsersPatrick Webster2012-04-171-4/+0
| | | | | | | | | | | | | | | | PHPBB3-10819
| * | | [ticket/10819] Forgot this causes vertical scrollbars on IEPatrick Webster2012-04-151-1/+0
| | | | | | | | | | | | | | | | PHPBB3-10819
| * | | [ticket/10819] Improve side-by-side diff stylingPatrick Webster2012-04-151-13/+14
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used transparent background for unchanged lines Shortened the table headers and make the background grey Added a border between the columns Increased the font size on pre blocks Added Consolas as the first pre font, for Windows users Added wordwrapping for pre blocks PHPBB3-10819
* | | Merge PR #734 branch 'shibulijack/ticket/10688' into developOleg Pudeyev2012-04-191-1/+1
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * shibulijack/ticket/10688: [ticket/10688] Update install.html for 3.1 and current practices. [ticket/10688] Update readme for 3.1 and current practices. [ticket/10688] Changed version 3.0 to 3.1 [ticket/10688] Updated version to 3.1 [ticket/10688] Changed 3.0 to 3.1 in docs Conflicts: phpBB/docs/INSTALL.html phpBB/docs/README.html
| * | | [ticket/10688] Changed version 3.0 to 3.1Shibu Lijack2012-04-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Replaced phpBB 3.0 to 3.1 in the stylesheets PHPBB-10688
* | | | Merge remote-tracking branch 'github-callumacrae/ticket/10783' into developNils Adermann2012-04-134-5/+5
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-callumacrae/ticket/10783: [ticket/10783] Added assets_version to ACP and simple_*.html. [ticket/10783] Added assets_version to subsilver2. [ticket/10783] Added ?assets_version to assets.
| * | | | [ticket/10783] Added assets_version to ACP and simple_*.html.Callum Macrae2012-04-114-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-10783
* | | | | [ticket/10784] Do not show ajax overlay unless neededMarc Alexander2012-04-121-4/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-10784
* | | | | Merge remote-tracking branch 'github-cyberalien/ticket/10754' into developNils Adermann2012-04-091-2/+2
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | * github-cyberalien/ticket/10754: [ticket/10754] Changing $style to $phpbb_style
| * | | | [ticket/10754] Changing $style to $phpbb_styleVjacheslav Trushkin2012-04-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Renaming global variable $style to $phpbb_style PHPBB3-10754
* | | | | [ticket/10650] Revert merge of 'rahulr92/ticket/10650' into developOleg Pudeyev2012-04-041-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The pull request (#654) was merged a little too quickly. In particular, display_last_subject per-forum option needs consensus. This reverts commit b1fb34a4d7e446768b9f66ba6dd359173cd2a5fb, reversing changes made to 7d6b289671c51694f17dd5f9849abf2534b55e59. PHPBB3-10650
* | | | | 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
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The most recent topic title of the forum can now be displayed on the board index. An option is provided in the ACP under the 'General Forum Setting' which allows the admin to enable or disable this feature. PHPBB3-10650
* | | | | Merge branch 'develop-olympus' into developOleg Pudeyev2012-04-042-2/+2
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/10607] Added 'Powered by' translation string. Conflicts: phpBB/adm/index.php phpBB/language/en/common.php
| * | | [ticket/10607] Added 'Powered by' translation string.Fyorl2012-04-043-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Added POWERED_BY line to common.php and modified the templates to use it. PHPBB3-10607
* | | | [ticket/10665] Adding includejs to acp templatesVjacheslav Trushkin2012-04-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Adding includejs to acp overall_footer.html PHPBB3-10665
* | | | Merge branch 'develop' into feature/merging-style-componentsVjacheslav Trushkin2012-03-3117-30/+246
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop: (175 commits) [feature/ajax] Remove strange non-breaking spaces from approve button [feature/ajax] Add entirely unrelated but nice newlines [feature/ajax] Unify phpbb_json_response instantiation [feature/ajax] Fix acp_styles activate_deactivate ajax callback name [feature/ajax] Send correct activate/deactivate JSON response in acp_profile [ticket/10270] Alter background colors for posts [feature/ajax] Remove not working module enable/disable ajax code [feature/ajax] Replace static call to phpbb_request with OO [feature/ajax] Remove quick-reply AJAX handling until we have something good [ticket/10270] Changing close button for ajax popups [ticket/10270] Disabling links in disappearing content [ticket/10291] Fixed an AJAX bug on quick reply form submit. [ticket/10273] Fixed accepting / denying posts AJAX. [ticket/10272] Removed code that was prevent event propogation in AJAX. [ticket/10291] Fixed a bug in the quick reply AJAX. [feature/ajax] Handle acp_modules error cases with JSON response [feature/ajax] Fix filter check, quick mod tools data-attribute [feature/ajax] Use the error handler [feature/ajax] Generic error handling with a phpbb.alert box [feature/ajax] Change filter semantics, some minor adjustments ... Conflicts: phpBB/adm/style/acp_styles.html phpBB/includes/acp/acp_styles.php
| * | | | [feature/ajax] Fix acp_styles activate_deactivate ajax callback nameIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | [feature/ajax] Remove not working module enable/disable ajax codeIgor Wiedler2012-03-312-1/+4
| | | | | | | | | | | | | | | | | | | | PHPBB3-10270
| * | | | [ticket/10270] Changing close button for ajax popupsVjacheslav Trushkin2012-03-313-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed close button for popups to match prosilver style and from img to css, moved color values to colours.css PHPBB3-10270
| * | | | [feature/ajax] Generic error handling with a phpbb.alert boxIgor Wiedler2012-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-10270
generated by cgit v1.2.1 (git 2.21.0) at 2025-03-24 16:39:59 +0000