1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

845 Commits

Author SHA1 Message Date
Joas Schilling
c991b1d587 Merge pull request #2782 from marc1706/ticket/12895
[ticket/12895] Rename user style setting to resolve conflict with style param

* marc1706/ticket/12895:
  [ticket/12895] Rename user style setting to resolve conflict with style param
2014-08-02 13:56:16 +02:00
Marc Alexander
89557f5cac Merge remote-tracking branch 'VSE/ticket/12864' into develop-ascraeus 2014-07-31 21:39:48 +02:00
Marc Alexander
98eeaacc36 [ticket/12895] Rename user style setting to resolve conflict with style param
The style URL parameter, i.e. style=1, will conflict with the user's style
setting due to it also being named style. This patch with solve this conflict.

PHPBB3-12895
2014-07-29 13:24:44 +02:00
Marc Alexander
d8867bb40d Merge remote-tracking branch 'nickvergessen/ticket/12891' into develop-ascraeus 2014-07-28 16:44:37 +02:00
Joas Schilling
75aef80104 [ticket/12891] Replace template loops with 1 loop to reduce generation time
PHPBB3-12891
2014-07-25 13:27:49 +02:00
Marc Alexander
3cd7078900 Merge remote-tracking branch 'paybas/ticket/12857' into develop-ascraeus 2014-07-24 11:00:43 +02:00
PayBas
1bd5edacb6 [ticket/12857] Add header/footer distinction for subsilver2 events
PHPBB3-12857
2014-07-23 16:09:12 +02:00
Matt Friedman
20c50e55b1 [ticket/12864] Add template event to header after stylesheets
https://tracker.phpbb.com/browse/PHPBB3-12864

PHPBB3-12864
2014-07-18 10:13:19 -07:00
Joas Schilling
0d2a478076 Merge pull request #2747 from Elsensee/ticket/12860
[ticket/12860] Add template events to mcp_ban.html

* Elsensee/ticket/12860:
  [ticket/12860] Fix typo
  [ticket/12860] Add template events mcp_ban_unban
  [ticket/12860] Add template events mcp_ban_fields
2014-07-17 15:31:20 +02:00
PayBas
2913b44080 [ticket/12857] Add missing template events breadcrumb_prepend
To insert links after site-home

PHPBB3-12857
2014-07-16 22:15:31 +02:00
PayBas
c7be452861 [ticket/12857] Add template events breadcrumbs_before/after
PHPBB3-12857
2014-07-16 22:15:30 +02:00
Oliver Schramm
42308091ef [ticket/12860] Add template events mcp_ban_unban
PHPBB3-12860
2014-07-16 20:00:05 +02:00
Oliver Schramm
876c1f4f00 [ticket/12860] Add template events mcp_ban_fields
PHPBB3-12860
2014-07-16 19:59:06 +02:00
PayBas
0ed971d129 [ticket/12859] Add template events ucp_pm_viewmessage_post_buttons
PHPBB3-12859
2014-07-16 18:04:54 +02:00
Joas Schilling
c0e0011b10 [prep-release-3.1.0-RC2] Update version to 3.1.0-RC2 2014-07-11 16:03:44 +02:00
PayBas
fbc07d3b14 [ticket/12804] Hide jabber for subSilver2 as well
PHPBB3-12804
2014-07-07 11:21:48 +02:00
Cesar G
5878314671 Merge remote-tracking branch 'PayBas/ticket/12662' into develop-ascraeus
* PayBas/ticket/12662: (29 commits)
  [ticket/12662] Hide quick-links when empty
  [ticket/12662] Fix white-space issue to make dropdowns uniform
  [ticket/12662] Remove last remaining linklist outside navbars
  [ticket/12662] Use data-last-responsive attr instead of hardcoded list
  [ticket/12662] Remove <li> container from logged_out_content event
  [ticket/12662] Username <span> fix for list columns
  [ticket/12662] Fix notifications dropdown positioning for RTL
  [ticket/12662] Update tests that utilize get_username_string
  [ticket/12662] Update subsilver2 index template event names
  [ticket/12662] Update events docs from b5 to rc1/rc2
  [ticket/12662] Move dropdown container from <li> to new inner div
  [ticket/12662] Remove linklist container and update template events
  [ticket/12662] Add span containers to all usernames for consistency
  [ticket/12662] IE8 fixes
  [ticket/12662] Fix responsive positioning of notifications dropdown
  [ticket/12662] Remove inherited props from ddown-extendended
  [ticket/12662] Change CSS selectors to direct descendants for linklist
  [ticket/12662] Reorder icon CSS rules alphabetically
  [ticket/12662] Use slack variable to determine line-break sensitivity
  [ticket/12662] Change new event names and fix events.md
  ...
2014-07-03 23:02:11 -07:00
Joas Schilling
29ec455a45 [ticket/12462] Do not use string "None" for different options
... it limits translations.

PHPBB3-12462
2014-06-25 22:14:33 +02:00
PayBas
419de00a9c [ticket/12662] Update subsilver2 index template event names
PHPBB3-12662
2014-06-25 14:19:08 +02:00
Joas Schilling
894dcaaaad [prep-release-3.1.0-RC1] Update version to 3.1.0-RC1 2014-06-24 23:21:43 +02:00
Joas Schilling
ec4924cf14 Merge pull request #2581 from lucifer4o/ticket/12696
[Ticket/12696] Add events to ucp_register.html

* lucifer4o/ticket/12696:
  [ticket/12696] Typo
  [ticket/12696] Change some parts
  [ticket/12696] Naming convention changes
  [ticket/12696] A small error with events.md perms
  [ticket/12696] Add events to evets.md
  [ticket/12696] Add prosilver ucp_register
  [ticket/12696] Add events to ucp_register.html
2014-06-23 19:49:21 +02:00
Joas Schilling
08f244229c Merge pull request #2609 from VSEphpbb/ticket/12728
[ticket/12728] Enforce box model sizing on image attachment thumbnails

* VSEphpbb/ticket/12728:
  [ticket/12728] Adjust .postimage sizing to 100%
  [ticket/12728] Enforce box model sizing on image attachment thumbnails
2014-06-23 19:42:19 +02:00
Cesar G
74a37259f7 Merge remote-tracking branch 'PayBas/ticket/12608' into develop-ascraeus
* PayBas/ticket/12608:
  [ticket/12608] Change CSS classes to prevent styling conflicts
  [ticket/12608] Add subSilver
  [ticket/12608] Changed get_styling() to get_style_class()
  [ticket/12608] Remove somewhat redundant reported color style
  [ticket/12608] Improved LTR and various bugfixes
  [ticket/12608] Clean up whitespace
  [ticket/12608] Add styling (CSS class) options to notifications
  [ticket/12608] Updated tests
  [ticket/12608] Improve notifications drop-down menu styling in header
2014-06-22 15:44:06 -07:00
Stanislav Atanasov
334c77cd0d [ticket/12696] Change some parts
Change placment of ucp_register_profile_fields_before

PHPBB3-12696
2014-06-22 23:24:49 +03:00
Stanislav Atanasov
dc5e2f5d9a [ticket/12696] Naming convention changes
Some changes propsed by nickvergessen

PHPBB3-12696
2014-06-22 22:21:52 +03:00
Stanislav Atanasov
6afd09fcb0 [ticket/12696] Add events to ucp_register.html
Add events to UCP Register template:
ucp_register_before - add before start of registration form fields
ucp_register_after - add after end of registration form fileds
ucp_register_passowrd_after - add event after passowrd field
ucp_register_language_before - add event before language selector
ucp_register_profiles_before - add event just before begining of
registration profile informatiom

All events are inside the registration form fieldset.
All events are inside the registration form

Justification:

Add abbility of extension author to include custom
checks or fields inside the registration form.
Like age check field/verification.

PHPBB3-12696
2014-06-22 22:21:52 +03:00
Joas Schilling
80ac276971 Merge pull request #2530 from PayBas/ticket/12646
[ticket/12646] Add data-# attribute to breadcrumb links

* PayBas/ticket/12646:
  [ticket/12646] Changed to navlinks.MICRODATA
  [ticket/12646] Add check for navlinks.FORUM_ID
  [ticket/12646] Changed index/home data attr & updated subsilver
  [ticket/12646] Add data-f attribute to breadcrumb links
2014-06-22 20:50:23 +02:00
Matt Friedman
d3db8b6565 [ticket/12728] Adjust .postimage sizing to 100%
PHPBB3-12728
2014-06-22 10:36:12 -07:00
Joas Schilling
ccb8fd18e2 Merge pull request #2514 from prototech/ticket/12553
[ticket/12553] Right-to-left fixes.

* prototech/ticket/12553:
  [ticket/12553] Fix responsive user profile.
  [ticket/12553] Fix responsive post profile.
  [ticket/12553] Remove dropdown-trigger class from member search input.
  [ticket/12553] Fix the merge topic list.
  [ticket/12553] Fix dropdown position of live search
  [ticket/12553] Fix the responsive topic/forum lists.
  [ticket/12553] Align the text in responsive tables to the right.
  [ticket/12553] Center the responsive CP menus instead of floating right.
  [ticket/12553] Open the notification dropdown to the left.
  [ticket/12553] Fix alignment of contact icon.
  [ticket/12553] Fix incorrect alignment in ACP responsive tables.
  [ticket/12553] Align alert text to the right.
  [ticket/12553] Remove incorrect size for site logo.
  [ticket/12553] Fix links in the last post column that are not clickable.
  [ticket/12553] Align contact icons to the right.
  [ticket/12553] Move Place inline and Delete buttons left of the file name.
2014-06-20 10:37:30 +02:00
PayBas
c805e53da3 [ticket/12608] Add subSilver
PHPBB3-12608
2014-06-15 10:02:12 +02:00
Cesar G
24bbd06d49 Merge remote-tracking branch 'PayBas/ticket/12613' into develop-ascraeus
* PayBas/ticket/12613: (25 commits)
  [ticket/12613] Add distinction between top/bottom action-bar
  [ticket/12613] Replaced topic-actions with action-bar
  [ticket/12613] Remove responsive linklist from memberlist
  [ticket/12613] Remove unnecessary checks and clean up CSS
  [ticket/12613] role="navigation" not allowed on <ul>
  [ticket/12613] Improved screen reader functionality
  [ticket/12613] Removed unnecessary checks
  [ticket/12613] Set fixed font-size
  [ticket/12613] Slightly better icons
  [ticket/12613] Typo and L_COLON
  [ticket/12613] Small inconsistency fixes
  [ticket/12613] Don't display page-jump if all pages are visible (6)
  [ticket/12613] Fixes from comments (single quotes and typos)
  [ticket/12613] Minor $bull; and <hr> fix
  [ticket/12613] Pagination should never be in responsive linklist
  [ticket/12613] Minor CSS fixes
  [ticket/12613] Dropdown-visible page-jump icon, fix focus() timing
  [ticket/12613] Renamed jump-to to page-jump to prevent confusion
  [ticket/12613] Removed form in order to prevent nested forms
  [ticket/12613] Fix functional test and post sorting bug
  ...
2014-06-14 16:30:41 -07:00
Cesar G
edd9c0e064 [ticket/12553] Open the notification dropdown to the left.
PHPBB3-12553
2014-06-14 09:54:16 -07:00
PayBas
ad59f371bf [ticket/12646] Changed to navlinks.MICRODATA
PHPBB3-12646
2014-06-10 12:47:31 +02:00
PayBas
a77a19af93 [ticket/12646] Add check for navlinks.FORUM_ID
PHPBB3-12646
2014-06-10 12:08:19 +02:00
Cesar G
169a9a560d [ticket/12667] Do not point viewtopic URL to unread post outside of view=unread
PHPBB3-12667
2014-06-09 13:54:43 -07:00
Nils Adermann
b6232aa9b2 Merge remote-tracking branch 'github-nickvergessen/ticket/10073' into develop-ascraeus
* github-nickvergessen/ticket/10073: (36 commits)
  [ticket/10073] Fix button descriptions
  [ticket/10073] Do not check disable boxes by default
  [ticket/10073] Store values with config_text in the ACP
  [ticket/10073] Move config values to config_text
  [ticket/10073] Fix request usage
  [ticket/10073] Deduplicate template variable names
  [ticket/10073] Get service from container
  [ticket/10073] Fix more "Contact Us" strings
  [ticket/10073] Move template code into the template
  [ticket/10073] Make contact page available when board is disabled
  [ticket/10073] Change name of the ACP module
  [ticket/10073] Deduplicate posting buttons code in ACP
  [ticket/10073] Use phpbb_validate_email to verify email address
  [ticket/10073] Add tests for new validate_email()
  [ticket/10073] Split email validation from email ban and taken checks
  [ticket/10073] Deduplicate the if statement
  [ticket/10073] Fallback to board_contact when contact page is disabled
  [ticket/10073] Remove language string from rebase conflict
  [ticket/10073] Add ACP module to add bbcode text for contact admin info
  [ticket/10073] Add new configs to the schema
  ...
2014-06-09 17:55:25 +02:00
Marc Alexander
4d24681259 [ticket/12666] Use "None" for images in root of gallery avatar path
"None" serves no real purpose right now. After this it will be used instead
of "Main" for images in the root of the gallery avatar path.

PHPBB3-12666
2014-06-05 23:28:00 +02:00
PayBas
c47b546bf0 [ticket/12613] Renamed jump-to to page-jump to prevent confusion
Jump-to can easily be confused with forum-jump.
Also switched the lang vars to reflect changes better

PHPBB3-12613
2014-06-05 09:59:35 +02:00
PayBas
560e0f97be [ticket/12565] Empty anchors introduce white-space in IE11
PHPBB3-12565
2014-06-02 14:05:46 +02:00
PayBas
eeb077c336 [ticket/12646] Changed index/home data attr & updated subsilver
PHPBB3-12646
2014-06-01 20:59:19 +02:00
Joas Schilling
be52ea882a Merge pull request #2357 from Nicofuma/ticket/11942
[ticket/11942] Delete post/topic reason should be added to logs

* Nicofuma/ticket/11942:
  [ticket/11942] Don't change the reason to '' when hard deleting
  [ticket/11942] Don't show the checkbox if the post is already soft-deleted
  [ticket/11942] Remove useless IF in templates
  [ticket/11942] Apply the modifications to subsilver
  [ticket/11942] Always display delete reason
  [ticket/11942] Edits messages
  [ticket/11942] Change the formulation
  [ticket/11942] Adding the reason to hard deleted topic/post
  [ticket/11942] Delete post/topic reason should be added to logs
2014-05-30 23:04:02 +02:00
Joas Schilling
b6135d3d02 [prep-release-3.1.0-b4] Update version to 3.1.0-b4 2014-05-30 16:23:44 +02:00
Joas Schilling
299fe086b4 [ticket/10073] Fix title for "Email topic"
PHPBB3-10073
2014-05-29 02:14:34 +02:00
Joas Schilling
84a02f5cef [ticket/10073] Use get_username_string and correctly sprintf for languages
PHPBB3-10073
2014-05-29 02:14:33 +02:00
Nils Adermann
d52f34f5ec [ticket/10073] Add a contact administrators page and refactor email forms.
The message to be displayed on top of the email form cannot be configured yet.

PHPBB3-10073
2014-05-29 02:14:27 +02:00
Yuriy Rusko
55e1f02151 [ticket/12594] Replace phpBB Group with phpBB Limited
PHPBB3-12594
2014-05-28 01:07:56 +02:00
Yuriy Rusko
27f787e5e4 [ticket/12594] Update footer credit lines
PHPBB3-12594
2014-05-27 21:39:30 +02:00
Tristan Darricau
1ba516a052 [ticket/11942] Don't show the checkbox if the post is already soft-deleted
PHPBB3-11942
2014-05-26 23:59:27 +02:00
Tristan Darricau
814d10fe5e [ticket/11942] Remove useless IF in templates
PHPBB3-11942
2014-05-26 23:35:47 +02:00
Joas Schilling
2aeb795494 Merge pull request #2444 from VSEphpbb/ticket/12531
[ticket/12531] Restore default topic link behavior to subsilver2

* VSEphpbb/ticket/12531:
  [ticket/12531] Add some line breaks to really long lines
  [ticket/12531] Restore default topic link functionality in subsilver2
2014-05-24 14:03:16 +02:00