1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-23 19:45:10 +01:00

465 Commits

Author SHA1 Message Date
Nils Adermann
bad90dafbf Merge remote-tracking branch 'github-marc1706/ticket/12822' into develop-ascraeus
* github-marc1706/ticket/12822:
  [ticket/12822] Fix test runs of avatar manager_test
  [ticket/12822] Add method for deleting avatars and use confirm_box
  [ticket/12822] Remove "None" option from avatar select boxes
2014-08-11 17:37:56 +02:00
Andreas Fischer
12caf2f03d [ticket/12938] Remove the 'Download all attachments' feature.
PHPBB3-12938
2014-08-09 16:33:59 +02:00
Marc Alexander
e0c2013bb9 [ticket/12822] Add method for deleting avatars and use confirm_box
The method will take care of the actual deletion process in the avatar manager.
Additionally, we'll be using a confirm box while deleting the avatar to prevent
users from accidentally deleting their avatars.

PHPBB3-12822
2014-08-07 17:29:33 +02:00
Marc Alexander
4f23bb711c [ticket/12822] Remove "None" option from avatar select boxes
This option is just used for deleting avatars for which we already have
a checkbox.

PHPBB3-12822
2014-08-07 17:28:21 +02:00
PayBas
09e5896cae [ticket/12837] Detect "viewing contact admin page" on viewonline
PHPBB3-12837
2014-07-16 10:39:40 +02:00
n-aleha
f2745d1e57 [ticket/12768] More fixes in language files
More spaces converted to tabs for identation in language files.

PHPBB3-12768
2014-07-08 02:09:10 +03:00
n-aleha
4679fa543b [ticket/12768] 'NOTIFICATION_REPORT_CLOSED' entry has wrong indentation
'NOTIFICATION_REPORT_CLOSED' has 3 spaces before the first tab indentation
in language/en/common.php.

PHPBB3-12768
2014-07-08 01:13:59 +03: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
PayBas
a540cdc3b2 [ticket/12662] Initial setup
PHPBB3-12662
2014-06-25 14:18:56 +02:00
Joas Schilling
5265091c83 Merge pull request #2649 from VSEphpbb/ticket/12760
[ticket/12760] Fix wording for unapproved posts icon...

* VSEphpbb/ticket/12760:
  [ticket/12760] Fix wording for unapproved posts icon...
2014-06-25 14:16:53 +02:00
Matt Friedman
e42b316d87 [ticket/12760] Fix wording for unapproved posts icon...
in last post column of forum lists.
https://tracker.phpbb.com/browse/PHPBB3-12760

PHPBB3-12760
2014-06-24 20:47:51 -07:00
Andreas Fischer
b5b0175d59 Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12755] Apply de morgan to conditional
  [ticket/12755] Terminate upload loop if upload reaches filesize
  [ticket/12755] Change upload in remote_upload() method to fit get_remote_file
  [ticket/12755] Add language string for timed out remote upload
  [ticket/12755] Add timeout to remote upload to prevent infinite loop
2014-06-24 20:59:11 +02:00
Marc Alexander
8817b59377 [ticket/12755] Add language string for timed out remote upload
PHPBB3-12755
2014-06-23 20:35:36 +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
Shitiz Garg
ab83995f44 [ticket/12730] Add a Google+ field by default
PHPBB3-12730
2014-06-21 03:31:23 +05:30
Joas Schilling
18bf45ab1b Merge pull request #2628 from Dragooon/ticket/12731
[ticket/12731] Add YouTube custom profile field

* Dragooon/ticket/12731:
  [ticket/12731] Add functional test for youtube field
  [ticket/12731] Set field_active to 1 for YouTube field
  [ticket/12731] Add YouTube custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
2014-06-20 23:42:54 +02:00
Joas Schilling
3c38fcce40 Merge pull request #2621 from Dragooon/ticket/12732
[ticket/12732] Add Skype custom profile field

* Dragooon/ticket/12732:
  [ticket/12732] Update schema.json for Skype
  [ticket/12732] Add functional test for Skype profile field
  [ticket/12732] Values shouldn't be escaped for schema_data.sql
  [ticket/12732] Set field_active to 1 for Skype's field
  [ticket/12732] Add unit tests for ALPHA_PUNCTUATION
  [ticket/12732] Missing comma after validation definition
  [ticket/12732] Improve ALPHA_PUNCTUATION description
  [ticket/12732] Use user info instead of chat as default Skype action
  [ticket/12732] Add Skype custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
	tests/profilefields/type_string_test.php
2014-06-20 23:39:54 +02:00
Joas Schilling
b9890c6a4c Merge pull request #2612 from Dragooon/ticket/12733
[ticket/12733] Add Twitter custom profile field

* Dragooon/ticket/12733:
  [ticket/12733] Add functional test for twitter profile field
  [ticket/12733] Values needn't be escaped for schema_data.sql
  [ticket/12733] Set field_active to 1 for Twitter
  [ticket/12733] Convert spaces to tabs
  [ticket/12733] Fix spacing for block header in profilefield_twitter.php
  [ticket/12733] Update schema.json
  [ticket/12733] Add Twitter custom profile field

Conflicts:
	phpBB/install/schemas/schema.json
	phpBB/install/schemas/schema_data.sql
	phpBB/language/en/memberlist.php
	tests/functional/ucp_profile_test.php
2014-06-20 23:37:51 +02:00
Shitiz Garg
03c5de594e [ticket/12731] Add YouTube custom profile field
PHPBB3-12731
2014-06-20 19:21:57 +05:30
Shitiz Garg
fac6ab1fd4 [ticket/12733] Add Twitter custom profile field
PHPBB3-12733
2014-06-20 19:21:35 +05:30
Shitiz Garg
310b8af148 [ticket/12729] Add Facebook custom profile field
PHPBB3-12729
2014-06-20 18:10:08 +05:30
Shitiz Garg
28012dc9e1 [ticket/12732] Add Skype custom profile field
PHPBB3-12732
2014-06-20 16:37:42 +05:30
PayBas
693cbd247c [ticket/12608] Add styling (CSS class) options to notifications
This will allow different notifications to have different styles

PHPBB3-12608
2014-06-15 10:02:09 +02:00
PayBas
d5f4d288e9 [ticket/12608] Improve notifications drop-down menu styling in header
PHPBB3-12608
2014-06-15 10:02:08 +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
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
Joas Schilling
92f43c5371 [ticket/10073] Fix button descriptions
PHPBB3-10073
2014-06-09 01:40:17 +02:00
PayBas
5bd46c467b [ticket/12613] Typo and L_COLON
PHPBB3-12613
2014-06-05 10:02:16 +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
c3b24e2005 [ticket/12613] Improved pagination
PHPBB3-12613
2014-06-05 09:59:31 +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
n-aleha
031273de72 [ticket/11467] Add language variables for extension exception messages
Remove hard-coded messages and add language variables for extension
exception messages.

PHPBB3-11467
2014-05-29 01:07:44 +03:00
Tristan Darricau
64467f50db [ticket/11366] Update FILE_NOT_FOUND language string
PHPBB3-11366
2014-05-28 22:17:00 +02:00
Tristan Darricau
08ddd1c628 [ticket/11366] Update FILE_NOT_FOUND language string
This var is always used with a colon.

PHPBB3-11366
2014-05-28 22:16:57 +02:00
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02: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
Andreas Fischer
8b8c25194a Merge branch 'develop-olympus' into develop-ascraeus
* develop-olympus:
  [ticket/12540] Fix broken placeholders in language files

Conflicts:
	phpBB/language/en/common.php
	phpBB/language/en/posting.php
	phpBB/language/en/ucp.php
2014-05-15 13:41:54 +02:00
Joas Schilling
dceea23b1f [ticket/12540] Fix broken placeholders in language files
PHPBB3-12540
2014-05-13 21:41:11 +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
PayBas
1cdff60676 [ticket/12431] Lang full sentence
PHPBB3-12431
2014-05-08 15:27:27 +02: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
Tristan Darricau
717f8a6671 [ticket/12459] Change language strings
PHPBB3-12459
2014-05-05 18:58:15 +02:00
Tristan Darricau
9dc4e5a61f [ticket/12459] Fix: Soft deleted topics should appear in feeds
As for the posts, a soft deleted topic should appear (with a corresponding
message) in topic's based feeds.

PHPBB3-12459
2014-05-04 15:44:12 +02:00
n-aleha
e6b312221c [ticket/12455] Remove unused language strings from common.php and app.php
Removed the following unused language strings from common.php:
EXTENSION_CONTROLLER_MISSING
EXTENSION_CLASS_WRONG_TYPE

Removed the following unused language strings from app.php:
CONTROLLER_NOT_FOUND
CONTROLLER_SERVICE_NOT_GIVEN
CONTROLLER_RETURN_TYPE_INVALID

PHPBB3-12455
2014-05-04 13:38:06 +03:00
Joas Schilling
b60108dc78 Merge pull request #2267 from prototech/ticket/10737
[ticket/10737] Add  live member search.

* prototech/ticket/10737:
  [ticket/10737] Remove loading indicator.
  [ticket/10737] Enforce allow_live_searches setting in memberlist.php.
  [ticket/10737] Add config setting to disable live searches.
  [ticket/10737] Add loading indicator and alert box code to simple_footer.html.
  [ticket/10737] Load core.js and ajax.js in simple_footer.html.
  [ticket/10737] Set the username as the input value instead of redirecting.
  [ticket/10737] Drop subsilver2 changes.
  [ticket/10737] Add a more generic live search implementation.
  [ticket/10737] Clean up memberlist.php.
  [ticket/10737] Use dropdown for search results container.
  [ticket/10737] Adding delayed keyup and removing target_blank.
  [ticket/10737] Using UTF-8 aware alternatives in PHP code.
  [ticket/10737] Removing obsolete code.
  [ticket/10737] Avoid hard-coding table row and use case-insensitive search.
  [ticket/10737] Removing unnecessary/obsolete code.
  [ticket/10737] Using JQuery events and JSON response.
  [ticket/10737] Code fixes in AJAX search feature
  [ticket/10737] Improvements over last commit
  [ticket/10737] Adding username suggestions in "Find a member" using AJAX
2014-05-03 16:39:31 +02:00
Nils Adermann
b187031082 Merge remote-tracking branch 'github-prototech/ticket/12265' into develop-ascraeus
* github-prototech/ticket/12265:
  [ticket/12265] Actually use $u_pm.
  [ticket/12265] Ensure that dropdown is always at the very left of the container
  [ticket/12265] Define a loop for contact icons.
  [ticket/12265] Break the icons that aren't in loop in case extensions add more
  [ticket/12265] Fix modulo logic.
  [ticket/12265] Adjust alignment of AIM and Jabber icons.
  [ticket/12265] Ensure that there's only 4 icons per row in IE & Opera.
  [ticket/12265] Add contact icon and remove border from last row & cells.
  [ticket/12265] Fix issue with dropdown being restricted by the width of parent
  [ticket/12265] Remove ugly logic.
  [ticket/12265] Simplify contact icon design and move to dropdown.

Conflicts:
	phpBB/viewtopic.php
2014-05-02 18:29:50 +02:00
PayBas
d486ff6209 [ticket/12431] Add has_poll icon to topiclists
PHPBB3-12431
2014-05-02 17:58:54 +02:00
Nils Adermann
d36795b844 Merge remote-tracking branch 'github-nickvergessen/ticket/12371' into develop-ascraeus
* github-nickvergessen/ticket/12371:
  [ticket/12371] Fix language string
  [ticket/12371] Fix typos in comment
  [ticket/12371] Fix redirect link for approve_post and post_in_queue
  [ticket/12371] Delete the approve_post notification when editing a post
  [ticket/12371] Fix language in comment
  [ticket/12371] Reapprove the post and topic again in tests
  [ticket/12371] Correctly set is_starter when editing first post of the topic
  [ticket/12371] Add functional tests for reapproving
  [ticket/12371] Fix query in mcp_sorting()
  [ticket/12371] Rename disapprove and softdelete tests
  [ticket/12371] We do not group quote notifications anymore
  [ticket/12371] Fix SQL query
  [ticket/11772] Do not send out new topic/post notifications when reapproving
  [ticket/12052] Use different visibility when post was edited
  [ticket/12052] Add support for ITEM_UNAPPROVED to set_post_visibility method
  [ticket/12371] Do not add unlimited users as responders
  [ticket/12371] Do not update the notification entry unneccessarily
  [ticket/12371] Do not delete post related notifications when a post is deleted
  [ticket/12371] Allow notification types to redirect to a different url
  [ticket/12371] Do not group "quote" notifications
2014-05-02 12:11:09 +02:00
Joas Schilling
5c7199f3dd [ticket/12371] Fix language string
PHPBB3-12371
2014-05-02 11:51:40 +02:00