mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-22 16:40:21 +01:00
Code Issues Releases Wiki Activity
29,505 Commits 18 Branches 191 Tags
7cc2f8aa43
Commit Graph

29505 Commits

Author SHA1 Message Date
Tristan Darricau
7cc2f8aa43
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing
 2017-04-19 17:08:16 +02:00
Tristan Darricau
d550f925ab
Merge pull request from nomind60s/ticket/15151 
[ticket/15151] ACP Cookie settings add explanatory text

* github.com:phpbb/phpbb:
  [ticket/15151] Use redirected link for consistency
  [ticket/15151] ACP Cookie settings explanatory text
  [ticket/15151] ACP Cookie settings add explanatory text where it was missing
 2017-04-19 17:05:47 +02:00
nomind60s
d0486964ce [ticket/15151] Use redirected link for consistency 
Other phpbb.com links used in the core use a redirect rather than a direct link
so change to make the Cookie settings link a redirect also.

PHPBB3-15151
 2017-04-19 06:34:16 -06:00
Tristan Darricau
7a4d6209fd
Merge pull request from vinny/ticket/15158 
[ticket/15158] Update oauth to v0.8.10

* github.com:phpbb/phpbb:
  [ticket/15158] Update oauth to v0.8.10
 2017-04-18 23:53:43 +02:00
Tristan Darricau
f2659962d3
Merge pull request from Louis7777/ticket/15173 
[ticket/15173] Fix message area resizing lag

* github.com:phpbb/phpbb:
  [ticket/15173] Fix message area resizing lag
 2017-04-18 23:45:25 +02:00
Tristan Darricau
f4bc0020ca
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15174] Split timeout message to extra method and set timeout to 60s
  [ticket/15174] Increase timeout for loading indicator
 2017-04-18 23:42:28 +02:00
Tristan Darricau
67995e1e09
Merge pull request from marc1706/ticket/15174 
[ticket/15174] Increase timeout for loading indicator

* github.com:phpbb/phpbb:
  [ticket/15174] Split timeout message to extra method and set timeout to 60s
  [ticket/15174] Increase timeout for loading indicator
 2017-04-18 23:41:34 +02:00
Tristan Darricau
e0ae49d8a5
Merge pull request from JoshyPHP/ticket/15163 
fixes 

* ticket/15163:
  [ticket/15163] Escape curly braces in smilies HTML attributes
 2017-04-18 23:36:04 +02:00
JoshyPHP
ddcd0f2437
[ticket/15163] Escape curly braces in smilies HTML attributes 
PHPBB3-15163
 2017-04-18 23:33:35 +02:00
Tristan Darricau
d4f0c79b56
Merge pull request from rubencm/ticket/15084 
[ticket/15084] Fix wrong order of breadcrumbs in module management

* github.com:phpbb/phpbb:
  [ticket/15084] fix wrong order of breadcrumbs on module management
 2017-04-18 23:25:20 +02:00
Tristan Darricau
bd220f233a
Merge pull request from marc1706/ticket/15079 
[ticket/15079] Parse message before inserting it into drafts table

* github.com:phpbb/phpbb:
  [ticket/15079] Parse message before inserting it into drafts table
 2017-04-18 23:19:54 +02:00
Tristan Darricau
4cbf619fd5
Merge pull request from nomind60s/ticket/15097 
[ticket/15097] Add PHP version to Board statistics

* github.com:phpbb/phpbb:
  [ticket/15097] New 'Installed software' lead section
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Resolve travis-ci error
  [ticket/15097] Add PHP version to Board statistics
  [ticket/15097] Add PHP version to Board statistics
 2017-04-18 23:14:56 +02:00
Tristan Darricau
2b233452c7
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15108] Remove duplicate code in request->context
 2017-04-18 23:10:28 +02:00
Tristan Darricau
2d33b6adc6
Merge pull request from javiexin/ticket/15108 
[ticket/15108] Remove duplicate code in request->overwrite

* github.com:phpbb/phpbb:
  [ticket/15108] Remove duplicate code in request->context
 2017-04-18 23:10:13 +02:00
Tristan Darricau
42fbf9d815
Merge pull request from marc1706/ticket/15103 
[ticket/15103] Update fast-image-size to 1.1.3

* github.com:phpbb/phpbb:
  [ticket/15103] Update fast-image-size to 1.1.3
 2017-04-18 23:07:25 +02:00
Marc Alexander
623058b08c
Merge pull request from Nicofuma/ticket/15180 
[ticket/15180] Adjust \phpbb\di\extension\core::TWIG_OPTIONS_POSITION
 2017-04-18 21:46:44 +02:00
Marc Alexander
0dfe3da9bb
Merge branch 'ticket/15125' into 3.2.x 2017-04-18 20:38:22 +02:00
Rishabh04-02
72f7f6eff9
[ticket/15125] Remove the function play_qt_file in forum_fn.js 
PHPBB3-15125
 2017-04-18 20:38:02 +02:00
Tristan Darricau
e0d13da5f4
[ticket/15180] Adjust \phpbb\di\extension\core::TWIG_OPTIONS_POSITION 
PHPBB3-15180
 2017-04-17 23:06:25 +02:00
Marc Alexander
2c66867126
Merge pull request from Crizz0/ticket/15152 
[ticket/15152] Updates Font Awesome Icons to version 4.7.0
 2017-04-17 12:02:17 +02:00
Marc Alexander
4946c05937
Merge branch '3.1.x' into 3.2.x 2017-04-17 11:50:55 +02:00
Marc Alexander
8303058ac6
Merge pull request from javiexin/ticket/15080 
[ticket/15080] Save unneeded file loads for extension metadata
 2017-04-17 10:19:19 +02:00
Marc Alexander
f645865333
[ticket/15174] Split timeout message to extra method and set timeout to 60s 
PHPBB3-15174
 2017-04-17 09:59:22 +02:00
Marc Alexander
8a624c4dcc
[ticket/15174] Increase timeout for loading indicator 
The timeout is rather low with 15 seconds until reporting
a timed out request. 25 seconds will be compatible with almost
any setup. A lot more changes would be needed to do proper
timeout checks on slow requests like purging the board cache.

PHPBB3-15174
 2017-04-16 21:50:17 +02:00
Marc Alexander
515d3b7cd1
Merge pull request from rxu/ticket/14990 
[ticket/14990] Add core events to the Twig environment
 2017-04-16 19:41:14 +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
rxu
633bbc9c6d [ticket/14990] Add core events to the Twig environment 
PHPBB3-14990
 2017-04-16 22:43:49 +07:00
Marc Alexander
c5126af1df
Merge pull request from marc1706/ticket/14938 
[ticket/14938] Add missing language class to extension manager mock
 2017-04-16 17:35:43 +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
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
9d35258532
Merge branch '3.1.x' into 3.2.x 2017-04-16 11:42:31 +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
Tristan Darricau
3bddf02799
Merge pull request from marc1706/ticket/15090 
[ticket/15090] Ensure send stats module exists before removing

* github.com:phpbb/phpbb:
  [ticket/15090] Ensure send stats module exists before removing
 2017-04-16 10:21:14 +02:00
Marc Alexander
82e1b8fd72
Merge pull request from javiexin/ticket/14919 
[ticket/14919] Do not directly use globals in acp_extensions
 2017-04-16 09:49:21 +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
e7dfdbffb5
[ticket/15090] Ensure send stats module exists before removing 
PHPBB3-15090
 2017-04-15 12:06:03 +02:00
Louis7777
6d1de15748 [ticket/15173] Fix message area resizing lag 
Resizing the posting editor's text area lags,
because there is an all-inclusive CSS transition.
This fix excludes the height property from having a noticeable transition.

PHPBB3-15173
 2017-04-14 15:10:48 +03:00
Marc Alexander
24f9a41654
Merge branch '3.1.x' into 3.2.x 2017-04-11 21:27:38 +02:00
Marc Alexander
675b98c89f
Merge pull request from VSEphpbb/ticket/15142-merge32x 
[ticket/15142] merge32x
 2017-04-11 21:27:19 +02:00
Marc Alexander
f9a596c544
Merge pull request from VSEphpbb/ticket/15142 
[ticket/15142] Check extension updates on current branch
 2017-04-11 21:26:52 +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
a26e8a1aa4
Merge branch '3.1.x' into 3.2.x 2017-04-09 14:10:49 +02:00
Marc Alexander
3bf133c96c
Merge pull request from marc1706/ticket/15139 
[ticket/15139] Assigned 'topics_per_page' before template included
 2017-04-09 14:09:07 +02:00
Vinny
91fc8f407a [ticket/15158] Update oauth to v0.8.10 
PHPBB3-15158
 2017-04-04 04:20:00 -03:00
Matt Friedman
450402ea42 [ticket/15142] Remove duplicate code 
PHPBB3-15142
 2017-04-03 11:34:40 -07:00
nomind60s
d4ecb910d8 [ticket/15151] ACP Cookie settings explanatory text 
Fixed extraneous whitespace at end of line.

PHPBB3-15151
 2017-03-29 14:42:02 -06:00
nomind60s
5bf3e4b3c6 [ticket/15151] ACP Cookie settings add explanatory text where it was missing 
Improve the lead section to include a link to the phpBB.com Knowledge Base and
add explanation text for the Cookie domain, Cookie name and Cookie path fields.

PHPBB3-15151
 2017-03-29 12:30:09 -06:00
upstrocker
f991a99a14
[ticket/15139] Assigned 'topics_per_page' before template included 
The element $config['topics_per_page'] was assigned a value after the
template was included, which led to incorrect page number display in the
header when pagination.
Now this var is assigned the correct value before the template is included

PHPBB3-15139
 2017-03-28 20:41:38 +02:00