Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [ticket/12236] Move AOL Instant Messanger field to custom profile field | Joas Schilling | 2014-03-05 | 1 | -4/+0 |
| | | | | PHPBB3-12236 | ||||
* | [ticket/12237] Convert yahoo messanger to custom profile field | Joas Schilling | 2014-03-05 | 1 | -4/+0 |
| | | | | PHPBB3-12237 | ||||
* | [develop] Fix incorrect merge conflict resolution from PR #2085 | Nils Adermann | 2014-03-05 | 1 | -1/+1 |
| | | | | PHPBB3-12235 | ||||
* | Merge remote-tracking branch 'github-nickvergessen/ticket/12235' into develop | Nils Adermann | 2014-03-05 | 4 | -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 field | Joas Schilling | 2014-03-04 | 1 | -4/+0 |
| | | | | | | | | PHPBB3-12235 | ||||
| * | [ticket/12187] Remove user_website functionality | Joas Schilling | 2014-03-03 | 2 | -8/+0 |
| | | | | | | | | PHPBB3-12187 | ||||
| * | [ticket/12187] Add URL type for profile fields | Joas Schilling | 2014-03-03 | 1 | -0/+3 |
| | | | | | | | | PHPBB3-12187 | ||||
| * | [ticket/12234] Replace ICQ with custom profile field | Joas Schilling | 2014-02-28 | 1 | -4/+0 |
| | | | | | | | | PHPBB3-12234 | ||||
| * | [ticket/12233] Allow profile fields to be contact fields | Joas Schilling | 2014-02-28 | 1 | -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.html | hjpotter92 | 2014-03-04 | 1 | -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: auto | Crizzo | 2014-03-02 | 1 | -1/+1 |
| | | | | | | | | PHPBB3-12126 | ||||
* | | [ticket/12126] Changed .phpbb_alert "max-width: 640px" to "width: 620px" | Crizzo | 2014-03-02 | 1 | -1/+1 |
|/ | | | | PHPBB3-12126 | ||||
* | Merge pull request #2037 from prototech/ticket/12080 | Nathan Guse | 2014-02-20 | 2 | -1/+17 |
|\ | | | | | [ticket/12080] Fix color palettes when responsive. | ||||
| * | [ticket/12080] Stop responsive ACP sig textarea from dropping to second line. | Cesar G | 2014-02-16 | 2 | -1/+9 |
| | | | | | | | | PHPBB3-12080 | ||||
| * | [ticket/12080] Reduce the palette options in all locations when responsive. | Cesar G | 2014-02-16 | 1 | -0/+8 |
| | | | | | | | | PHPBB3-12080 | ||||
* | | [ticket/12200] Add missing profile field template files to adm/style/ directory | Cesar G | 2014-02-19 | 6 | -0/+26 |
| | | | | | | | | PHPBB3-12200 | ||||
* | | [ticket/12153] Replace old template variables with {PAGE_NUMBER}. | Cesar G | 2014-02-19 | 2 | -2/+2 |
| | | | | | | | | PHPBB3-12153 | ||||
* | | Merge pull request #2002 from prototech/ticket/12153 | Nathan Guse | 2014-02-18 | 3 | -3/+3 |
|\ \ | | | | | | | [ticket/12153] Assign PAGE_NUMBER in pagination.generate_template_pagination() | ||||
| * | | [ticket/12153] Remove redundant calls to pagination.on_page(). | Cesar G | 2014-02-03 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-12153 | ||||
| * | | [ticket/12153] Remove vars already assigned in generate_template_pagination(). | Cesar G | 2014-02-03 | 2 | -2/+2 |
| | | | | | | | | | | | | PHPBB3-12153 | ||||
* | | | Merge remote-tracking branch 'Zoddo/ticket/12003' into develop | Cesar G | 2014-02-17 | 1 | -1/+0 |
|\ \ \ | |_|/ |/| | | | | | | | | * Zoddo/ticket/12003: [ticket/12003] ACP broken when error thrown | ||||
| * | | [ticket/12003] ACP broken when error thrown | Zoddo | 2014-02-17 | 1 | -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 memberlist | Joas Schilling | 2014-02-10 | 1 | -0/+4 |
| | | | | | | | | PHPBB3-12169 | ||||
* | | [ticket/12169] Convert user_from to profile field location | Joas Schilling | 2014-02-10 | 1 | -4/+0 |
| | | | | | | | | | | | | Missing changes on memberlist view due to missing functionality PHPBB3-12169 | ||||
* | | [ticket/12115] Also port user interests to profile fields | Joas Schilling | 2014-02-06 | 1 | -4/+0 |
| | | | | | | | | PHPBB3-12115 | ||||
* | | [ticket/12115] Remove occupation field from html files | Joas Schilling | 2014-02-06 | 1 | -4/+0 |
|/ | | | | PHPBB3-12115 | ||||
* | Merge pull request #1942 from nickvergessen/ticket/11996 | Nathan Guse | 2014-02-03 | 1 | -0/+17 |
|\ | | | | | [ticket/11996] Add explanation how to correctly remove and update an extension | ||||
| * | [ticket/11996] Use a table for better styling | Joas Schilling | 2014-01-13 | 1 | -2/+17 |
| | | | | | | | | PHPBB3-11996 | ||||
| * | [ticket/11996] Add explanation how to correctly remove and update an extension | Joas Schilling | 2013-12-27 | 1 | -0/+2 |
| | | | | | | | | | | | | | | See http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=44001 for more information about the decision. PHPBB3-11996 | ||||
* | | [ticket/12125] Specify nth-child selectors separately - IE8 does not like them | Cesar G | 2014-01-24 | 1 | -2/+10 |
| | | | | | | | | PHPBB3-12125 | ||||
* | | [ticket/12011] Align ACP tabs to the right and separate ACP content from menu. | Cesar G | 2014-01-17 | 1 | -2/+2 |
| | | | | | | | | PHPBB3-12011 | ||||
* | | Merge pull request #1938 from prototech/ticket/12077 | Nathan Guse | 2014-01-17 | 1 | -1/+1 |
|\ \ | | | | | | | [ticket/12077] Ensure that valid upload methods are presented to user in language packs page. | ||||
| * | | [ticket/12077] Add missing space after template block name. | Cesar G | 2013-12-19 | 1 | -1/+1 |
| | | | | | | | | | | | | PHPBB3-12077 | ||||
* | | | Merge pull request #1920 from prototech/ticket/12038 | Nathan Guse | 2013-12-30 | 6 | -44/+33 |
|\ \ \ | | | | | | | | | [ticket/12038] AJAXify move up/down buttons for various ACP pages. | ||||
| * | | | [ticket/12038] AJAXify move up/down buttons in report/denial reasons page. | Cesar G | 2013-12-05 | 1 | -11/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-12038 | ||||
| * | | | [ticket/12038] AJAXify move up/down buttons in custom profile fields page. | Cesar G | 2013-12-05 | 1 | -11/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-12038 | ||||
| * | | | [ticket/12038] AJAXify move up/down buttons in the permission roles page. | Cesar G | 2013-12-05 | 1 | -14/+5 |
| | | | | | | | | | | | | | | | | PHPBB3-12038 | ||||
| * | | | [ticket/12038] AJAXify move up/down buttons in the module management pages. | Cesar G | 2013-12-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-12038 | ||||
| * | | | [ticket/12038] AJAXify move up/down buttons in the smilies/topic icons page. | Cesar G | 2013-12-05 | 1 | -4/+6 |
| | | | | | | | | | | | | | | | | PHPBB3-12038 | ||||
| * | | | [ticket/12038] Check that the move action succeeded before moving the rows. | Cesar G | 2013-12-05 | 1 | -2/+10 |
| | | | | | | | | | | | | | | | | PHPBB3-12038 | ||||
* | | | | Merge pull request #1913 from prototech/ticket/12055 | Nathan Guse | 2013-12-30 | 18 | -57/+56 |
|\ \ \ \ | |_|_|/ |/| | | | [ticket/12055] Alternate table row background colors using nth-child rule. | ||||
| * | | | [ticket/12055] Alternate table row background colors using nth-child rule. | Cesar G | 2013-12-04 | 18 | -57/+56 |
| | | | | | | | | | | | | | | | | PHPBB3-12055 | ||||
* | | | | [ticket/11911] Warn admins when there is no search index for the selected engine | Joas Schilling | 2013-12-27 | 1 | -0/+6 |
| | | | | | | | | | | | | | | | | PHPBB3-11911 | ||||
* | | | | Merge remote-tracking branch 'vsephpbb/ticket/12060' into develop | Joas Schilling | 2013-12-20 | 2 | -1/+5 |
|\ \ \ \ | |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vsephpbb/ticket/12060: (37 commits) [ticket/12060] A little less verbose cleanup of event docblocks [ticket/12060] Further clarifying new event docblocks as much as possible [ticket/12060] More fixes to dockblock for acp_bbcodes_modify_create event [ticket/12060] Remove whitespaces [ticket/12060] Fix docblock for acp_bbcodes_modify_create event [ticket/12060] Rename event in message parser to modify_format_display_text_after [ticket/12060] Add num_predefined_bbcodes to display_custom_bbcodes_modify_sql [ticket/12060] Further clarify/fix a var in acp_bbcodes_modify_create event doc block [ticket/12060] Use separate template event for acp user signature posting buttons [ticket/12060] Rename event from append to after in acp_bbcodes.html [ticket/12060] Correctly label alpha versions in event docblocks [ticket/12060] Fix u_action comments in docblocks [ticket/12060] Change @since in event docblocks [ticket/12060] Update the docblock comments in acp core events [ticket/12060] Refactor u_action in the events that use it [ticket/12060] Use $sql_ary instead of $sql [ticket/12060] Update docblock for core event due to addition of another var [ticket/12060] Remove re-tabbing of html from subsilver2 files [ticket/12060] Add $update_this_message var to the core event [ticket/12060] Adjust last item in array to use a comma instead of closing parenthesis ... | ||||
| * | | | [ticket/12060] Use separate template event for acp user signature posting ↵ | Matt Friedman | 2013-12-13 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | buttons PHPBB3-12060 | ||||
| * | | | [ticket/12060] Rename event from append to after in acp_bbcodes.html | Matt Friedman | 2013-12-13 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-12060 | ||||
| * | | | [ticket/12060] Use actions class for BBCodes list in ACP | Matt Friedman | 2013-12-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-12060 | ||||
| * | | | [ticket/12060] Add template events posting_editor_buttons_before/after | Matt Friedman | 2013-12-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-12060 | ||||
| * | | | [ticket/12060] Add template event acp_bbcodes_actions_prepend/append | Matt Friedman | 2013-12-04 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | PHPBB3-12060 | ||||
| * | | | [ticket/12060] Add template event acp_bbcodes_edit_form_append | Matt Friedman | 2013-12-04 | 1 | -0/+2 |
| | | | | | | | | | | | | | | | | PHPBB3-12060 |