1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-08 09:53:33 +02:00

29857 Commits

Author SHA1 Message Date
Marc Alexander
62bbe167b1
Merge pull request #4664 from JoshyPHP/ticket/15040
[ticket/15040] Update s9e\TextFormatter to 0.9.1
2017-01-22 23:00:08 +01:00
Marc Alexander
0238d850dd
[ticket/15015] Use correct explain string for enable email settings
PHPBB3-15015
2017-01-22 20:58:53 +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
JoshyPHP
9aa8dc26b7 [ticket/14790] Added test case
PHPBB3-14790
2017-01-22 19:19:12 +01:00
JoshyPHP
f53f6d1c61 [ticket/15040] Updated s9e\TextFormatter to 0.9.1
PHPBB3-15040
2017-01-22 19:11:17 +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
e0412085a6
Merge branch '3.2.x' 2017-01-21 11:56:21 +01:00
Marc Alexander
722d0b9742
Merge pull request #4658 from kasimi/ticket/15035
[ticket/15035] Add phpinfo.php to 3.2.x install directory
2017-01-21 11:56:17 +01:00
Marc Alexander
6c09910c10
[ticket/13250] Replace slashes in cache file names
PHPBB3-13250
2017-01-21 11:21:38 +01:00
Marc Alexander
4b2a5a41a7
[ticket/15036] Unlink install_config during functional testing
PHPBB3-15036
2017-01-21 10:28:08 +01:00
kasimi
eceb36a546
[ticket/15035] Add phpinfo.php to 3.2.x install directory
In 3.1.x there's a phpinfo.php in the /install folder which seems to be removed in 3.2.x, perhaps by accident?
https://github.com/phpbb/phpbb/commits/3.2.x/phpBB/install/phpinfo.php
Let's add it back for easier troubleshooting potential issues during installation.

PHPBB3-15035
2017-01-20 22:09:42 +01:00
Marc Alexander
b1f060a30a
[ticket/11076] Also state min PHP version when visiting forum website
A lot better to have a simple message than having the complete board break,
sometimes without even knowing thanks to bad host setups with no error logs.

PHPBB3-11076
2017-01-20 21:23:40 +01:00
Marc Alexander
d0724063c4
[ticket/11076] Also add notice about unsupported version to installer
PHPBB3-11076
2017-01-20 21:23:40 +01:00
Tristan Darricau
a2a26f04e7
Merge branch '3.2.x'
* 3.2.x:
  [ticket/11611] Remove no longer used file for setting up git repository
2017-01-20 20:55:28 +01:00
Tristan Darricau
aa9da98e8a
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/11611] Remove no longer used file for setting up git repository
2017-01-20 20:55:20 +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
5e06278f62
Merge branch '3.2.x' 2017-01-17 21:55:09 +01:00
Marc Alexander
459244266d
Merge pull request #4654 from hanakin/ticket/15023
[ticket/15023] fix responsive post row paging
2017-01-17 21:53:57 +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
hanakin
3bd01d812a [ticket/15023] Fix for linting
PHPBB3-15023
2017-01-16 12:34:59 -05:00
hanakin
c0af2072ca [ticket/15023] Remove all prev RWD and add new
PHPBB3-15023
2017-01-16 12:29:44 -05:00
hanakin
0d7d4b4ddd [ticket/15023] Remove unnessecary left-box class
no longer nessecary after this fix

PHPPB3-15023
2017-01-16 12:28:52 -05:00
hanakin
d28c016bef [ticket/15023] undo previous changes
PHPBB3-15023
2017-01-16 12:27:53 -05:00
Tristan Darricau
3d61d2b370
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15011] Output meaningful errors when validating all metadata
  [ticket/11076] State current and minimum required versions in old PHP notice
2017-01-15 18:16:45 +01:00
Tristan Darricau
43ba6783c5
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15011] Output meaningful errors when validating all metadata
2017-01-15 18:16:36 +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
c4ee378456
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/11076] State current and minimum required versions in old PHP notice
2017-01-15 18:13: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
Marc Alexander
7973984821
Merge branch '3.2.x' 2017-01-15 14:06:13 +01:00
Marc Alexander
e64072e01f
Merge pull request #4648 from JoshyPHP/ticket/15016
[ticket/15016] Fixed an issue with some parentheses in smilies
2017-01-15 13:55:55 +01:00
Tristan Darricau
51500977b2
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14989] Allow more admin-configurable schemes in post links
2017-01-15 12:36:29 +01:00
Tristan Darricau
4fd6b0fd88
Merge pull request #4632 from VSEphpbb/ticket/14989
[ticket/14989] Allow more admin-configurable schemes in post links

* VSEphpbb/ticket/14989:
  [ticket/14989] Allow more admin-configurable schemes in post links
2017-01-15 12:36:26 +01:00
Tristan Darricau
6fe1605137
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14985] Added functional tests for BBCodes and smilies
  [ticket/14985] Decode HTML special chars in plain text columns
2017-01-15 12:08:06 +01:00
Tristan Darricau
2637606ae1
Merge pull request #4631 from JoshyPHP/ticket/14985
[ticket/14985] Decode HTML special chars in plain text columns

* JoshyPHP/ticket/14985:
  [ticket/14985] Added functional tests for BBCodes and smilies
  [ticket/14985] Decode HTML special chars in plain text columns
2017-01-15 12:08:01 +01:00
Tristan Darricau
567034e306
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15011] Fix 3.2.x merge
  [ticket/15011] Error not checked on metadata load failure
2017-01-15 12:01:26 +01:00
Tristan Darricau
d6e42ec63b
[ticket/15011] Fix 3.2.x merge
PHPBB3-15011
2017-01-15 12:00:36 +01:00
Tristan Darricau
935da1ed2b
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15011] Error not checked on metadata load failure
2017-01-15 11:58:04 +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
Tristan Darricau
84e6b87acd
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14984] Correct wrong arrow direction in PM inbox
2017-01-15 11:40:26 +01:00
Tristan Darricau
083db525d4
Merge pull request #4630 from hubaishan/ticket/14984
[ticket/14984] Correct wrong arrow direction in PM inbox

* hubaishan/ticket/14984:
  [ticket/14984] Correct wrong arrow direction in PM inbox
2017-01-15 11:38:21 +01:00
Tristan Darricau
ba0aff0a40
Merge branch '3.2.x'
* 3.2.x:
  [ticket/15002] Show topic icons in search results
2017-01-15 11:36:47 +01:00
Tristan Darricau
2aba566a43
Merge pull request #4640 from JimMH/patch-3
[ticket/15002] Show topic icons in search results

* JimMH/patch-3:
  [ticket/15002] Show topic icons in search results
2017-01-15 11:36:43 +01:00
Tristan Darricau
d9e6a06729
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14999] Correct Next PM Iconography
2017-01-15 11:27:03 +01:00