mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-15 12:05:21 +02:00
Code Issues Releases Wiki Activity
29,528 Commits 18 Branches 192 Tags
Commit Graph

1264 Commits

Author SHA1 Message Date
Marc Alexander
777a1ad916
[ticket/14945] Parse signature preview with generate_text_for_display() 
PHPBB3-14945
 2017-01-04 22:04:07 +01:00
Marc Alexander
c5ce0cd3c4
Merge pull request #4599 from VSEphpbb/ticket/14945 
[ticket/14945] Fix bbcode flags in user sig previews
 2017-01-04 17:48:52 +01:00
Tristan Darricau
2251816b10
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
 2017-01-02 22:47:47 +01:00
Marc Alexander
7df7cfff33
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query 
PHPBB3-14953
 2017-01-02 22:39:40 +01:00
Matt Friedman
e31c895774 [ticket/14945] Send bbcode flags in user sig previews 
PHPBB3-14945
 2016-12-28 09:18:35 -08:00
Marc Alexander
58e4ec68b6
Merge branch '3.1.x' into 3.2.x 2016-12-18 21:07:23 +01:00
Marc Alexander
0f000aff0d
Merge pull request #4536 from senky/ticket/13845 
[ticket/13845] Add core.ucp_profile_avatar_sql
 2016-12-18 21:07:19 +01:00
Marc Alexander
bef0b15dbd
Merge branch '3.1.x' into 3.2.x 2016-12-18 20:47:46 +01:00
Marc Alexander
47e7cd7194
Merge pull request #4533 from senky/ticket/14524 
[ticket/14524] Add core.ucp_register_requests_after
 2016-12-18 20:47:41 +01:00
Marc Alexander
b1e4b232b9
Merge branch '3.1.x' into 3.2.x 2016-12-17 16:26:44 +01:00
Marc Alexander
3c223b3a5d
Merge pull request #4526 from senky/ticket/14239 
[ticket/14239] Add core.ucp_remind_modify_select_sql
 2016-12-17 16:20:29 +01:00
Marc Alexander
63f222ca90
Merge branch '3.1.x' into 3.2.x 2016-12-17 15:57:51 +01:00
Jakub Senko
90b7d1fbda
[ticket/14870] Add events to ucp_pm_viewfolder:get_pm_from 
PHPBB3-14870
 2016-12-16 12:23:21 +01:00
Jakub Senko
df96351244
[ticket/14239] Add core.ucp_remind_modify_select_sql 
PHPBB3-14239
 2016-12-13 11:26:45 +01:00
Jakub Senko
e9d8425f15 [ticket/13845] Add core.ucp_profile_avatar_sql 
PHPBB3-13845
 2016-11-21 23:03:21 +01:00
Jakub Senko
619d323dd1 [ticket/14524] Add core.ucp_register_requests_after 
PHPBB3-14524
 2016-11-21 16:41:20 +01:00
Marc Alexander
e76ea47fb8
Merge branch '3.1.x' into 3.2.x 2016-09-17 16:27:25 +02:00
Jakub Senko
4b6c2c8cde [ticket/10961] Send HTTP 403 when applicable 
PHPBB3-10961
 2016-09-01 08:48:37 +02:00
Wesley Fok
3038bf5eaf [ticket/14638] Rollback changes from 3.2.x version 
Mistakenly brought in the modified 3.2.x version verbatim instead of diffing
against the 3.1.x version of ucp_main.php. Removed any changes I didn't
explicitly make.

PHPBB3-14638
 2016-08-03 13:27:06 -04:00
Wesley Fok
ba13832085 Merge remote-tracking branch 'upstream/3.1.x' into ticket/14638-3.1.x 2016-08-03 13:20:42 -04:00
Wesley Fok
2081a78095 [ticket/14638] New UCP hooks for subscriptions 
Adds various event hooks to the Manage subscriptions page of the User
Control Panel. core.ucp_subscribed_post_data allows us to handle
additional post data from the form that unwatches subscriptions.
core.ucp_main_subscribed_forums_modify_query,
core.ucp_main_topiclist_count_modify_query and
core.ucp_main_topiclist_modify_query all modify the queries used to get
the list of subscribed forums and subscribed/bookmarked topics.
core.ucp_main_subscribed_forum_modify_template_vars and
core.ucp_main_topiclist_topic_modify_template_vars modify the template
variable array associated with each subscribed forum and topic row.

This is a backport to 3.1.x of the code in PR #4318.

PHPBB3-14638
 2016-08-03 13:18:43 -04:00
rxu
fa878f2818 [ticket/14660] Remove redundant empty line in ucp_profile.php 
PHPBB3-14660
 2016-06-20 14:28:22 +07:00
Marc Alexander
70b04016eb Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
 2016-06-19 17:54:55 +02:00
Marc Alexander
804236bce4 Merge pull request #4331 from Senky/ticket/13978 
[ticket/13978] Add core.ucp_profile_modify_signature_sql_ary
 2016-06-19 17:53:23 +02:00
Marc Alexander
79d6d53296 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/ucp/ucp_pm_compose.php
 2016-06-19 17:20:45 +02:00
Marc Alexander
6764bea40c Merge pull request #4316 from rmcgirr83/ticket_14630 
[ticket/14630] Add event to modify pm message
 2016-06-19 17:17:26 +02:00
Richard McGirr
08acf2acba [ticket/14630] Rename core event 
PHPBB3-14630
 2016-06-02 05:18:14 -04:00
Richard McGirr
7a8455baa7 [ticket/14649] Add preview variable back to ucp_profile for event 
PHPBB3-14649
 2016-05-26 06:26:14 -04:00
Jakub Senko
e6e4c0e62d [ticket/13978] Add core.ucp_profile_modify_signature_sql_ary 
PHPBB3-13978
 2016-05-24 18:07:11 +02:00
Richard McGirr
06507f9fa6 [ticket/14630] Change event name and fix capitalization 
PHPBB3-14630
 2016-05-16 17:57:26 -04:00
Marc Alexander
2a95f545c3 [ticket/14624] Remove no longer existing event argumemt 
PHPBB3-14624
 2016-05-16 10:16:06 +02:00
Marc Alexander
94d2be725a Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/includes/ucp/ucp_profile.php
 2016-05-15 23:57:16 +02:00
Richard McGirr
c7bbcd7b84 [ticket/14630] Add event to modify pm message 
https://tracker.phpbb.com/browse/PHPBB3-14630

PHPBB3-14630
 2016-05-06 06:31:35 -04:00
Richard McGirr
c0f3463819 [ticket/14624] Remove whitespace 
PHPBB3-14624
 2016-05-05 06:42:28 -04:00
Richard McGirr
c3b30144e3 [ticket/14624] Fix typo and phpBB version 
PHPBB3-14624
 2016-05-05 06:10:56 -04:00
Richard McGirr
aa3c5286cd [ticket/14624] Move event so it actually works 
PHPBB3-14624
 2016-05-05 06:09:11 -04:00
Richard McGirr
8e1102b1da [ticket/14624] Add event to ucp_profile in signature section 
PHPBB3-14624
 2016-05-05 05:26:19 -04:00
Tristan Darricau
2bfbc07b7d Merge pull request #4021 from marc1706/ticket/14272 
[ticket/14272] Use html5 valid input elements

* marc1706/ticket/14272:
  [ticket/14272] Allow input of floats for filesize
  [ticket/14272] Use input type number instead of text in avatars
  [ticket/14272] Assign min and max values for avatar driver settings
  [ticket/14272] Define min and max values for avatar width and height
  [ticket/14272] Disable not toggled form elements
  [ticket/14272] Make sure phpbb_avatar_manager was defined
  [ticket/14272] Remove useless check
  [ticket/14272] Fix invalid or missing min/max settings
  [ticket/14272] Assign min/max for all allowed types
  [ticket/14272] Only use maxlength and size for allowed input elements
 2016-03-27 13:34:17 +02:00
Marc Alexander
1600d82b77 Merge remote-tracking branch 'origin/ticket/14272' into ticket/14272-3.2.x 
Conflicts:
	phpBB/adm/style/acp_icons.html
	phpBB/includes/acp/acp_groups.php
	phpBB/includes/acp/acp_users.php
	phpBB/includes/functions_acp.php
	phpBB/includes/ucp/ucp_groups.php
	phpBB/styles/prosilver/template/ucp_avatar_options_gravatar.html
	phpBB/styles/prosilver/template/ucp_avatar_options_remote.html
	phpBB/styles/subsilver2/template/mcp_topic.html
	phpBB/styles/subsilver2/template/posting_attach_body.html
	phpBB/styles/subsilver2/template/posting_body.html
	phpBB/styles/subsilver2/template/posting_poll_body.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_gravatar.html
	phpBB/styles/subsilver2/template/ucp_avatar_options_remote.html
 2016-03-27 09:59:25 +02:00
Tristan Darricau
f29ebb1846 Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13630] Prevent empty parameter select_single
 2016-03-25 11:20:56 +01:00
Marc Alexander
a66ec6eccf [ticket/14530] Only generate text again if sig was parsed for storage 
PHPBB3-14530
 2016-03-24 11:01:54 +01:00
Jakub Senko
f77142c0b6 [ticket/13630] Prevent empty parameter select_single 
PHPBB3-13630
 2016-03-20 16:58:35 +01:00
Tristan Darricau
b2324607ad Merge pull request #4058 from marc1706/ticket/13454 
[ticket/13454] Remove unused variables, globals, and parameters

* marc1706/ticket/13454:
  [ticket/13454] Add excessively removed code back
  [ticket/13454] Remove more unused variables
  [ticket/13454] Remove double semi-colons
  [ticket/13454] Remove unused variables
  [ticket/13454] Fix code sniffer complaints
  [ticket/13454] Fix a few issues introduced by overdeleting stuff
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
  [ticket/13454] Remove unused variables
 2016-01-09 17:53:04 +01:00
Marc Alexander
c6c7730e04 Merge branch '3.1.x' 2016-01-08 17:57:05 +01:00
Oliver Schramm
a7648b0eaa [ticket/14397] Fix @since tag in event 'core.ucp_prefs_view_after' 
PHPBB3-14397
 2016-01-08 17:04:18 +01:00
Marc Alexander
0028ed3e95 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/subsilver2/template/ucp_prefs_personal.html
 2016-01-08 16:39:33 +01:00
Marc Alexander
2ab7b12419 Merge pull request #4112 from marc1706/ticket/13180 
[ticket/13180] Increase dateformat field size
 2016-01-08 16:39:03 +01:00
Oliver Schramm
b6fee9f536 Merge branch '3.1.x' 2016-01-08 16:06:46 +01:00
Oliver Schramm
ae18f8b27c Merge pull request #3924 from Senky/ticket/14190 
[ticket/14190] Add core.ucp_prefs_view_after event
 2016-01-08 15:51:53 +01:00
Saeed Hubaishan
678ca5dcdc [ticket/13180] Increase dateformat field size 
[ticket/13180] Increase dateformat field size

change field size to 64 in these files
add new migration file to update the database schema

PHPBB3-13180
 2016-01-07 17:36:02 +01:00