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,136 Commits 18 Branches 191 Tags
Commit Graph

29136 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 #4602 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 #4607 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 #4593 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 #4597 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 #4596 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 #4591 from marc1706/ticket/14934 
[ticket/14934] Use bare PHP functions for checking for tmp dir
 2016-12-29 18:18:53 +01: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 #4531 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 #4528 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 #4525 from senky/ticket/14119 
[ticket/14119] Add core.user_unban
 2016-12-28 22:11:45 +01: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
javiexin
87f82c404e [ticket/14940] Add ACP template event acp_ext_details_end 
PHPBB3-14940
 2016-12-27 02:07:46 +01:00
Marc Alexander
97b834c3ef
[ticket/14934] Do not rely on open basedir being properly set 
PHPBB3-14934
 2016-12-25 23:01:28 +01:00
Marc Alexander
cb406258fe
Merge branch '3.1.x' into 3.2.x 2016-12-25 15:52:38 +01:00
Marc Alexander
97a0f49be4
Merge pull request #4590 from marc1706/ticket/14923 
[ticket/14923] Make sure start for queries is always set in migrations
 2016-12-25 15:52:33 +01:00
Marc Alexander
c6aa4a319d
[ticket/14934] Use bare PHP functions for checking for tmp dir 
The symfony methods will cause PHP warnings being thrown.

PHPBB3-14934
 2016-12-25 15:04:48 +01:00
Marc Alexander
27cf12f807
Merge branch '3.1.x' into 3.2.x 2016-12-25 11:57:56 +01:00
Marc Alexander
c127591d25
Merge pull request #4544 from dsinn/ticket/14882 
[ticket/14882] Add core event to MCP after move post sync
 2016-12-25 11:57:52 +01:00
Marc Alexander
9e6207add3
[ticket/14923] Make sure start for queries is always set in migrations 
PHPBB3-14923
 2016-12-25 11:51:38 +01:00
Máté Bartus
d8348f8a5e Merge pull request #4582 from marc1706/ticket/14920 
[ticket/14920] Force installer to only populate core migrations
 2016-12-24 12:52:53 +01:00
Daniel Sinn
aa84ea8e5d [ticket/14882] Correct type of topic_id for function_admin's move_posts events 
PHPBB3-14882
 2016-12-20 16:46:50 -05:00
Marc Alexander
869e6a9a88
Merge branch '3.1.x' into 3.2.x 2016-12-20 20:27:38 +01:00
Marc Alexander
2d742beb92
Merge pull request #4580 from javiexin/ticket/14918 
[ticket/14918] Simplify access to extension version metadata information
 2016-12-20 20:27:34 +01:00
Jakub Senko
5f6fa321ef
[ticket/14817] Add core.send_file_to_browser_before 
PHPBB3-14817
 2016-12-18 21:19:31 +01:00
Marc Alexander
7d3300f99d
Merge branch '3.1.x' into 3.2.x 2016-12-18 21:10:25 +01:00
Marc Alexander
ea51dc25c1
Merge pull request #4538 from senky/ticket/14874 
[ticket/14874] Increase size of emotion
 2016-12-18 21:10:20 +01:00
Marc Alexander
58e4ec68b6
Merge branch '3.1.x' into 3.2.x 2016-12-18 21:07:23 +01:00
Marc Alexander
0f000aff0d
Merge pull request #4536 from senky/ticket/13845 
[ticket/13845] Add core.ucp_profile_avatar_sql
 2016-12-18 21:07:19 +01:00
Marc Alexander
2c9da5ad47
Merge branch '3.1.x' into 3.2.x 2016-12-18 21:01:18 +01:00
Marc Alexander
445a8be895
Merge pull request #4535 from senky/ticket/14331 
[ticket/14331] Add core.get_user_rank_after
 2016-12-18 21:01:14 +01:00
Marc Alexander
60af11da9d
Merge branch '3.1.x' into 3.2.x 2016-12-18 20:50:38 +01:00
Marc Alexander
956c7186ec
Merge pull request #4534 from senky/ticket/14522 
[ticket/14522] Add ucp_register_buttons_before
 2016-12-18 20:49:53 +01:00
Marc Alexander
bef0b15dbd
Merge branch '3.1.x' into 3.2.x 2016-12-18 20:47:46 +01:00
Marc Alexander
47e7cd7194
Merge pull request #4533 from senky/ticket/14524 
[ticket/14524] Add core.ucp_register_requests_after
 2016-12-18 20:47:41 +01:00
Marc Alexander
d3fb01d8f7
Merge branch '3.1.x' into 3.2.x 2016-12-18 20:40:46 +01:00
Marc Alexander
48659c2ce1
Merge pull request #4586 from Crizz0/ticket/14770 
[ticket/14770] Reduce plupload resize quality
 2016-12-18 20:40:42 +01:00