makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
29713 commits 18 branches 192 tags 206 MiB
Commit graph

29713 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Tristan Darricau
2111e1d61f
Merge pull request #4638 from VSEphpbb/ticket/14999 
[ticket/14999] Correct Next PM Iconography

* VSEphpbb/ticket/14999:
  [ticket/14999] Correct Next PM Iconography
 2017-01-15 11:26:59 +01:00
Tristan Darricau
891fa43442
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15012] Use valid constructor in ftp_file_updater
 2017-01-15 11:25:59 +01:00
Tristan Darricau
0b5218cec1
Merge pull request #4647 from marc1706/ticket/15012 
[ticket/15012] Use valid constructor in ftp_file_updater

* marc1706/ticket/15012:
  [ticket/15012] Use valid constructor in ftp_file_updater
 2017-01-15 11:25:55 +01:00
JoshyPHP
52d53ef3de [ticket/15016] Fixed an issue with some parentheses in smilies 
PHPBB3-15016
 2017-01-15 11:24:15 +01:00
Marc Alexander
d882911bf5
Merge branch '3.2.x' 2017-01-15 00:25:32 +01:00
Marc Alexander
42e78004fb
Merge pull request #4643 from JoshyPHP/ticket/15008 
[ticket/15008] Disable emoji when smilies are disabled
 2017-01-15 00:25:28 +01:00
Marc Alexander
605fd40914
Merge branch '3.2.x' 2017-01-15 00:13:50 +01:00
Marc Alexander
b72df1f384
Merge pull request #4645 from rmcgirr83/ticket/15010 
[ticket/15010] Fix incorrect use of request
 2017-01-15 00:13:46 +01:00
Marc Alexander
abf7a4f663
[ticket/15012] Use valid constructor in ftp_file_updater 
PHPBB3-15012
 2017-01-14 22:48:24 +01:00
javiexin
b9189ec325 [ticket/15011] Error not checked on metadata load failure 
PHPBB3-15011
 2017-01-14 18:08:23 +01:00
Richard McGirr
02b5873442 [ticket/15010] Fix incorrect use of request 
https://tracker.phpbb.com/browse/PHPBB3-15010

PHPBB3-15010
 2017-01-14 09:18:55 -05:00
Marc Alexander
ad0e26d6ea
Merge branch '3.2.x' 2017-01-14 14:59:30 +01:00
Marc Alexander
d226059b98
Merge branch '3.1.x' into 3.2.x 2017-01-14 14:59:04 +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
JoshyPHP
15315ac87a [ticket/15008] Disable emoji when smilies are disabled 
Will effectively disable emoji shortname and won't replace emoji
with images but will not prevent a browser or OS from displaying
emoji as images.

PHPBB3-15008
 2017-01-14 14:27:38 +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
Jim Mossing Holsteyn
8475632087 [ticket/15002] Show topic icons in search results 2017-01-13 19:02:29 +01:00
Matt Friedman
a9a04adbd2 [ticket/14999] Correct Next PM Iconography 
PHPBB3-14999
 2017-01-12 19:45:53 -08:00
JoshyPHP
499fcbcca9 [ticket/14985] Added functional tests for BBCodes and smilies 
PHPBB3-14985
 2017-01-12 09:30:58 +01:00
JoshyPHP
ef215f573e [ticket/14985] Decode HTML special chars in plain text columns 
PHPBB3-14985
 2017-01-12 09:30:52 +01:00
Matt Friedman
a3accfaf46 [ticket/14989] Allow more admin-configurable schemes in post links 
PHPBB3-14989
 2017-01-11 01:55:39 -08:00
hubaishan
b05b11cf64 [ticket/14984] Correct wrong arrow direction in PM inbox 
icons.css change is needed for RTL, becouse inherit float is right

PHPBB3-14984
 2017-01-10 17:41:43 +03:00
Marc Alexander
6b2e277a27
Merge branch '3.2.x' 2017-01-08 20:53:56 +01:00
Marc Alexander
26c6cb819e
Merge pull request #4625 from Nicofuma/ticket/14973 
[ticket/14973] Add BC layer for \phpbb\db\tools
 2017-01-08 20:53:53 +01:00
Tristan Darricau
fb5f33f190
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14971] Add on_page test with the string arguments
  [ticket/14971] Fix pagination PHP warning on PHP 7.1
 2017-01-08 18:35:29 +01:00
Tristan Darricau
aaee7c7db9
Merge pull request #4623 from rxu/ticket/14971 
[ticket/14971] Fix pagination PHP warning on PHP 7.1

* rxu/ticket/14971:
  [ticket/14971] Add on_page test with the string arguments
  [ticket/14971] Fix pagination PHP warning on PHP 7.1
 2017-01-08 18:35:22 +01:00
Tristan Darricau
42cf311b2f
[ticket/14973] Add BC layer for \phpbb\db\tools 
PHPBB3-14973
 2017-01-08 18:31:10 +01:00
Tristan Darricau
118824fd26
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/14967] Add cookie notice migration fixing invalid previous one
 2017-01-08 18:06:22 +01:00
Tristan Darricau
4d5140abaf
Merge pull request #4621 from marc1706/ticket/14967 
[ticket/14967] Add cookie notice migration fixing invalid previous one

* marc1706/ticket/14967:
  [ticket/14967] Add cookie notice migration fixing invalid previous one
 2017-01-08 18:06:17 +01:00