mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-20 15:40:30 +01:00
Code Issues Releases Wiki Activity
29,164 Commits 18 Branches 191 Tags
864953ebff
Commit Graph

29164 Commits

Author SHA1 Message Date
Marc Alexander
864953ebff
Merge pull request from marc1706/ticket/14945 
[ticket/14945] Parse signature preview with generate_text_for_display()
 2017-01-06 01:06:06 +01:00
Marc Alexander
0c6c94e527
Merge branch '3.1.x' into 3.2.x 2017-01-04 22:16:24 +01:00
Marc Alexander
77b3f36992
Merge pull request from senky/ticket/14662 
[ticket/14662] Add memberlist_team_username_prepend/append
 2017-01-04 22:15:37 +01:00
Marc Alexander
777a1ad916
[ticket/14945] Parse signature preview with generate_text_for_display() 
PHPBB3-14945
 2017-01-04 22:04:07 +01:00
Marc Alexander
cfa2bc534b
Merge branch '3.1.x' into 3.2.x 2017-01-04 21:50:25 +01:00
Marc Alexander
a0abb1e10e
Merge pull request 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
24b02ad4d6
Merge pull request 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
cae30929ea
Merge branch '3.1.x' into 3.2.x 2017-01-04 20:31:45 +01:00
Marc Alexander
2f6993fa81
Merge pull request from DavidIQ/ticket/14941 
[ticket/14941] Apply changes individually for MySQL fulltext search
 2017-01-04 20:31:41 +01:00
Marc Alexander
655d40679d
Merge pull request from marc1706/ticket/14838 
[ticket/14838] Add missing method to mock'ed feed
 2017-01-04 20:11:58 +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
c5ce0cd3c4
Merge pull request from VSEphpbb/ticket/14945 
[ticket/14945] Fix bbcode flags in user sig previews
 2017-01-04 17:48:52 +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 from marc1706/ticket/14838 
[icket/14838] Do not query full attachments table in feeds
 2017-01-04 17:44:07 +01:00
Marc Alexander
0da910df94
Merge branch '3.1.x' into 3.2.x 2017-01-04 17:29:56 +01:00
Marc Alexander
0926b360f7
Merge pull request from marc1706/ticket/14957-rhea 
[ticket/14957] Do not cache database config entries -- Rhea version
 2017-01-04 17:29:56 +01:00
Marc Alexander
f2c4bf176d
Merge pull request 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
a4d67c55d9
[ticket/14957] Make sure config_php_file is set before injecting 
PHPBB3-14957
 2017-01-03 22:53:18 +01:00
Marc Alexander
9f149e345b
Merge branch 'ticket/14957' into ticket/14957-rhea 2017-01-03 22:22:46 +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
072bf470fc
Merge branch 'ticket/14957' into ticket/14957-rhea 2017-01-03 21:41:36 +01:00
Marc Alexander
14fd750b08
[ticket/14957] Do not cache database config entries 
PHPBB3-14957
 2017-01-03 21:29:30 +01:00
Marc Alexander
56314f4c22
Merge pull request from Nicofuma/ticket/14947 
[ticket/14947] Updates phpunit to 4.8
 2017-01-02 22:52:16 +01:00
Tristan Darricau
2251816b10
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14953] Use ORDER_BY instead of incorrect ORDER for sql query
 2017-01-02 22:47:47 +01:00
Tristan Darricau
bc96a9f1f6
Merge pull request 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
Marc Alexander
429225027e
[ticket/14947] Create new webdriver instance for every test 
PHPUnit seems to have emptied the webdriver between every test, which
causes curl errors. A new webdriver instance will now be created for
every test file. This does not cause a lot of overhead for ui tests.

PHPBB3-14947
 2017-01-02 20:39:41 +01:00
Tristan Darricau
e88aecd3b4
[ticket/14947] Updates phpunit to 4.8 
$ composer update phpunit/phpunit --with-dependencies
Dependency "symfony/yaml" is also a root requirement, but is not explicitly whitelisted. Ignoring.
Loading composer repositories with package information
Updating dependencies (including require-dev)
  - Installing sebastian/global-state (1.1.1)
    Loading from cache

  - Installing doctrine/instantiator (1.0.5)
    Loading from cache

  - Removing phpunit/phpunit-mock-objects (2.1.5)
  - Installing phpunit/phpunit-mock-objects (2.3.8)
    Loading from cache

  - Removing phpunit/php-file-iterator (1.3.4)
  - Installing phpunit/php-file-iterator (1.4.2)
    Loading from cache

  - Installing phpdocumentor/reflection-docblock (2.0.4)
    Downloading: 100%

  - Installing phpspec/prophecy (v1.6.2)
    Loading from cache

  - Removing phpunit/phpunit (4.1.6)
  - Installing phpunit/phpunit (4.8.31)
    Downloading: 100%

sebastian/global-state suggests installing ext-uopz (*)
phpdocumentor/reflection-docblock suggests installing dflydev/markdown (~1.0)
phpdocumentor/reflection-docblock suggests installing erusev/parsedown (~1.0)
Writing lock file
Generating autoload files
> echo 'You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies.'
You MUST manually modify the clean-vendor-dir target in build/build.xml when adding or upgrading dependencies.

PHPBB3-14947
 2016-12-30 21:58:38 +01:00
Tristan Darricau
1f65f85b53 Merge branch '3.1.x' into 3.2.x 2016-12-30 10:21:17 +01:00
Tristan Darricau
4139e4f2b5 Merge pull request from javiexin/ticket/14940 
[ticket/14940] Add ACP template event acp_ext_details_end
 2016-12-30 10:21:00 +01:00
Tristan Darricau
739081b045 Merge branch '3.1.x' into 3.2.x 2016-12-30 10:04:35 +01:00
Tristan Darricau
3489780faa Merge pull request from javiexin/ticket/14943 
[ticket/14943] Fix template loop access by index
 2016-12-30 10:04:13 +01:00
Tristan Darricau
1f8f1b6286 Merge pull request from JoshyPHP/ticket/14914 
[ticket/14914] Made emoji scale in size with text
 2016-12-29 18:27:58 +01:00
Tristan Darricau
d5c063fd80 Merge pull request from marc1706/ticket/14934 
[ticket/14934] Use bare PHP functions for checking for tmp dir
 2016-12-29 18:18:53 +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
Marc Alexander
442d21ace2
Merge branch '3.1.x' into 3.2.x 2016-12-28 22:23:52 +01:00
Marc Alexander
3ccaac488b
Merge pull request from senky/ticket/14817 
[ticket/14817] Add core.send_file_to_browser_before
 2016-12-28 22:19:12 +01:00
Marc Alexander
c431dc0d04
Merge branch '3.1.x' into 3.2.x 2016-12-28 22:15:26 +01:00
Marc Alexander
19b018ece0
Merge pull request from senky/ticket/14468 
[ticket/14468] Add forum_id to core.viewforum_modify_topics_data
 2016-12-28 22:15:21 +01:00
Marc Alexander
8a7607964f
Merge branch '3.1.x' into 3.2.x 2016-12-28 22:12:26 +01:00
Marc Alexander
54e31efcbc
Merge pull request from senky/ticket/14119 
[ticket/14119] Add core.user_unban
 2016-12-28 22:11:45 +01:00
Matt Friedman
e31c895774 [ticket/14945] Send bbcode flags in user sig previews 
PHPBB3-14945
 2016-12-28 09:18:35 -08:00
javiexin
d9991bdaf1 [ticket/14943] Fix template loop access by index 
Allows inserting elements in a loop specified as 'outer[3].inner'.
This was coded, but malfunctioning.

PHPBB3-14943
 2016-12-28 12:37:53 +01:00
JoshyPHP
f111e70fc3 [ticket/14914] Made emoji scale in size with text 
PHPBB3-14914
 2016-12-27 21:48:01 +01:00
David Colón
0fc1de279e [ticket/14941] Apply changes individually for MySQL fulltext search 2016-12-27 14:06:23 -05:00
javiexin
87f82c404e [ticket/14940] Add ACP template event acp_ext_details_end 
PHPBB3-14940
 2016-12-27 02:07:46 +01:00