makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 13:28:55 +00:00
Code Issues Projects Releases Packages Wiki Activity
28622 commits 18 branches 192 tags 206 MiB
Commit graph

3617 commits

Author SHA1 Message Date
Marc Alexander
316b69805b Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/subsilver2/template/posting_body.html
 2016-09-11 11:08:24 +02:00
Marc Alexander
4b8e8df55c Merge pull request #4371 from imkingdavid/ticket/14695 
[ticket/14695] Add posting_editor_subject_prepend/append template events
 2016-09-11 11:07:48 +02:00
Marc Alexander
0aa289e4d9 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_topic.html
 2016-09-07 21:25:17 +02:00
Marc Alexander
857a085496 Merge pull request #4428 from rmcgirr83/ticket/14755 
[ticket/14755] Fix max length in mcp topic html file
 2016-09-07 21:24:29 +02:00
Richard McGirr
b3e8eb9feb [ticket/14755] Fix subsilver2 
PHPBB3-14755
 2016-08-31 05:37:06 -04:00
RMcGirr83
bd0244180b [ticket/14755] Fix max length in mcp topic html file 
Move posts does not accept a topic number greater than 999999
topic_id set in both posts table and topics table accepts 10 digits

https://tracker.phpbb.com/browse/PHPBB3-14755

PHPBB3-14755
 2016-08-30 12:56:10 -04:00
Michael Miday
7b880af02e [ticket/14588] fix header search rtl 
https://tracker.phpbb.com/browse/PHPBB3-14588#add-comment

PHPBB3-14588
 2016-08-29 15:02:26 +02:00
Marc Alexander
a2838ad0b1 Merge branch '3.1.x' into 3.2.x 2016-08-28 15:54:11 +02:00
Marc Alexander
a019a86bfc Merge pull request #4338 from Senky/ticket/14469 
Add viewforum_body_topicrow_before template event
 2016-08-28 15:53:30 +02:00
Marc Alexander
7c79e7844c Merge branch '3.1.x' into 3.2.x 2016-08-28 15:44:49 +02:00
Marc Alexander
71a70500ea Merge pull request #4389 from kasimi/ticket/14715-3.1.x 
[ticket/14715] Add template events in posting_topic_review & mcp_topic
 2016-08-28 15:41:59 +02:00
Richard McGirr
3b395aa7a4 [ticket/14753] Fix mcp_post 
PHPBB3-14753
 2016-08-27 06:12:50 -04:00
Richard McGirr
5c8fd9760b [ticket/14753] Fix language suffix 
Missing L parameter in language strings

https://tracker.phpbb.com/browse/PHPBB3-14753

PHPBB3-14753
 2016-08-27 05:48:15 -04:00
Andreas Fischer
8e787cba7a Merge pull request #4423 from Crizz0/ticket/14749 
[ticket/14749] Adds missing } in mcp_forum.html to {TOPIC_DELETED

* Crizz0/ticket/14749:
  [ticket/14749] Adds missing } in mcp_forum.html to TOPIC_DELETED
 2016-08-22 22:05:52 +02:00
Crizzo
0d39e659fe [ticket/14749] Adds missing } in mcp_forum.html to TOPIC_DELETED 
PHPBB3-14749
 2016-08-22 21:30:59 +02:00
Marc Alexander
06bfae8edb Merge branch '3.1.x' into 3.2.x 2016-08-21 09:51:26 +02:00
Marc Alexander
b14043b276 Merge pull request #4411 from Senky/ticket/12925 
[ticket/12925] Pluralize permanent delete checkbox label
 2016-08-21 09:51:23 +02:00
Jakub Senko
c016e09ca4 [ticket/12925] Pluralize permanent delete checkbox label 
PHPBB3-12925
 2016-08-15 18:27:33 +02:00
Jakub Senko
317f3e848f [ticket/14469] Add viewforum_body_topicrow_before template event 
PHPBB3-14469
 2016-08-11 10:25:51 +02:00
David King
0771eaa732 [ticket/14695] Added posting_editor_subject_append/prepend events to subsilver 
As per request in PR.

PHPBB3-14695
 2016-08-09 21:16:33 -04:00
David King
1455be2260 [ticket/14695] Put posting_editor_subject_append/prepend events on newlines 
As per request in the PR.

PHPBB3-14695
 2016-08-09 21:14:03 -04:00
Marc Alexander
6cc4d78ebf Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/subsilver2/template/memberlist_email.html
 2016-08-03 22:21:25 +02:00
Marc Alexander
5330ea0f09 Merge pull request #4324 from Senky/ticket/14516 
[ticket/14516] Add memberlist_email_before event
 2016-08-03 22:20:48 +02:00
kasimi
da7c41f167 [ticket/14715] Add template events in posting_topic_review & mcp_topic 
The events will allow adding content before and after the post details
in topic review and topic moderation.

PHPBB3-14715
 2016-07-21 17:48:42 +02:00
Jakub Senko
775df0eb8a [ticket/14516] Add memberlist_email_before event 
PHPBB3-14516
 2016-07-17 20:43:40 +02:00
Marc Alexander
019e85d064 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/subsilver2/template/mcp_move.html
 2016-07-16 21:25:17 +02:00
Marc Alexander
b54aa81cdd Merge pull request #4337 from Senky/ticket/14506 
Add mcp_move_before template event
 2016-07-16 21:24:33 +02:00
Tristan Darricau
dbf02b4514
Merge remote-tracking branch 'upstream/prep-release-3.2.0-RC1' into 3.2.x 
* upstream/prep-release-3.2.0-RC1:
  [prep-release-3.2.0-RC1] Update changelog
  [prep-release-3.2.0-RC1] Add migration
  [prep-release-3.2.0-RC1] Update schema.json
  [prep-release-3.2.0-RC1] Update version to 3.2.0-RC1
 2016-06-27 21:54:41 +02:00
David King
e4336de68d [ticket/14695] Add posting_editor_subject_prepend/append template events 
PHPBB3-14695
 2016-06-25 21:16:54 +01:00
Marc Alexander
450e5b36b8 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/mcp_forum.html
	phpBB/styles/subsilver2/template/search_results.html
	phpBB/styles/subsilver2/template/viewforum_body.html
 2016-06-19 18:07:29 +02:00
Tristan Darricau
2eb8a97f47
[prep-release-3.2.0-RC1] Update version to 3.2.0-RC1 2016-06-19 17:51:51 +02:00
Richard McGirr
e9cbb45435 [ticket/14672] Change event name add to events.md 
PHPBB3-14672
 2016-06-13 06:26:55 -04:00
Richard McGirr
2a53831124 [ticket/14672] Add template event after topic title 
PHPBB3-14672
 2016-06-12 10:37:49 -04:00
Jakub Senko
6350798e97 [ticket/14506] Add mcp_move_before template event 
PHPBB3-14506
 2016-05-29 11:41:54 +02:00
cyberalien
877188c114 [ticket/14612] Fix incorrect class for fieldset in mcp_approve.html 
PHPBB3-14612
 2016-04-23 22:46:52 +03:00
Joas Schilling
15e22af266 [prep-release-3.1.9] Update version to 3.1.9-RC1 2016-04-09 08:09:08 +02:00
Marc Alexander
83b56f7855 [ticket/14495] Specify correct version numbers in 3.2.x 
DO NOT apply these changes into master when merging it. This means that
you'll have to checkout the latest files from upstream after merging this
into master (possibly while resolving likely merge conflicts).

PHPBB3-14495
 2016-04-02 10:06:59 +02: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
f6cc30cbfe Merge pull request #4245 from JoshyPHP/ticket/14381 
[ticket/14381] Set the mode in message parser to "reparse"

* JoshyPHP/ticket/14381:
  [ticket/14381] Set the mode in message parser to "reparse"
  [ticket/14495] Updates the version to 3.3.0-a1-dev
 2016-03-25 11:03:27 +01:00
Marc Alexander
2e3f89444a Merge branch 'ticket/14136' into ticket/14136-3.2.x 
Conflicts:
	phpBB/adm/style/install_update_diff.html
	phpBB/adm/style/installer_header.html
	phpBB/install/database_update.php
	phpBB/install/index.php
	phpBB/styles/subsilver2/template/overall_header.html
	phpBB/styles/subsilver2/template/simple_header.html
	phpBB/styles/subsilver2/template/ucp_pm_viewmessage_print.html
	phpBB/styles/subsilver2/template/viewtopic_print.html
 2016-03-24 16:12:56 +01:00
Marc Alexander
244d171cb0 [ticket/14136] Add back X-UA-Compatible meta tag 
This was previously removed without needing to. Adding it back to force
users to not emulate the page for previous versions of IE. The
imagetoolbar http-equiv tag was not restored as IE does not contain that
anymore since IE7. Also, the chome=1 has been removed from the
X-UA-Compatible content as ChromeFrame does not receive any further
updates since 2014 and is potentially broken.

PHPBB3-14136
 2016-03-24 16:07:07 +01:00
Tristan Darricau
365c99a787 Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14528] Add back itemprop definitions to breadcrumbs
  [ticket/14528] Update navbar_header.html for valid microdata
 2016-03-14 06:54:25 +01:00
Marc Alexander
04fbbbe1ed [ticket/14528] Add back itemprop definitions to breadcrumbs 
PHPBB3-14528
 2016-03-13 22:50:15 +01:00
C1n
36d2ed3121 [ticket/14528] Update navbar_header.html for valid microdata 
PHPBB3-14528
 2016-03-13 22:50:01 +01:00
Marc Alexander
47f70a4cfd Merge branch '3.2.x' 2016-02-27 10:55:17 +01:00
Marc Alexander
a937e38bd5 Merge branch '3.1.x' into 3.2.x 
Conflicts:
	phpBB/docs/events.md
	phpBB/styles/subsilver2/template/memberlist_view.html
 2016-02-27 10:54:48 +01:00
Marc Alexander
34389df1ae Merge pull request #4049 from rxu/ticket/14316 
[ticket/14316] Add events before/after the custom/zebra fields in pfile view
 2016-02-27 10:52:09 +01:00
rxu
673acc7313 [ticket/14316] Add events before/after the custom/zebra fields in profile view 
PHPBB3-14316
 2016-02-27 11:53:19 +07:00
Tristan Darricau
294f926bfc [ticket/14495] Updates the version to 3.3.0-a1-dev 
PHPBB3-14495
 2016-02-24 22:25:41 +01:00