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

29525 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tristan Darricau
f40d4e03a3
Merge pull request #4806 from javiexin/ticket/15011v32 
[ticket/15011] Use exception interface for 3.2

* github.com:phpbb/phpbb:
  [ticket/15011] Use exception interface for 3.2
 2017-04-21 23:51:41 +02:00
javiexin
6a61e73e00 [ticket/15011] Use exception interface for 3.2 
Update the mentioned ticket to 3.2 by using exception_inteface
instead of the actual exception class.
Also, use adm_back_link consistently.

PHPBB3-15011
 2017-04-21 21:28:29 +02:00
Tristan Darricau
ad5fcd5356
Merge pull request #4805 from rmcgirr83/ticket-15144 
[ticket/15144] Attachment icon display should only occur

* github.com:phpbb/phpbb:
  [ticket/15144] Attachment icon display should only occur
 2017-04-20 12:55:13 +02:00
Richard McGirr
ca3b715fdc [ticket/15144] Attachment icon display should only occur 
if there are attachments in reports

https://tracker.phpbb.com/browse/PHPBB3-15144

PHPBB3-15144
 2017-04-20 06:04:27 -04:00
Tristan Darricau
109aaff534
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13608] Add core.ucp_restore_permissions event
 2017-04-19 23:08:15 +02:00
Tristan Darricau
ff22d54eae
Merge pull request #4670 from senky/ticket/13608 
[ticket/13608] Add core.ucp_restore_permissions event

* github.com:phpbb/phpbb:
  [ticket/13608] Add core.ucp_restore_permissions event
 2017-04-19 23:08:15 +02:00
Tristan Darricau
40e4a6ea87
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13609] Add core.ucp_switch_permissions event
 2017-04-19 23:04:11 +02:00
Tristan Darricau
5bd497ae54
Merge pull request #4669 from senky/ticket/13609 
[ticket/13609] Add core.ucp_switch_permissions event

* github.com:phpbb/phpbb:
  [ticket/13609] Add core.ucp_switch_permissions event
 2017-04-19 23:04:11 +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 #4657 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
3661398a78
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15146] Date profile field validation incorrect
 2017-04-19 22:52:56 +02:00
Tristan Darricau
8ae7d2495c
Merge pull request #4763 from javiexin/ticket/15146 
[ticket/15146] Date profile field validation incorrect

* github.com:phpbb/phpbb:
  [ticket/15146] Date profile field validation incorrect
 2017-04-19 22:52:55 +02:00
Tristan Darricau
fc39aa8d71
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13735] Fix input type number for Firefox in prosilver
 2017-04-19 22:20:15 +02:00
Tristan Darricau
8d8886e7ba
Merge pull request #4798 from javiexin/ticket/13735 
[ticket/13735] Fix input type number for Firefox in prosilver

* github.com:phpbb/phpbb:
  [ticket/13735] Fix input type number for Firefox in prosilver
 2017-04-19 22:20:14 +02:00
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 #4781 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 #4786 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 #4792 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 #4796 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 #4788 from JoshyPHP/ticket/15163 
fixes #4788

* 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 #4692 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 #4693 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 #4705 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 #4718 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 #4768 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 #4800 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
javiexin
3c8bdc8fb4 [ticket/13735] Fix input type number for Firefox in prosilver 
PHPBB3-13735
 2017-04-17 20:04:06 +02:00
Marc Alexander
2c66867126
Merge pull request #4771 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 #4689 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 #4633 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 #4795 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 #4592 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 #4698 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 #4793 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