1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-03 04:55:36 +02:00

1124 Commits

Author SHA1 Message Date
Joas Schilling
3c91fbeaa6 Merge pull request #2827 from brunoais/ticket/12929
[ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_before
2014-10-06 22:25:08 +02:00
brunoais
9d9685eec9 [ticket/12929] BUMP to RC5
PHPBB3-12929
2014-10-02 14:44:43 +01:00
brunoais
cf2ac56950 [ticket/12930] BUMP to RC5
PHPBB3-12930
2014-10-02 14:43:50 +01:00
Joas Schilling
170b75d0c9 Merge pull request #2888 from Nicofuma/ticket/12993
[ticket/12993] Improve get_user_ranks
2014-10-01 10:19:24 +02:00
Joas Schilling
85bc9b69ae Merge pull request #2844 from marc1706/ticket/12858
[ticket/12858] Remove hard-coded GMT from timezone drop-down and rename to UTC
2014-09-24 13:47:59 +02:00
brunoais
55664c1c10 [ticket/12930] Fixing event comment block and variable
According to comments on pull request

PHPBB3-12930
2014-09-19 08:44:12 +01:00
brunoais
d4938e34b0 [ticket/12929] Fixing event comment block and variable
PHPBB3-12929
2014-09-19 08:36:00 +01:00
Jakub Senko
e59222496a [ticket/13045] Remove Pragma headers
PHPBB3-13045
2014-09-17 20:10:01 +02:00
Marc Alexander
f4761b5e08 [ticket/12858] Directly return and use timezone selects
PHPBB3-12858
2014-09-17 19:07:24 +02:00
Marc Alexander
9ebee7de32 [ticket/12858] Generate timezone selects with template loop
PHPBB3-12858
2014-09-17 14:22:08 +02:00
Tristan Darricau
c842583bbf Merge pull request #2936 from nickvergessen/ticket/12976
[ticket/12976] Correctly use plurals for attachment count in UCP navigation

* nickvergessen/ticket/12976:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation
2014-09-10 20:00:52 +02:00
Joas Schilling
d9f36ae7e1 [ticket/12976] Correctly use plurals for attachment count in UCP navigation
PHPBB3-12976
2014-09-09 21:31:34 +02:00
Joas Schilling
ad8d53af27 [ticket/13052] Fix appearances with multiple parameters
PHPBB3-13052
2014-09-09 19:47:00 +02:00
Joas Schilling
b9cb3b9e3e [ticket/12983] Correctly validate sorting options in the UCP
PHPBB3-12983
2014-09-05 13:24:31 +02:00
Dhruv Goel
6d9c0a76df Merge pull request #2865 from marc1706/ticket/12966
[ticket/12966] Sort posts by post_id in addition to sorting by post_time
2014-08-29 20:44:01 +05:30
Marc Alexander
e5e45f860b [ticket/12966] Sort by post_time and post_id where applicable
This change was not applied to the search as this would require a larger
rewrite of the search methods.

PHPBB3-12966
2014-08-23 16:36:39 +02:00
Tristan Darricau
fe1ab6d2ef [ticket/12993] Return an array instead of reference passing
PHPBB3-12993
2014-08-19 22:25:01 +02:00
Tristan Darricau
5e7d9d2fcf [ticket/12993] Fix includes of functions_display
PHPBB3-12993
2014-08-19 13:51:21 +02:00
Tristan Darricau
496cc64bc6 [ticket/12993] Rename to phpbb_get_user_rank
PHPBB3-12993
2014-08-18 16:32:05 +02:00
Forumhulp.com
8671e40217 [ticket/12993] Improve get_user_ranks
Explanation in http://area51.phpbb.com/phpBB/viewtopic.php?f=108&t=46051

PHPBB3-12993
2014-08-18 13:59:33 +02:00
Tristan Darricau
71f78fb8c6 [ticket/12990] Use protected instead of private
PHPBB3-12990
2014-08-17 23:03:44 +02:00
Tristan Darricau
fe80967535 [ticket/12990] Use the full services name for the notification's types
PHPBB3-12990
2014-08-16 21:46:03 +02:00
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
Tristan Darricau
b91abf1a0b [ticket/11854] Rename captchas.factory service to captcha.factory
PHPBB3-11854
2014-08-11 01:16:22 +02:00
Tristan Darricau
160ff7b912 [ticket/11854] Move captcha stuff to phpbb/ and use DI for plugins
PHPBB3-11854
2014-08-11 01:15:49 +02:00
brunoais
67de119566 [ticket/12930] Adding more variables to the event
More variables, according to comments, were added to the event.

PHPBB3-12930
2014-08-10 18:59:57 +01:00
brunoais
1e1efa294e [ticket/12929] Adding more variables to event.
More variables added that may be useful to events at this stage.

PHPBB3-12929
2014-08-10 18:51:35 +01:00
brunoais
9f5d383d50 [ticket/12930] Update to RC4
PHPBB3-12930
2014-08-09 18:14:11 +01:00
brunoais
8880871951 [ticket/12929] Update to RC4
PHPBB3-12929
2014-08-09 18:13:10 +01:00
Andreas Fischer
12caf2f03d [ticket/12938] Remove the 'Download all attachments' feature.
PHPBB3-12938
2014-08-09 16:33:59 +02:00
brunoais
468f92261a [ticket/12929] core.ucp_pm_compose_compose_pm_basic_info_query_before
Adding the core.ucp_pm_compose_compose_pm_basic_info_query_before
event to mcp backend.

PHPBB3-12929
2014-08-09 11:18:45 +01:00
brunoais
6fafa40d93 [ticket/12930] core.ucp_pm_compose_compose_pm_quotepost_query_after
Adding the core.ucp_pm_compose_compose_pm_quotepost_query_after
event to ucp backend.

PHPBB3-12930
2014-08-08 16:20:51 +01: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
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
Joas Schilling
cd5fbd52c2 Merge pull request #2709 from rxu/ticket/12828
[ticket/12828] Add ucp_prefs.php common core event

* rxu/ticket/12828:
  [ticket/12828] Add ucp_prefs.php common core event
2014-07-16 16:15:30 +02:00
rxu
fe02caa8e0 [ticket/12828] Add ucp_prefs.php common core event
Add common core event at the bottom of the includes/ucp/ucp_prefs.php
to allow additional actions (like template variable assignments etc.)
before the page load.

PHPBB3-12828
2014-07-13 21:34:24 +08:00
PayBas
0a286e044b [ticket/12804] Dont use ternary form
PHPBB3-12804
2014-07-07 11:28:06 +02:00
PayBas
c5b4d0afb7 [ticket/12804] Hide Jabber from UCP & member search when disabled
PHPBB3-12804
2014-07-07 09:05:57 +02:00
Oliver Schramm
6d1403cb13 [ticket/12674] Use user's colour in 'Last edited' line in sent PMs
PHPBB3-12674
2014-06-30 00:01:14 +02:00
Joas Schilling
8b00be6fce Merge pull request #2567 from Crizz0/ticket/12680
[Ticket/12680] - Adds alternative text to contact icon in viewtopic.php

* Crizz0/ticket/12680:
  [ticket/12680] Adds variable for guest user
  [ticket/12680] Brings back get_username_string()
  [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
  [ticket/12680] Still some problems with displaying the nickname in ucp
  [ticket/12680] Little changes, but some issues are still there
  [ticket/12680] Removes unnessesary $user->lang from CONTACT_USER
  [ticket/12680] Adds alternativ text with new variable to contact:
  [ticket/12680] Adds second alternativ text and font-size: 0 to remove text
  [ticket/12680] Adds alternative text to contact icon in viewtopic.php
2014-06-25 19:36:18 +02:00
Crizzo
453f2904c2 [ticket/12680] Solves last bugs. viewprofile: contact --> contact nickname
PHPBB3-12680
2014-06-23 19:38:44 +02:00
Crizzo
05ae46acdc [ticket/12680] Still some problems with displaying the nickname in ucp
PHPBB3-12680
2014-06-15 16:13:29 +02:00
Crizzo
8a5cb4a026 [ticket/12680] Little changes, but some issues are still there
PHPBB3-12680
2014-06-14 15:57:20 +02:00
Nils Adermann
694f8391c9 Merge remote-tracking branch 'github-marc1706/ticket/12352' into develop-ascraeus
* github-marc1706/ticket/12352: (33 commits)
  [ticket/12352] Do not check hashes that don't have the necessary length
  [ticket/12352] Update file headers to fit new format
  [ticket/12352] Use custom provider collection for auth providers
  [ticket/12352] Add checks for existing user_pass_convert to migrations
  [ticket/12352] Remove usages of user_pass_convert column
  [ticket/12352] Update schema json file
  [ticket/12352] Remove user_pass_convert column from database
  [ticket/12352] Check each newly added passwords driver in manager_test
  [ticket/12352] Add get_settings_only method to passwords driver base
  [ticket/12352] Add passwords driver for xenforo 1.0, 1.1 passwords
  [ticket/12352] Add tests for wcf1 and wcf2 drivers
  [ticket/12352] Add driver for woltlab community framework 1 passwords
  [ticket/12352] Add driver for woltlab community framework 2 passwords
  [ticket/12352] Add missing $ to md5_mybb and md5_vb driver
  [ticket/12352] Fix spacing in passwords tests
  [ticket/12352] Add passwords driver for vB passwords
  [ticket/12352] Use correct hashing method in md5_mybb driver
  [ticket/12352] Add driver for myBB md5 passwords
  [ticket/12352] Rename phpbb2_md5 driver to fit filenames of other drivers
  [ticket/12352] Add passwords driver for sha1 password hashes
  ...
2014-06-11 14:27:57 +02: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
PayBas
0baf501569 [ticket/12566] Also changed for ucp_pm_viewmessage.php
PHPBB3-12566
2014-06-02 22:12:58 +02:00
Marc Alexander
4698f6928e [ticket/12352] Remove usages of user_pass_convert column
PHPBB3-12352
2014-06-01 21:31:05 +02:00
Joas Schilling
911725a581 [ticket/10073] Split email validation from email ban and taken checks
PHPBB3-10073
2014-05-29 02:14:41 +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
a7d1fd44ee [ticket/12526] Fix undefined index: filesize when editing PM with attachments.
PHPBB3-12526
2014-05-11 02:36:48 -07:00