1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-20 07:30:16 +01:00

25760 Commits

Author SHA1 Message Date
javiexin
7f69580df3 Merge branch '3.1.x' into ticket/15011 2017-02-15 23:56:52 +01:00
javiexin
7646280d51 [ticket/15011] All errors on metadata throw exceptions
There is inconsistency in the way error are treated in metadata_manager.
Some method return false on error, others throw exception.  With this,
the usage is homogeneus, and the uses of these are also adapted.
Using same ticket as it is the same issue, solved in a different way.

PHPBB3-15011
2017-02-15 23:51:08 +01:00
Marc Alexander
b567c6e241
Merge pull request #4589 from senky/ticket/14929
[ticket/14929] Add error to core.posting_modify_message_text
2017-02-11 22:03:57 +01:00
Marc Alexander
45199adebd
Merge pull request #4523 from senky/ticket/13429
[ticket/13429] Replace @change with @changed in event docblocks
2017-02-11 15:19:47 +01:00
Tristan Darricau
1470985ff2
Merge pull request #4660 from marc1706/ticket/13250
[ticket/13250] Replace slashes in cache file names

* marc1706/ticket/13250:
  [ticket/13250] Use faster str_replace() instead of preg_replace()
  [ticket/13250] Replace slashes in cache file names
2017-02-05 18:11:16 +01:00
Tristan Darricau
c3896c8b5d
Merge pull request #4673 from senky/ticket/13601
[ticket/13601] Add core.acl_clear_prefetch_after event

* senky/ticket/13601:
  [ticket/13601] Add core.acl_clear_prefetch_after event
2017-02-05 18:05:53 +01:00
Tristan Darricau
c006479274
Merge pull request #4681 from VSEphpbb/ticket/15059
[ticket/15059] Preserve code line breaks and scroll overflow

* VSEphpbb/ticket/15059:
  [ticket/15059] Preserve code line breaks and scroll overflow
2017-02-05 17:50:35 +01:00
Matt Friedman
35b7e95098 [ticket/15059] Preserve code line breaks and scroll overflow
PHPBB3-15059
2017-01-30 08:48:42 -08:00
Máté Bartus
5cf1fc62db Merge pull request #4679 from marc1706/ticket/14998
[ticket/14998] Point only to install dir from acp_update
2017-01-29 14:29:44 +01:00
Marc Alexander
d81df55963
[ticket/14998] Point only to install dir from acp_update
PHPBB3-14998
2017-01-28 09:16:49 +01:00
Jakub Senko
d1df78604b
[ticket/13601] Add core.acl_clear_prefetch_after event
PHPBB3-13601
2017-01-23 15:00:59 +01:00
Jakub Senko
779758f219
[ticket/13429] Replace @change with @changed
PHPBB3-13429
2017-01-23 13:33:15 +01:00
Tristan Darricau
fb481f96d3
Merge pull request #4663 from marc1706/ticket/14997
[ticket/14997] Fixing topiclist_row_topic_title_after position

* marc1706/ticket/14997:
  [ticket/14997] Fixing topiclist_row_topic_title_after position
2017-01-22 23:20:59 +01:00
Tristan Darricau
085a839963
Merge pull request #4662 from marc1706/ticket/14968
[ticket/14968] Distinguish between update/upgrade & show upgrade info in ACP index

* marc1706/ticket/14968:
  [ticket/14968] Use earlier version as written in comment
  [ticket/14968] Update docblock and ensure method returns array
  [ticket/14968] Display possible upgrade on acp index and update page
  [ticket/14968] Add method for retrieving updates on current branch
2017-01-22 23:10:22 +01:00
Tristan Darricau
dcadfe092c
Merge pull request #4665 from marc1706/ticket/15006
[ticket/15006] Pass inherit settings to form and use correct button

* marc1706/ticket/15006:
  [ticket/15006] Pass inherit settings to form and use correct button
2017-01-22 23:07:46 +01:00
Marc Alexander
59027c94f2
[ticket/15006] Pass inherit settings to form and use correct button
PHPBB3-15006
2017-01-22 19:20:18 +01:00
TarantinoMariachi
612abf391f
[ticket/14997] Fixing topiclist_row_topic_title_after position
Fixing position as it is correctly on subsilver, or else it will appear
some problems when using polls or on topics with page numbers.

PHPBB3-14997
2017-01-22 17:41:31 +01:00
Marc Alexander
fbff3b77bd
[ticket/13250] Use faster str_replace() instead of preg_replace()
PHPBB3-13250
2017-01-22 17:22:28 +01:00
Marc Alexander
38d0f2892e
[ticket/14968] Use earlier version as written in comment
PHPBB3-14968
2017-01-22 17:01:12 +01:00
Marc Alexander
20a4d095de
[ticket/14968] Update docblock and ensure method returns array
PHPBB3-14968
2017-01-22 16:58:37 +01:00
Marc Alexander
a620ce0713
[ticket/14968] Display possible upgrade on acp index and update page
PHPBB3-14968
2017-01-22 16:37:20 +01:00
Marc Alexander
0572d6e33a
[ticket/14968] Add method for retrieving updates on current branch
PHPBB3-14968
2017-01-22 16:09:51 +01:00
Marc Alexander
6c09910c10
[ticket/13250] Replace slashes in cache file names
PHPBB3-13250
2017-01-21 11:21:38 +01:00
Tristan Darricau
3567f45e3d
Merge pull request #4656 from marc1706/ticket/11611
[ticket/11611] Remove no longer used file for setting up git repository

* marc1706/ticket/11611:
  [ticket/11611] Remove no longer used file for setting up git repository
2017-01-20 20:55:15 +01:00
Marc Alexander
0d17b32e25
[ticket/11611] Remove no longer used file for setting up git repository
PHPBB3-11611
2017-01-16 20:57:06 +01:00
Tristan Darricau
0f640ab7af
Merge pull request #4651 from marc1706/ticket/15011
[ticket/15011] Output meaningful errors when validating all metadata

* marc1706/ticket/15011:
  [ticket/15011] Output meaningful errors when validating all metadata
2017-01-15 18:15:00 +01:00
Tristan Darricau
766839a60a
Merge pull request #4649 from marc1706/ticket/11076
[ticket/11076] State current and minimum required versions in old PHP notice

* marc1706/ticket/11076:
  [ticket/11076] State current and minimum required versions in old PHP notice
2017-01-15 18:11:35 +01:00
Marc Alexander
a0bd23b747
[ticket/15011] Output meaningful errors when validating all metadata
PHPBB3-15011
2017-01-15 17:56:12 +01:00
Marc Alexander
cb44dbc8cb
[ticket/11076] State current and minimum required versions in old PHP notice
PHPBB3-11076
2017-01-15 15:32:55 +01:00
Tristan Darricau
c3b7332ea8
Merge pull request #4646 from javiexin/ticket/15011
[ticket/15011] Error not checked on metadata load failure

* javiexin/ticket/15011:
  [ticket/15011] Error not checked on metadata load failure
2017-01-15 11:58:00 +01:00
javiexin
b9189ec325 [ticket/15011] Error not checked on metadata load failure
PHPBB3-15011
2017-01-14 18:08:23 +01:00
Marc Alexander
8af6df3946
Merge pull request #4641 from VSEphpbb/ticket/15003
[ticket/15003] Do not check disabled checkboxes with marklist function
2017-01-14 14:58:48 +01:00
Matt Friedman
366e8583c8 [ticket/15003] Do not check disabled checkboxes with marklist function
PHPBB3-15003
2017-01-13 12:00:31 -08:00
Marc Alexander
9d7acd1897
Merge pull request #4613 from rxu/ticket/14958
[ticket/14958] Optimize Twig extension lang() function
2017-01-06 15:29:35 +01:00
Marc Alexander
77b3f36992
Merge pull request #4532 from senky/ticket/14662
[ticket/14662] Add memberlist_team_username_prepend/append
2017-01-04 22:15:37 +01:00
Marc Alexander
a0abb1e10e
Merge pull request #4600 from hubaishan/ticket/14549
[ticket/14549] fix mcp page redirect back after topic merge and rised warning
2017-01-04 21:47:21 +01:00
Marc Alexander
2f6993fa81
Merge pull request #4595 from DavidIQ/ticket/14941
[ticket/14941] Apply changes individually for MySQL fulltext search
2017-01-04 20:31:41 +01:00
rxu
49c19a267f [ticket/14958] Optimize Twig extension lang() function
PHPBB3-14958
2017-01-05 00:42:27 +07:00
Marc Alexander
3d93fd40ed
Merge pull request #4611 from marc1706/ticket/14838
[icket/14838] Do not query full attachments table in feeds
2017-01-04 17:44:07 +01:00
Marc Alexander
f2c4bf176d
Merge pull request #4609 from marc1706/ticket/14957
[ticket/14957] Do not cache database config entries
2017-01-04 17:29:50 +01:00
Marc Alexander
dd89a369f3
[ticket/14838] Remove obsolete overriding method
PHPBB3-14838
2017-01-04 17:16:36 +01:00
Marc Alexander
c0882c1d34
[ticket/14838] Add simple test for fetch_attachments method
PHPBB3-14838
2017-01-03 22:57:14 +01:00
Marc Alexander
7cad25e4cb
[ticket/14838] Do not query full attachments table in feeds
The fetch_attachments() will also now throw a runtime exception if a feed
tries to do this nonetheless.

PHPBB3-14838
2017-01-03 22:56:42 +01:00
Marc Alexander
ff411ee81b
[ticket/14957] Do not use method return in write context
Fix for PHP 5.3.x compatibility.

PHPBB3-14957
2017-01-03 21:53:14 +01:00
Marc Alexander
14fd750b08
[ticket/14957] Do not cache database config entries
PHPBB3-14957
2017-01-03 21:29:30 +01:00
Tristan Darricau
bc96a9f1f6
Merge pull request #4607 from marc1706/ticket/14953
[ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query

* marc1706/ticket/14953:
  [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
2017-01-02 22:47:43 +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
Tristan Darricau
4139e4f2b5 Merge pull request #4593 from javiexin/ticket/14940
[ticket/14940] Add ACP template event acp_ext_details_end
2016-12-30 10:21:00 +01:00
Tristan Darricau
3489780faa Merge pull request #4597 from javiexin/ticket/14943
[ticket/14943] Fix template loop access by index
2016-12-30 10:04:13 +01:00
hubaishan
40bc4ac484 [ticket/14549] Correcting $redirect var to avoid the bug
by this correct $redirect will go to clean mcp page after merge

PHPBB3-14549
2016-12-29 13:11:19 +03:00