1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-22 19:07:27 +01:00

2007 Commits

Author SHA1 Message Date
Yuriy Rusko
a759704b39 [ticket/12594] Remove @package tags and update file headers
PHPBB3-12594
2014-05-27 20:51:13 +02:00
Joas Schilling
a6782801e7 Merge pull request #2429 from Nicofuma/ticket/12074
[ticket/12074] Managing extensions doesn't produce any log entry

* Nicofuma/ticket/12074:
  [ticket/12074] Update the visibility of the constructor
  [ticket/12074] Don't log errors
  [ticket/12074] Managing extensions doesn't produce any log entry
2014-05-26 18:55:19 +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
a496015b98 Merge pull request #2463 from nickvergessen/ticket/12433
[ticket/12433] Use a different message when nesting of quotes is not allowed

* nickvergessen/ticket/12433:
  [ticket/12433] Use a different message when nesting of quotes is not allowed
2014-05-15 16:48:18 +02:00
Joas Schilling
34c1691d7e [ticket/12433] Use a different message when nesting of quotes is not allowed
PHPBB3-12433
2014-05-15 14:03:27 +02: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
bec9b7c34e Merge pull request #2452 from n-aleha/ticket/12519
[ticket/12519] Restore m_approve language description

* n-aleha/ticket/12519:
  [ticket/12519] Restore m_approve language description
2014-05-13 12:21:28 +02:00
n-aleha
9c8e228236 [ticket/12519] Restore m_approve language description
Restore acl_m_approve language description to:
"Can approve and restore posts"

PHPBB3-12519
2014-05-12 22:15:39 +03:00
Oliver Schramm
cce6f7d4a6 [ticket/12451] Fix whitespace in posting.php lang file
PHPBB3-12451
2014-05-11 18:20:56 +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
Tristan Darricau
3029f93000 [ticket/12074] Don't log errors
PHPBB3-12074
2014-05-09 00:26:07 +02:00
Tristan Darricau
a640a455f3 [ticket/12074] Managing extensions doesn't produce any log entry
PHPBB3-12074
2014-05-09 00:07:56 +02:00
Cesar G
d95164e641 [ticket/9388] Display only the settings for the auth method that's selected.
PHPBB3-9388
2014-05-08 08:35:38 -07:00
PayBas
1cdff60676 [ticket/12431] Lang full sentence
PHPBB3-12431
2014-05-08 15:27:27 +02:00
Joas Schilling
d4fc060bcd Merge pull request #2363 from Elsensee/ticket/12451
[ticket/12451] Split lang vars in posting.php for plurals

* Elsensee/ticket/12451:
  [ticket/12451] Remove duplicated lang var
  [ticket/12451] Use new line to concatenate strings
  [ticket/12451] Split TOO_MANY_CHARS vars for plurals
  [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
2014-05-08 15:10:34 +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
Cesar G
0cc5cf57b2 Merge remote-tracking branch 'MGaetan89/ticket/12415' into develop-ascraeus
* MGaetan89/ticket/12415:
  [ticket/12415] Use private message instead of "pm" accronym
2014-05-04 13:55:14 -07:00
Gaëtan Muller
eccdc74478 [ticket/12415] Use private message instead of "pm" accronym
https://tracker.phpbb.com/browse/PHPBB3-12415

PHPBB3-12415
2014-05-04 17:35:06 +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
Oliver Schramm
b7fde76852 [ticket/12451] Remove duplicated lang var
PHPBB3-12451
2014-05-03 16:16:17 +02:00
Oliver Schramm
d7c0d604b5 [ticket/12451] Split TOO_MANY_CHARS vars for plurals
PHPBB3-12451
2014-05-03 16:16:15 +02:00
Oliver Schramm
daa69ecfa9 [ticket/12451] Split TOO_FEW_CHARS_LIMIT for plurals
PHPBB3-12451
2014-05-03 16:16:14 +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
f0be9549ac Merge remote-tracking branch 'github-nickvergessen/feature/sqlite3' into develop-ascraeus
* github-nickvergessen/feature/sqlite3:
  [feature/sqlite3] Add sqlite3 database to .gitignore
  [feature/sqlite3] Use SQLite3 by default
  [feature/sqlite3] Remove invalid comment
  [feature/sqlite3] Remove unneeded ORDER BY type from sqlite_master queries
  [feature/sqlite3] Correctly recreate indexes when recreating a table
  [feature/sqlite3] Fix sql_index_drop() for sqlite3
  [feature/sqlite3] Remove trailing comma from column list
  [feature/sqlite3] Update docblocks and function visibility
  [feature/sqlite3] Add support for SQLite 3
2014-05-02 17:57:22 +02:00
Nils Adermann
97e651a491 Merge remote-tracking branch 'github-exreaction/ticket/8323' into develop-ascraeus
* github-exreaction/ticket/8323:
  [ticket/8323] Cache auth request
  [ticket/8323] Combine into a single query
  [ticket/8323] Comments on phpbb_get_banned_user_ids input for test
  [ticket/8323] More readability in test case
  [ticket/8323] Comments
  [ticket/8323] dataProvider for the test; better test data
  [ticket/8323] Comments
  [ticket/8323] Unit test for phpbb_get_banned_user_ids
  [ticket/8323] Comments for inactive reasons in constants.php
  [ticket/8323] Only disable administrative deactivated accounts from receiving PMs
  [ticket/8323] Allow temporarily banned users to receive PMs, but not a notification
  [ticket/8323] Correct PM notification settings (only notify those who can receive them)
  [ticket/8323] Cleanup viewtopic code (not sure how this mess happened)
  [ticket/8323] Allow sending PMs to temporarily banned users
  [ticket/8323] Do not allow sending PMs to Inactive users
  [ticket/8323] Hide the Send PM link if users cannot receive the PM
  [ticket/8323] Correcting the comment
  [ticket/8323] Do not allow sending of Private Messages to users who are banned
  [ticket/8323] Remove code used for testing
  [ticket/8323] Do not allow sending of Private Messages to users who do not have permission to read private messages

Conflicts:
	phpBB/language/en/ucp.php
2014-05-02 15:54:10 +02:00
Patrick Webster
b39b0369aa [feature/sqlite3] Add support for SQLite 3
Minimum version requirement is 3.6.15 as that's what ships with PHP 5.3.0
when support for SQLite 3 was added.

PHPBB3-9728
2014-05-02 15:45:20 +02:00
Nils Adermann
ef0600bfa2 Merge remote-tracking branch 'github-marc1706/ticket/8960' into develop-ascraeus
* github-marc1706/ticket/8960:
  [ticket/8960] Allow changing avatar path if it's not writable
2014-05-02 13:26:03 +02:00
Nils Adermann
854854b60f Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus
* github-elsensee/ticket/stenudd/8558-2:
  [ticket/8558] Fix operator
  [ticket/8558] Fix field length in ACP
  [ticket/8558] Use only one variable and improve explain string
  [ticket/8558] Add config in migrations and schema_data
  [ticket/8558] Add display name in emails from board

Conflicts:
	phpBB/includes/functions_messenger.php
2014-05-02 12:49:07 +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
Nathaniel Guse
5c54cd6a45 Merge remote-tracking branch 'remotes/Nicofuma/ticket/12445' into develop-ascraeus
# By Nicofuma
# Via Nicofuma
* remotes/Nicofuma/ticket/12445:
  [ticket/12445] Change the formulation
  [ticket/12445] Disapproved post: the name of the poster should be in logs
2014-05-01 21:46:34 -05:00
Andreas Fischer
89391dec08 [ticket/12458] Apply Squiz.WhiteSpace.SuperfluousWhitespace.* to legacy code.
* There MUST NOT be trailing whitespace at the end of lines.
* There MUST NOT be whitespace before the first content of a file.
* There MUST NOT be whitespace after the last content of a file.
* Functions MUST NOT contain multiple empty lines in a row.

PHPBB3-12458
2014-04-29 17:51:21 +02:00
Joas Schilling
23b3667978 [ticket/12456] Add , after the last array element
PHPBB3-12456
2014-04-29 16:24:51 +02:00
Joas Schilling
38f05750b7 [ticket/12456] Fix duplicated empty lines in language files
PHPBB3-12456
2014-04-29 15:44:17 +02:00
Joas Schilling
cec060bb9b [ticket/12456] Fix missing new lines at the end of email templates
PHPBB3-12456
2014-04-29 15:43:55 +02:00
Nicofuma
5c33c20186 [ticket/12445] Change the formulation
PHPBB3-12445
2014-04-28 18:44:56 +02:00
Nicofuma
5ec9f40b78 [ticket/12445] Disapproved post: the name of the poster should be in logs
https://tracker.phpbb.com/browse/PHPBB3-12445

PHPBB3-12445
2014-04-26 01:18:34 +02:00
Cesar G
b305ec5611 Merge remote-tracking branch 'PayBas/ticket/12389' into develop-ascraeus
* PayBas/ticket/12389:
  [ticket/12389] Change "PM" to "Message"
  [ticket/12389] Moved PM tools to UCP template
  [ticket/12389] Replace email and print icons.
  [ticket/12389] Change language of email friend
  [ticket/12389] Move print topic & email topic icons to topic tools
2014-04-25 07:33:22 -07:00
Joas Schilling
37751b51f9 [ticket/12371] Do not add unlimited users as responders
We run into the risc that the data is longer then the character limit
of the table column. However as we trim the users list anyway, we can
also just stop adding them and display "many others" instead of "x others"

PHPBB3-12371
2014-04-25 11:52:20 +02:00
PayBas
65c8280fb6 [ticket/12389] Change "PM" to "Message"
PHPBB3-12389
2014-04-24 22:09:15 +02:00
Cesar G
f2e74354a3 [ticket/10737] Enforce allow_live_searches setting in memberlist.php.
PHPBB3-10737
2014-04-23 09:11:41 -07:00
Cesar G
607698c884 [ticket/10737] Add config setting to disable live searches.
PHPBB3-10737
2014-04-23 09:11:40 -07:00
Joas Schilling
5b6a675399 Merge pull request #2036 from prototech/ticket/12201
[ticket/12201] Clean up ACP attachment management page

* prototech/ticket/12201:
  [ticket/12201] Decreased pagination font size.
  [ticket/12201] Update select element to follow same design as prosilver.
  [ticket/12201] Increase sort font size just slightly.
  [ticket/12201] Add link to resync file stats after error.
  [ticket/12201] Fix typos in language pack.
  [ticket/12201] Display error and sorting options when there are no attachments
  [ticket/12201] Only the top pagination should be floated to the right.
  [ticket/12201] Rearrange pagination, sorting, and submit elements.
  [ticket/12201] Center the file size and mark columns.
  [ticket/12201] Separate pagination from table.
2014-04-22 19:58:15 +02:00