1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-24 17:40:43 +01:00

3595 Commits

Author SHA1 Message Date
Marc Alexander
269150ed40
Merge pull request #4612 from javiexin/ticket/14950
[ticket/14950] Add possibility to delete a template block
2017-04-15 18:18:32 +02:00
Matt Friedman
6ce5ef53cb [ticket/15142] Merge branch 'ticket/15142' into 32x
PHPBB3-15142
2017-04-10 15:51:22 -07:00
Matt Friedman
74054317d2 [ticket/15142] Add ext branch update tests
PHPBB3-15142
2017-03-24 11:47:28 -07:00
Marc Alexander
e0d31d8897
Merge pull request #4714 from vinny/ticket/14732
[ticket/14732] Remove PHP Code syntax highlighting references
2017-03-08 21:07:47 +01:00
Vinny
51a55cee5d [ticket/14732] Remove references from tests
PHPBB3-14732
2017-02-28 05:59:22 -03:00
Marc Alexander
7a1f4d5008
Merge branch '3.1.x' into 3.2.x 2017-02-23 22:21:20 +01:00
Marc Alexander
9267235f30
Merge pull request #4605 from javiexin/ticket/14943
[ticket/14943] Fix template loop access by index
2017-02-23 22:21:16 +01:00
Marc Alexander
bdaa6e4909
Merge branch '3.1.x' into 3.2.x 2017-02-19 21:47:06 +01:00
Marc Alexander
481a592b8d
Merge pull request #4598 from javiexin/ticket/14944
[ticket/14944] Add search for template loop indexes by key
2017-02-19 21:47:00 +01:00
Marc Alexander
f27cdad73e
Merge branch '3.1.x' into 3.2.x 2017-02-11 21:48:20 +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
javiexin
849fd9df7d [ticket/14944] Add possibility to search for template loop indexes by key
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.
Remove default parameter value.

PHPBB3-14944
2017-01-28 21:34:08 +01:00
Marc Alexander
2b67536cd0
Merge pull request #4661 from hanakin/ticket/15037
[ticket/15037] Make imagesets retina
2017-01-27 18:44:38 +01:00
Marc Alexander
e8f41a0dcc
[ticket/15045] Fix user object instantiation in version_test
PHPBB3-15045
2017-01-24 22:50:10 +01:00
hanakin
8b6d043ca6 [ticket/15037] try larger size limit
PHPBB3-15037
2017-01-23 23:08:52 -05:00
hanakin
6f7b92ae10 [ticket/15307] fix for good!
PHPBB3-15037
2017-01-23 22:41:08 -05:00
hanakin
3e73413982 [ticket/15037]a attempt to fix stupid test issue
PHPBB3-15037
2017-01-23 21:59:00 -05:00
Jakub Senko
779758f219
[ticket/13429] Replace @change with @changed
PHPBB3-13429
2017-01-23 13:33:15 +01:00
Tristan Darricau
cf6a4738b1
Merge pull request #4659 from marc1706/ticket/15036
[ticket/15036] Unlink install_config during functional testing

* marc1706/ticket/15036:
  [ticket/15036] Unlink install_config during functional testing
2017-01-22 23:30:22 +01:00
Tristan Darricau
7c77e33313
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [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:15:26 +01:00
JoshyPHP
9aa8dc26b7 [ticket/14790] Added test case
PHPBB3-14790
2017-01-22 19:19:12 +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
0572d6e33a
[ticket/14968] Add method for retrieving updates on current branch
PHPBB3-14968
2017-01-22 16:09:51 +01:00
Marc Alexander
4b2a5a41a7
[ticket/15036] Unlink install_config during functional testing
PHPBB3-15036
2017-01-21 10:28:08 +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
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
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
JoshyPHP
52d53ef3de [ticket/15016] Fixed an issue with some parentheses in smilies
PHPBB3-15016
2017-01-15 11:24:15 +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
JoshyPHP
499fcbcca9 [ticket/14985] Added functional tests for BBCodes and smilies
PHPBB3-14985
2017-01-12 09:30:58 +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
rxu
06b402bdec [ticket/14971] Add on_page test with the string arguments
PHPBB3-14971
2017-01-08 23:09:36 +07:00
javiexin
988865fd0a [ticket/14950] Add possibility to delete a template block
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables.  The selection method is the
same as for the other modes for alter_block_array.  The passed in
vararray is ignored, and an out of bounds index is considered an error.
Added tests for the new function, fixed.

PHPBB3-14950
2017-01-08 01:35:18 +01:00
javiexin
7f8dd6b007 [ticket/14950] Add possibility to delete a template block
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables.  The selection method is the
same as for the other modes for alter_block_array.  The passed in
vararray is ignored, and an out of bounds index is considered an error.
Added tests for the new function, fixed.

PHPBB3-14950
2017-01-08 01:19:22 +01:00
javiexin
696724ac1b [ticket/14950] Add possibility to delete a template block
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables.  The selection method is the
same as for the other modes for alter_block_array.  The passed in
vararray is ignored, and an out of bounds index is considered an error.
Added tests for the new function, fixed.

PHPBB3-14950
2017-01-08 00:59:26 +01:00
javiexin
20c03cccdd [ticket/14944] Add possibility to search for template loop indexes by key
Adds a new function to the template interface, and implements it in the
context class.  The function returns the ordinal index for a specified key,
with the same structure that the key for alter_block_array.
Reuses same code. Remove unneeded references, do nothing for int keys.
Check out of bounds or wrong blockname errors.  Added tests.

PHPBB3-14944
2017-01-08 00:00:47 +01:00
javiexin
9b2b9dd9de [ticket/14950] Add possibility to delete a template block
Adds a new mode to alter_block_array to allow for the deletion of
a certain block of template variables.  The selection method is the
same as for the other modes for alter_block_array.  The passed in
vararray is ignored, and an out of bounds index is considered an error.
Added tests for the new function.

PHPBB3-14950
2017-01-07 22:47:26 +01:00
javiexin
76b3fbc006 [ticket/14943] Fix template loop access by index
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.  Name incorrectly set on insert.
Added more tests.

PHPBB3-14943
2017-01-07 20:12:32 +01:00
javiexin
c40642b827 [ticket/14943] Fix template loop access by index
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.  Name incorrectly set on insert.
Added tests.

PHPBB3-14943
2017-01-07 19:57:22 +01:00
Marc Alexander
7074876f32
Merge pull request #4619 from Nicofuma/ticket/14962
[ticket/14962] Introduces a new helper to check emptyness of bbcode texts
2017-01-07 00:16:45 +01:00
Marc Alexander
538f03efb0
[ticket/14962] Fix functional test for editing post
PHPBB3-14962
2017-01-06 23:46:34 +01:00
Tristan Darricau
f82299b8e4
[ticket/14962] Introduces a new helper to check emptyness of bbcode texts
PHPBB3-14962
2017-01-06 21:40:31 +01:00
Marc Alexander
24b02ad4d6
Merge pull request #4443 from Crizz0/ticket/14780
[ticket/14780] Correction to let group setting overwrite global PM setting
2017-01-04 21:07:32 +01:00
Marc Alexander
b582a19039
[ticket/14838] Correctly instantiate language object
PHPBB3-14838
2017-01-04 19:47:10 +01:00
Marc Alexander
1db7aa712a
[ticket/14838] Add missing method to mock'ed feed
PHPBB3-14838
2017-01-04 19:19:02 +01:00
Marc Alexander
03be94c1f7
Merge branch '3.1.x' into 3.2.x 2017-01-04 17:44:11 +01: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
c0882c1d34
[ticket/14838] Add simple test for fetch_attachments method
PHPBB3-14838
2017-01-03 22:57:14 +01:00
Marc Alexander
9f149e345b
Merge branch 'ticket/14957' into ticket/14957-rhea 2017-01-03 22:22:46 +01:00