aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/adm/style
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'VSEphpbb/ticket/12292' into develop-ascraeusCesar G2014-03-221-1/+1
|\ | | | | | | | | * VSEphpbb/ticket/12292: [ticket/12292] Fix syntax error in admin.css
| * [ticket/12292] Fix syntax error in admin.cssMatt Friedman2014-03-221-1/+1
| | | | | | | | PHPBB3-12292
* | Merge branch 'develop-olympus' into develop-ascraeusJoas Schilling2014-03-221-1/+14
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | * develop-olympus: [ticket/12035] Correcting the condition [ticket/12035] Adding necessary conditions [ticket/12035] Adding link to user posts to ACP page Conflicts: phpBB/adm/style/acp_users_overview.html
| * | [ticket/12035] Adding necessary conditionsgeetakshi2014-03-201-1/+1
| | | | | | | | | | | | PHPBB3-12035
| * | [ticket/12035] Adding link to user posts to ACP pagegeetakshi2014-03-171-1/+1
| | | | | | | | | | | | | | | | | | Adding link of posts behind displayed number of posts of the user PHPBB3-12035
| * | [ticket/12093] Check that document.selection is supported.Cesar G2014-01-251-1/+1
| | | | | | | | | | | | PHPBB3-12093
* | | Merge remote-tracking branch 'geetakshi/ticket/11357' into develop-ascraeusJoas Schilling2014-03-222-2/+2
|\ \ \ | |_|/ |/| | | | | | | | * geetakshi/ticket/11357: [ticket/11357] Correcting invalid markup
| * | [ticket/11357] Correcting invalid markupgeetakshi2014-03-192-2/+2
| | | | | | | | | | | | PHPBB3-11357
* | | [ticket/12292] Improve style details pageMatt Friedman2014-03-202-12/+8
|/ / | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-12292 Gave style details page a proper heading and back button. Also removed a few obsolete code leftovers in the style and CSS. PHPBB3-12292
* | [ticket/12284] Improve readability of extension manager detailsMatt Friedman2014-03-171-6/+6
| | | | | | | | | | | | | | | | Use span tags like the rest of the ACP does, instead of P tags. There is no semantic need to use P tags here. These are not paragraphs. PHPBB3-12284
* | [ticket/12274] Add core.js to the install footerMatt Friedman2014-03-161-0/+1
| | | | | | | | | | | | Required so phpbb var is defined, as it is used in admin.js. PHPBB3-12274
* | Merge remote-tracking branch 'EXreaction/ticket/9871-2' into developJoas Schilling2014-03-142-37/+32
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EXreaction/ticket/9871-2: [ticket/9871] Can set current version to use instead of the phpBB version [ticket/9871] Fix indentation on comment [ticket/9871] Fix test name [ticket/9871] Split fast and slow version tests [ticket/9871] Option to force the stability when checking for updates [ticket/9871] Allow setting the host/file to load for the version class [ticket/9871] Restore get_remote_file_test [ticket/9871] Fix tests [ticket/9871] Typehint and comment on var types [ticket/9871] Mark test as slow [ticket/9871] Restore phpbb_version_compare [ticket/9871] Restore get_remote_file [ticket/9871] Use $request->variable instead of request_var [ticket/9871] Update version check file to use json format
| * | [ticket/9871] Update version check file to use json formatNathan Guse2014-02-192-37/+32
| | | | | | | | | | | | PHPBB3-9871
* | | Merge remote-tracking branch 'vsephpbb/ticket/12029' into developJoas Schilling2014-03-131-6/+0
|\ \ \ | | | | | | | | | | | | | | | | * vsephpbb/ticket/12029: [ticket/12029] Remove ellipsis and wrap long sidebar items in ACP
| * | | [ticket/12029] Remove ellipsis and wrap long sidebar items in ACPMatt Friedman2014-03-131-6/+0
| | | | | | | | | | | | | | | | PHPBB3-12029
* | | | [ticket/12073] Increase size of samp and code tags in ACPMatt Friedman2014-03-131-0/+4
|/ / / | | | | | | | | | PHPBB3-12073
* | | Merge remote-tracking branch 'VSEphpbb/ticket/12248' into developAndreas Fischer2014-03-061-9/+9
|\ \ \ | | | | | | | | | | | | | | | | * VSEphpbb/ticket/12248: [ticket/12248] Restore id attributes to extension details (used by tests)
| * | | [ticket/12248] Restore id attributes to extension details (used by tests)Matt Friedman2014-03-061-9/+9
| | | | | | | | | | | | | | | | PHPBB3-12248
* | | | Merge pull request #2088 from nickvergessen/ticket/12236Nathan Guse2014-03-051-8/+0
|\ \ \ \ | | | | | | | | | | Ticket/12236 Convert AOL and Yahoo to custom profile fields
| * | | | [ticket/12236] Move AOL Instant Messanger field to custom profile fieldJoas Schilling2014-03-051-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12236
| * | | | [ticket/12237] Convert yahoo messanger to custom profile fieldJoas Schilling2014-03-051-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12237
* | | | | Merge pull request #2080 from nickvergessen/ticket/12243Nathan Guse2014-03-051-32/+0
|\ \ \ \ \ | | | | | | | | | | | | [Ticket/12243] subsilver2 is missing profile field files
| * | | | | [ticket/12243] Remove outdated adm/style/custom_profile_fields.htmlJoas Schilling2014-03-031-32/+0
| | | | | | | | | | | | | | | | | | | | | | | | PHPBB3-12243
* | | | | | Merge pull request #2086 from VSEphpbb/ticket/12248Nathan Guse2014-03-055-31/+31
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | | [ticket/12248] Make extension details homepage a clickable link
| * | | | [ticket/12248] Remove unused label for attributes and related id tagsMatt Friedman2014-03-051-26/+26
| | | | | | | | | | | | | | | | | | | | PHPBB3-12248
| * | | | [ticket/12248] Use id instead of name attribute in a tagsMatt Friedman2014-03-055-5/+5
| | | | | | | | | | | | | | | | | | | | PHPBB3-12248
| * | | | [ticket/12248] Fix meta_author tags (IDs must be unique)Matt Friedman2014-03-051-8/+8
| | | | | | | | | | | | | | | | | | | | PHPBB3-12248
| * | | | [ticket/12248] Remove p tag in favor of strong tagMatt Friedman2014-03-051-1/+1
| | | | | | | | | | | | | | | | | | | | PHPBB3-12248
| * | | | [ticket/12248] Make extension details homepage a clickable linkMatt Friedman2014-03-041-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | http://tracker.phpbb.com/browse/PHPBB3-12248 PHPBB3-12248
* | | | [develop] Fix incorrect merge conflict resolution from PR #2085Nils Adermann2014-03-051-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12235
* | | | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into developNils Adermann2014-03-054-17/+10
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * github-nickvergessen/ticket/12235: [ticket/12235] Convert WLM to custom profile field [ticket/12187] Do not make clickable when using as contact field [ticket/12187] Split generate_profile_fields_template() into 2 methods [ticket/12187] Remove user_website field [ticket/12187] Remove user_website functionality [ticket/12187] Convert website field data to custom profile field [ticket/12187] Add URL type for profile fields [ticket/12234] Replace ICQ with custom profile field [ticket/12233] Update schema file [ticket/12233] Add images back to subsilver2 [ticket/12233] Allow profile fields to be contact fields Conflicts: phpBB/adm/style/acp_prune_users.html
| * | | | [ticket/12235] Convert WLM to custom profile fieldJoas Schilling2014-03-041-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12235
| * | | | [ticket/12187] Remove user_website functionalityJoas Schilling2014-03-032-8/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | [ticket/12187] Add URL type for profile fieldsJoas Schilling2014-03-031-0/+3
| | | | | | | | | | | | | | | | | | | | PHPBB3-12187
| * | | | [ticket/12234] Replace ICQ with custom profile fieldJoas Schilling2014-02-281-4/+0
| | | | | | | | | | | | | | | | | | | | PHPBB3-12234
| * | | | [ticket/12233] Allow profile fields to be contact fieldsJoas Schilling2014-02-281-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contact fields are displayed with in the contact section of the user profile and are displayed differently in the mini profile next to posts and private messages PHPBB3-12233
* | | | | [ticket/12245] Fix id attributes in acp_prune_users.htmlhjpotter922014-03-041-2/+2
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | The following labels had invalid id references: 1. joined (renamed to link to joined_after) 2. group_id (create teh id attribute on select box) PHPBB3-12245
* | | | [ticket/12126] left:0 and right: 0; admin.css --> width: autoCrizzo2014-03-021-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12126
* | | | [ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px"Crizzo2014-03-021-1/+1
|/ / / | | | | | | | | | PHPBB3-12126
* | | Merge pull request #2037 from prototech/ticket/12080Nathan Guse2014-02-202-1/+17
|\ \ \ | | | | | | | | [ticket/12080] Fix color palettes when responsive.
| * | | [ticket/12080] Stop responsive ACP sig textarea from dropping to second line.Cesar G2014-02-162-1/+9
| | | | | | | | | | | | | | | | PHPBB3-12080
| * | | [ticket/12080] Reduce the palette options in all locations when responsive.Cesar G2014-02-161-0/+8
| | | | | | | | | | | | | | | | PHPBB3-12080
* | | | [ticket/12200] Add missing profile field template files to adm/style/ directoryCesar G2014-02-196-0/+26
| | | | | | | | | | | | | | | | PHPBB3-12200
* | | | [ticket/12153] Replace old template variables with {PAGE_NUMBER}.Cesar G2014-02-192-2/+2
| |/ / |/| | | | | | | | PHPBB3-12153
* | | Merge pull request #2002 from prototech/ticket/12153Nathan Guse2014-02-183-3/+3
|\ \ \ | | | | | | | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination()
| * | | [ticket/12153] Remove redundant calls to pagination.on_page().Cesar G2014-02-031-1/+1
| | | | | | | | | | | | | | | | PHPBB3-12153
| * | | [ticket/12153] Remove vars already assigned in generate_template_pagination().Cesar G2014-02-032-2/+2
| | | | | | | | | | | | | | | | PHPBB3-12153
* | | | Merge remote-tracking branch 'Zoddo/ticket/12003' into developCesar G2014-02-171-1/+0
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | * Zoddo/ticket/12003: [ticket/12003] ACP broken when error thrown
| * | | [ticket/12003] ACP broken when error thrownZoddo2014-02-171-1/+0
| |/ / | | | | | | | | | | | | | | | Fix display of ACP when error is outputted before <html> tag. PHPBB3-12003
* | | [ticket/12169] Add new option to display profile fields on memberlistJoas Schilling2014-02-101-0/+4
| | | | | | | | | | | | PHPBB3-12169