1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00

2882 Commits

Author SHA1 Message Date
Cesar G
bca34bd3bb Merge remote-tracking branch 'hanakin/ticket/12580' into develop-ascraeus
* hanakin/ticket/12580:
  [ticket/12580] Remove :link pseudo from a tag
2014-05-27 07:13:46 -07: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
Matt Friedman
3913ee9607 [ticket/12531] Add some line breaks to really long lines
PHPBB3-12531
2014-05-23 10:47:25 -07:00
hanakin
9a130e31a2 [ticket/12580] Remove :link pseudo from a tag
removed the :link pseudo from a tag as due to specificity it prevents
classes from altering any properties set to it.

PHPBB3-12580
2014-05-23 15:46:39 +02:00
Andreas Fischer
3d19776037 Merge pull request #2468 from nickvergessen/ticket/12555
[Ticket/12555] Make use of canonical urls to avoid duplicate content

* nickvergessen/ticket/12555:
  [ticket/12555] Add canonical URL for viewtopic
  [ticket/12555] Add canonical URL for viewforum
  [ticket/12555] Add canonical URl for memberlist mode=viewprofile
  [ticket/12555] Allow to set canonical URLs to avoid duplicate content
2014-05-23 03:06:42 +02:00
Joas Schilling
adf5daa1c7 Merge pull request #2467 from prototech/ticket/12551
[ticket/12551] Float breadcrumbs to the right in RTL languages.

* prototech/ticket/12551:
  [ticket/12551] Float breadcrumbs to the right in RTL languages.
2014-05-23 00:45:35 +02:00
Joas Schilling
7223339f1e Merge pull request #2466 from prototech/ticket/12550
[ticket/12550] Prevent last post column from jumping to second line in RTL.

* prototech/ticket/12550:
  [ticket/12550] Prevent last post column from jumping to second line in RTL.
2014-05-23 00:45:06 +02:00
Joas Schilling
a9cce2e857 Merge pull request #2465 from prototech/ticket/12549
[ticket/12549] Hide topic/forum list <dfn> tags in RTL languages.

* prototech/ticket/12549:
  [ticket/12549] Hide topic/forum list <dfn> tags in RTL languages.
2014-05-23 00:44:20 +02:00
Cesar G
8b5b318f0a Merge remote-tracking branch 'n-aleha/ticket/12547' into develop-ascraeus
* n-aleha/ticket/12547:
  [ticket/12547] Rename jquery.js to jquery.min.js in assets directory
2014-05-16 22:04:52 -07:00
Cesar G
747eb198ef Merge remote-tracking branch 'n-aleha/ticket/12525' into develop-ascraeus
* n-aleha/ticket/12525:
  [ticket/12525] Add string argument to contact and email user language variables
2014-05-16 20:04:34 -07:00
n-aleha
a114333209 [ticket/12525] Add string argument to contact and email user language variables
In language/en/common.php:
* Introduce a new language variable 'CONTACT' => 'Contact'
* Add a string argument to lang var 'CONTACT_USER' to avoid an appended
 '{USERNAME}' in template.
* Add a string argument to lang var 'SEND_EMAIL_USER' to avoid an appended
 '{USERNAME}' in template.

Also fix typos.

PHPBB3-12525
2014-05-17 04:50:57 +03:00
Joas Schilling
613f4f7525 [ticket/12555] Allow to set canonical URLs to avoid duplicate content
PHPBB3-12555
2014-05-16 11:32:01 +02:00
Cesar G
9860780ccf [ticket/12550] Prevent last post column from jumping to second line in RTL.
PHPBB3-12550
2014-05-15 11:38:04 -07:00
Cesar G
e2f2cc8902 [ticket/12549] Hide topic/forum list <dfn> tags in RTL languages.
PHPBB3-12549
2014-05-15 11:36:48 -07:00
Cesar G
4eb1294a27 [ticket/12551] Float breadcrumbs to the right in RTL languages.
PHPBB3-12551
2014-05-15 11:30:01 -07:00
n-aleha
cc99a6b6ab [ticket/12547] Rename jquery.js to jquery.min.js in assets directory
phpBB uses the minified version of jQuery hence the rename.

PHPBB3-12547
2014-05-15 01:18:26 +03:00
brunoais
d27ece1994 [ticket/12533] Make <a> use all the "see all" "button"
Changed the CSS so that the `<a>` of the notifications
list for the "see all" uses all the container.

PHPBB3-12533
2014-05-14 09:51:51 +01:00
brunoais
86d19b6062 [ticket/12533] Make <a> use all the notification item size
Changed padding CSS to the notifications' `<li>` and it's
`<a>` (immediate child) so that the `<a>` block uses all
 it's container width and height.

To compensate that, I added the padding that was in the
`<li>` to the `<a>`

PHPBB3-12533
2014-05-14 09:51:39 +01:00
Tristan Darricau
12e0e358d1 [ticket/11942] Apply the modifications to subsilver
PHPBB3-11942
2014-05-11 19:35:42 +02:00
Tristan Darricau
237619792d [ticket/11942] Always display delete reason
PHPBB3-11942
2014-05-11 19:28:26 +02:00
Matt Friedman
beab2c9252 [ticket/12531] Restore default topic link functionality in subsilver2
PHPBB3-12531
2014-05-11 10:27:47 -07:00
Joas Schilling
6cd7abe255 Merge pull request #2420 from prototech/ticket/9388
[ticket/9388] Only display the settings for the selected method in the auth and search ACP pages.

* prototech/ticket/9388:
  [ticket/9388] Use "togglable" instead of "toggable"
  [ticket/9388] Do not nest the <fieldset> tags in the OAuth settings.
  [ticket/9388] Reopen <fieldset> after auth templates.
  [ticket/9388] Fix unit tests.
  [ticket/9388] Use the new toggle function for the avatar type <select>.
  [ticket/9388] Display only the settings for the selected search backend.
  [ticket/9388] Display only the settings for the auth method that's selected.
  [ticket/9388] Add support for making <select> options able to toggle settings.
2014-05-11 10:48:10 +02:00
Joas Schilling
135b76b643 Merge pull request #2340 from PayBas/ticket/12431
[ticket/12431] Add has_poll icon to topiclists

* PayBas/ticket/12431:
  [ticket/12431] Lang full sentence
  [ticket/12431] Add topic poll icon.
  [ticket/12431] Add has_poll icon to topiclists
2014-05-11 10:24:03 +02:00
rxu
2d989acd0c [ticket/12523] Add template events search_results_topic_(before/after)
Add template events search_results_topic_(before/after)
to search_results.html.

PHPBB3-12523
2014-05-11 15:57:21 +08:00
Cesar G
e233f0af36 [ticket/9388] Use "togglable" instead of "toggable"
PHPBB3-9388
2014-05-09 13:49:41 -07:00
Cesar G
1836b01303 [ticket/9388] Use the new toggle function for the avatar type <select>.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
Joas Schilling
e976f7908a Merge pull request #2414 from prototech/ticket/12440
[ticket/12440] Set browser URL to point to specific post when using view=unread

* prototech/ticket/12440:
  [ticket/12440] Use a more generic approach for replacing the URL.
  [ticket/12440] Set browser URL to point to specific post when using view=unread

Conflicts:
	phpBB/styles/prosilver/template/viewtopic_body.html
2014-05-08 13:23:12 +02:00
Joas Schilling
ef99d6fcc5 Merge pull request #2423 from rxu/ticket/12511
[ticket/12511] Add missing titles for profile fields in members group view

* rxu/ticket/12511:
  [ticket/12511] Add missing titles for profile fields in members group view
2014-05-08 12:32:04 +02:00
Joas Schilling
03f3f1141f Merge pull request #2424 from VSEphpbb/ticket/12513
[ticket/12513] Add simple_header head event with support for asset calls

* VSEphpbb/ticket/12513:
  [ticket/12513] Add asset include support to simple header/footer in ACP
  [ticket/12513] Add simple_header head event with support for CSS assets calls
2014-05-08 12:28:53 +02:00
Joas Schilling
077c7cf7aa Merge pull request #2400 from PayBas/ticket/12488
[ticket/12488] Add user warning indication to viewtopic posts

* PayBas/ticket/12488:
  [ticket/12488] subSilver2 fix (no longer displays if warnings = 0)
  [ticket/12488] Typo fix
  [ticket/12488] Removed <em> and removed anonymous check
  [ticket/12488] Add user warning indication to viewtopic posts
2014-05-07 21:17:04 +02:00
Matt Friedman
8fda490050 [ticket/12513] Add simple_header head event with support for CSS assets calls
PHPBB3-12513
2014-05-07 11:53:25 -07:00
rxu
4b54d0b4af [ticket/12511] Add missing titles for profile fields in members group view
For memberlist group view in cases the group is presented with the group leader
and group members, for members profile fields titles are missing: Posts,
Joined, Last active and custom profile fields titles.

PHPBB3-12511
2014-05-07 23:31:09 +08:00
Cesar G
3c86a9bcca Merge remote-tracking branch 'Elsensee/ticket/suheb/12185' into develop-ascraeus
* Elsensee/ticket/suheb/12185:
  [ticket/12185] Fix and increase width
  [ticket/12185] Fixing the width of topic header for translation.
2014-05-06 13:56:09 -07:00
Joas Schilling
c7d29fbdb1 Merge pull request #2373 from Nicofuma/ticket/12459
[ticket/12459] Unapproved posts/topics are not correctly handled in feeds

* Nicofuma/ticket/12459:
  [ticket/12459] Change language strings
  [ticket/12459] Enable related tests
  [ticket/12459] Fix: Differentiating unapproved and deleted posts
  [ticket/12459] Fix: Soft deleted topics should appear in feeds
  [ticket/12459] Fix: the posts were always marked as unapproved
2014-05-06 13:59:09 +02:00
Cesar G
71379c3a0f Merge remote-tracking branch 'VSEphpbb/ticket/12332' into develop-ascraeus
* VSEphpbb/ticket/12332:
  [ticket/12332] Add missing semicolon to inline styling
  [ticket/12332] Adjust size of mark column where too wide
  [ticket/12332] Adjust column widths for responsive changes
  [ticket/12332] Restore some changes back to original state
  [ticket/12332] Add break-word to fixed width table CSS
  [ticket/12332] Accomplish all word creaking in template and CSS
  [ticket/12332] Remove width sizing, as it is already set
  [ticket/12332] Fix displaying attachments with long file names
2014-05-05 16:51:29 -07:00
Cesar G
698d8551cf Merge remote-tracking branch 'Crizz0/ticket/12498' into develop-ascraeus
* Crizz0/ticket/12498:
  [ticket/12498] Adds height-property for IE8 in tweaks.css
2014-05-05 16:45:44 -07:00
Cesar G
7475e05f99 [ticket/12440] Set browser URL to point to specific post when using view=unread
PHPBB3-12440
2014-05-05 16:33:27 -07:00
Tristan Darricau
717f8a6671 [ticket/12459] Change language strings
PHPBB3-12459
2014-05-05 18:58:15 +02:00
PayBas
4d64e09e7a [ticket/12488] subSilver2 fix (no longer displays if warnings = 0)
Don't know what I was thinking with this

PHPBB3-12488
2014-05-05 09:38:00 +02:00
Cesar G
a4aeb91ec0 [ticket/12491] Fix clashing USERNAME_FULL template variable.
The user notes and user warn pages have a variable with the same name.

PHPBB3-12491
2014-05-04 15:31:19 -07:00
PayBas
cefeb7f752 [ticket/12488] Removed <em> and removed anonymous check
PHPBB3-12488
2014-05-04 22:07:03 +02:00
Cesar G
2e6413a522 [ticket/12431] Add topic poll icon.
PHPBB3-12431
2014-05-04 12:34:51 -07:00
Crizzo
2c8cb4dd60 [ticket/12498] Adds height-property for IE8 in tweaks.css
PHPBB3-12498
2014-05-04 18:58:27 +02:00
Joas Schilling
80d113f688 [prep-release-3.1.0-b3] Update version to 3.1.0-b3 2014-05-04 17:27:20 +02:00
Joas Schilling
541de3281a Merge pull request #2394 from VSEphpbb/ticket/12484
[ticket/12484] Add template event ucp_agreement_terms_before/after

* VSEphpbb/ticket/12484:
  [ticket/12484] Add template event ucp_agreement_terms_before/after
2014-05-04 16:41:19 +02:00
Joas Schilling
b1d30dad5c Merge pull request #2203 from PayBas/ticket/12323
[ticket/12323] Template Event search_results_postprofile_before/after

* PayBas/ticket/12323:
  [ticket/12323] Template Event search_results_postprofile_before

Conflicts:
	phpBB/docs/events.md
2014-05-04 16:23:14 +02:00
Joas Schilling
3674f95e52 Merge pull request #2346 from PayBas/ticket/12438
[ticket/12438] Add Template event memberlist_view_content_prepend

* PayBas/ticket/12438:
  [ticket/12438] Add Template event memberlist_view_content_prepend
2014-05-04 16:14:20 +02:00
Joas Schilling
eb52028334 Merge pull request #2314 from PayBas/ticket/12410
[ticket/12410] Add Template events search_results_post_ b/a

* PayBas/ticket/12410:
  [ticket/12410] Add Template events search_results_post_ b/a
2014-05-04 16:11:56 +02:00