makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-09 04:48:53 +00:00
Code Issues Projects Releases Packages Wiki Activity
30449 commits 18 branches 192 tags 206 MiB
Commit graph

1295 commits

Author SHA1 Message Date
brunoais
cf2ac56950 [ticket/12930] BUMP to RC5 
PHPBB3-12930
 2014-10-02 14:43:50 +01:00
Joas Schilling
d73194a415 Merge branch 'develop-ascraeus' into develop 2014-10-01 10:19:39 +02: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
77ed437b79 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/styles/subsilver2/template/timezone_option.html
 2014-09-24 14:49:50 +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
Dhruv
93dc33b002 Merge branch 'develop-ascraeus' into develop 
# By Jakub Senko
# Via Dhruv Goel (1) and Jakub Senko (1)
* develop-ascraeus:
  [ticket/13045] Remove Pragma headers
 2014-09-21 11:31:13 +05:30
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
d465e7e438 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12976] Correctly use plurals for attachment count in UCP navigation

Conflicts:
	phpBB/styles/subsilver2/template/ucp_attachments.html
 2014-09-10 20:02:20 +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
Andreas Fischer
aa6d7a09b8 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13052] Use request class instead of $_POST and request_var()
  [ticket/13052] Fix appearances with multiple parameters
  [ticket/13052] Remove additional parameter from check_form_key()
 2014-09-09 21:25:21 +02:00
Joas Schilling
ad8d53af27 [ticket/13052] Fix appearances with multiple parameters 
PHPBB3-13052
 2014-09-09 19:47:00 +02:00
Marc Alexander
c00e0c55c5 Merge branch 'develop-ascraeus' into develop 2014-09-07 11:58:57 +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
df3bc78af8 Merge branch 'develop-ascraeus' into develop 
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
  [ticket/12966] Sort by post_time and post_id where applicable
  [ticket/12966] Sort posts by post_id in addition to sorting by post_time
 2014-08-29 20:44:41 +05:30
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
Marc Alexander
b2701f00e9 Merge branch 'develop-ascraeus' into develop 2014-08-21 00:44:27 +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
837ed8b6e1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [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

Conflicts:
	phpBB/styles/subsilver2/template/ucp_groups_manage.html
	phpBB/styles/subsilver2/template/ucp_profile_avatar.html
 2014-08-11 17:38:29 +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
Marc Alexander
f09db1a7b4 Merge branch 'develop-ascraeus' into develop 
Conflicts:
	phpBB/config/services.yml
 2014-08-11 12:23:21 +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
Joas Schilling
9e0c234979 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12938] Remove functional tests for 'Download all attachments'.
  [ticket/12938] Remove the 'Download all attachments' feature.
 2014-08-10 12:22:35 +02: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
Joas Schilling
dd86615c63 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12895] Rename user style setting to resolve conflict with style param
 2014-08-02 13:56:30 +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
ab237e16d3 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12828] Add ucp_prefs.php common core event
 2014-07-16 16:18:01 +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
Marc Alexander
b3d2898d01 Merge branch 'develop-ascraeus' into develop 2014-07-08 15:59:54 +02: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