mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-20 23:51:28 +01:00
Code Issues Releases Wiki Activity
30,420 Commits 18 Branches 191 Tags
8514e8be73
Commit Graph

3682 Commits

Author SHA1 Message Date
Marc Alexander
145a3a2c75 Merge branch '3.2.x' 2017-05-29 12:14:10 +02:00
Marc Alexander
7dc288cb89 Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.x 2017-05-29 12:13:41 +02:00
javiexin
37c48a59c3 Merge branch 'ticket/15068' of https://github.com/javiexin/phpbb into ticket/15068 2017-05-21 18:25:57 +02:00
javiexin
60d6667eb4 [ticket/15068] Add template vars retrieval from the template object 
Added tests.

PHPBB3-15068
 2017-05-21 18:18:59 +02:00
Tristan Darricau
0af7fc6e08
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15222] Fix a typo in generate_text_for_display_test.php
 2017-05-08 14:52:00 +02:00
rxu
9a5714071e [ticket/15222] Fix a typo in generate_text_for_display_test.php 
PHPBB3-15222
 2017-05-08 17:29:24 +07:00
Marc Alexander
2cf47ffaa1
Merge pull request from Nicofuma/ticket/11150 
[ticket/11150] Install extensions through composer
 2017-04-26 09:49:37 -04:00
hanakin
0b818b0739 [ticket/15192] fix stupid test issue 
PHPBB3-15192
 2017-04-25 18:32:25 -04:00
Tristan Darricau
43038a65de
[ticket/11150] Update tests 
PHPBB3-11150
 2017-04-23 21:01:12 +02:00
Tristan Darricau
712626d845
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/8116] Add missing new line
  [ticket/8116] Correctly get other users who posted under IP
  [ticket/8116] Improve code and add tests for helper functions
  [ticket/8116] Add pagination for IP tables on post info
 2017-04-21 23:55:13 +02:00
Marc Alexander
b1439a4601
Merge branch 'ticket/8116' into ticket/8116-rhea 2017-04-19 23:43:41 +02:00
Marc Alexander
e72f6d4236
[ticket/8116] Add missing new line 
PHPBB3-8116
 2017-04-19 23:35:44 +02:00
Tristan Darricau
edf6aefd2a
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
 2017-04-19 23:02:03 +02:00
Tristan Darricau
c61e43cc91
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
 2017-04-19 23:01:35 +02:00
Tristan Darricau
a8d28d6bc8
Merge pull request from marc1706/ticket/7336 
[ticket/7336] Index first post when splitting topics

* github.com:phpbb/phpbb:
  [ticket/7336] Index first post when splitting topics
  [ticket/7336] Add tests for indexing first post after splitting topics
 2017-04-19 23:00:37 +02:00
Tristan Darricau
ea1222f3bb
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15163] Escape curly braces in smilies HTML attributes
 2017-04-18 23:37:01 +02:00
JoshyPHP
ddcd0f2437
[ticket/15163] Escape curly braces in smilies HTML attributes 
PHPBB3-15163
 2017-04-18 23:33:35 +02:00
Marc Alexander
465ceab1e6
Merge branch '3.2.x' 2017-04-16 19:41:19 +02:00
rxu
fcc8e155ec [ticket/14990] Move dispatcher object to the front of the options array 
PHPBB3-14990
 2017-04-16 23:40:16 +07:00
rxu
1ea114ca20 [ticket/14990] Fix event name, email parsing, installer and dispatcher calls 
PHPBB3-14990
 2017-04-16 22:43:50 +07:00
Marc Alexander
1b9380040c
Merge branch '3.2.x' 2017-04-16 17:35:48 +02:00
Marc Alexander
f39e5424f1
[ticket/14938] Add missing language class to extension manager mock 
PHPBB3-14938
 2017-04-16 16:36:13 +02:00
Marc Alexander
473f8bc0a6
Merge branch '3.2.x' 2017-04-16 15:14:23 +02:00
Marc Alexander
1b63292cc3
Merge branch '3.1.x' into 3.2.x 2017-04-16 15:14:04 +02:00
Marc Alexander
1cbc6dedab
Merge pull request from javiexin/ticket/14938 
[ticket/14938] Inconsistency in ext_mgr all_available vs is_available
 2017-04-16 15:07:24 +02:00
Marc Alexander
c92c2aa2f4
Merge branch '3.2.x' 2017-04-16 11:42:53 +02:00
Marc Alexander
d44d1f115f
Merge pull request from javiexin/ticket/15087 
[ticket/15087] Optimize creation of metadata objects by caching
 2017-04-16 11:15:45 +02:00
Marc Alexander
58929bdccd
Merge branch '3.2.x' 2017-04-15 18:19:16 +02:00
Marc Alexander
269150ed40
Merge pull request from javiexin/ticket/14950 
[ticket/14950] Add possibility to delete a template block
 2017-04-15 18:18:32 +02:00
Marc Alexander
fba8595421
Merge branch '3.2.x' 2017-04-11 21:28:08 +02:00
Matt Friedman
6ce5ef53cb [ticket/15142] Merge branch 'ticket/15142' into 32x 
PHPBB3-15142
 2017-04-10 15:51:22 -07:00
Marc Alexander
e6a0e4caed
[ticket/8116] Improve code and add tests for helper functions 
PHPBB3-8116
 2017-03-29 19:53:58 +02:00
Matt Friedman
74054317d2 [ticket/15142] Add ext branch update tests 
PHPBB3-15142
 2017-03-24 11:47:28 -07:00
Marc Alexander
37ee22a0e6
Merge branch '3.2.x' 2017-03-08 21:09:40 +01:00
Marc Alexander
e0d31d8897
Merge pull request 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
967817143d
Merge branch '3.2.x' 2017-02-23 22:21:25 +01: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 from javiexin/ticket/14943 
[ticket/14943] Fix template loop access by index
 2017-02-23 22:21:16 +01:00
Marc Alexander
e24d3a6ade
Merge branch '3.2.x' 2017-02-19 21:47:10 +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 from javiexin/ticket/14944 
[ticket/14944] Add search for template loop indexes by key
 2017-02-19 21:47:00 +01:00
javiexin
7000db3049 [ticket/15087] Optimize creation of metadata objects by caching 
Fix constructor in test cases.

PHPBB3-15087
 2017-02-12 19:25:42 +01:00
Marc Alexander
30c8e40b9b
Merge branch '3.2.x' 2017-02-11 21:48:42 +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 from senky/ticket/13429 
[ticket/13429] Replace @change with @changed in event docblocks
 2017-02-11 15:19:47 +01:00
javiexin
7b2ffaf78c [ticket/14938] Inconsistency in ext_mgr all_available vs is_available 
Made is_available much more strict, in line with the checks in all_available
Refactor all_available to use is_available, saving duplicate code.
Further simplify is_available by using metadata_manager.
Make optional the template object on metadata_manager creation.
Fix extension_manager_mock to have config and user components.

PHPBB3-14938
 2017-02-10 02:09:18 +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
5f6133ac7f
Merge branch '3.2.x' 2017-01-27 19:00:37 +01:00
Marc Alexander
2b67536cd0
Merge pull request from hanakin/ticket/15037 
[ticket/15037] Make imagesets retina
 2017-01-27 18:44:38 +01:00