Commit graph

1664 commits

Author SHA1 Message Date
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
Cesar G
49c875413c Merge remote-tracking branch 'PayBas/ticket/12541' into develop-ascraeus
* PayBas/ticket/12541:
  [ticket/12541] Activate attachments tab when files are dropped into textarea

Conflicts:
	phpBB/styles/prosilver/template/forum_fn.js
2014-06-04 23:07:02 -07:00
Cesar G
e67a19a940 Merge remote-tracking branch 'PayBas/ticket/12615' into develop-ascraeus
* PayBas/ticket/12615:
  [ticket/12615] Fixed inproper clearing of .topic-actions
2014-06-04 22:59:37 -07:00
Cesar G
3c3a182f07 Merge remote-tracking branch 'PayBas/ticket/12565' into develop-ascraeus
* PayBas/ticket/12565:
  [ticket/12565] Empty anchors introduce white-space in IE11
2014-06-04 22:58:19 -07:00
Marc Alexander
1e7a782fb3 Merge remote-tracking branch 'prototech/ticket/12640' into develop-ascraeus
* prototech/ticket/12640:
  [ticket/12640] Preserve the active tab when previewing in posting page.
2014-06-04 23:25:48 +02:00
PayBas
560e0f97be [ticket/12565] Empty anchors introduce white-space in IE11
PHPBB3-12565
2014-06-02 14:05:46 +02:00
PayBas
082a6b29a9 [ticket/12541] Activate attachments tab when files are dropped into textarea
PHPBB3-12541
2014-06-02 12:42:45 +02:00
Cesar G
6a00ff3fa6 [ticket/12641] Use jQuery's trim() method. IE8 does not support the native one
PHPBB3-12641
2014-05-31 10:56:08 -07:00
Cesar G
95b9c93892 [ticket/12640] Preserve the active tab when previewing in posting page.
PHPBB3-12640
2014-05-31 10:12:24 -07: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
PayBas
376d6a2d91 [ticket/12615] Fixed inproper clearing of .topic-actions
PHPBB3-12615
2014-05-30 00:11:01 +02:00
Andreas Fischer
f0dcc271ac Merge pull request #2506 from brunoais/ticket/12604
[ticket/12604] Fix wrong padding when no notifications

* brunoais/ticket/12604:
  [ticket/12604] Fix wrong padding when no notifications
2014-05-29 15:42:30 +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
Joas Schilling
ef8d7b995e [ticket/10073] Add @config_text to admin_form
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
brunoais
8173f96d60 [ticket/12604] Fix wrong padding when no notifications
Added a class to the <li> when the <li> represents that there's no
notifications (no_notifications) and
Added a CSS rule that matches the change to the HTML source for when
there's no notifications.

PHPBB3-12604
2014-05-28 11:59:44 +01:00
Yuriy Rusko
1d61bcedfd Merge remote-tracking branch 'upstream/develop-ascraeus' into ticket/12594
Conflicts:
	phpBB/docs/hook_system.html
2014-05-27 21:55:40 +02:00
Yuriy Rusko
27f787e5e4 [ticket/12594] Update footer credit lines
PHPBB3-12594
2014-05-27 21:39:30 +02:00
Cesar G
4d60583412 [ticket/12155] Get rid of the <span> where possible and fix buttons in Safari.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
dff6741c7b [ticket/12155] Fix misplaced semicolon and ensure that value comparison works.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
70f9d4a54a [ticket/12155] Move icon class directly to <a> and use <span> consistently.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
7f2c3866ed [ticket/12155] Fix tabbing and put one selector per line if string is too long
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
c0c42dec24 [ticket/12155] Keep the selection method consistent with the one below it.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
3106306a4d [ticket/12155] Make the buttons bigger on touch devices.
PHPBB3-12155
2014-05-27 07:17:47 -07:00
Cesar G
f31f1dca4b [ticket/12155] Remove unused font.
PHPBB3-12155
2014-05-27 07:17:46 -07:00
Cesar G
d3b9c87b42 [ticket/12155] Use the new .button class as the basis for the post buttons.
PHPBB3-12155
2014-05-27 07:17:46 -07:00
Cesar G
00ff33c9b4 [ticket/12155] Move existing button style to a more generic class.
PHPBB3-12155
2014-05-27 07:17:46 -07:00
neufke
aeb7803017 [ticket/12155] CSS-ing of the mini post buttons
Created a css version of the mini post buttons with the use of language vars
and no fixed width of height.

PHPBB3-12155
2014-05-27 07:17: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
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
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
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
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
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
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