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

29740 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rxu
33a62648d1 [ticket/15200] Allow extensions using custom templates for help/faq controllers 
PHPBB3-15200
 2017-04-27 16:22:03 +07:00
rxu
f5d49b61bb [ticket/15199] Add core event to the messenger send() function 
PHPBB3-15199
 2017-04-27 15:06:34 +07:00
Marc Alexander
8179e56b02
Merge branch '3.1.x' into 3.2.x 2017-04-26 19:58:29 -04:00
Marc Alexander
e53343857a
Merge pull request #4674 from senky/ticket/13730 
[ticket/13730] Add core.delete_post_end event
 2017-04-26 19:57:35 -04:00
Marc Alexander
38d8787854
Merge branch '3.1.x' into 3.2.x 2017-04-26 19:53:34 -04:00
Marc Alexander
994c1d79b1
Merge pull request #4672 from senky/ticket/13603 
[ticket/13603] Add index_body_stat_blocks_after event
 2017-04-26 19:52:35 -04:00
Marc Alexander
5cafff36b2
Merge branch '3.1.x' into 3.2.x 2017-04-26 19:30:50 -04:00
Marc Alexander
4c58dfc19a
Merge pull request #4671 from senky/ticket/13605 
[ticket/13605] Add core.ucp_pm_compose_predefined_message event
 2017-04-26 19:30:47 -04:00
Marc Alexander
a116762974
Merge pull request #4809 from VSEphpbb/ticket/15198 
[ticket/15198] Add PHP version to board stats in the ACP
 2017-04-26 19:08:27 -04:00
Matt Friedman
95f61af798 [ticket/15198] Add PHP version to board stats in the ACP 
PHPBB3-15198
 2017-04-26 09:40:15 -07:00
Tristan Darricau
6922593660
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
 2017-04-21 23:54:53 +02:00
Tristan Darricau
afe2664c56
Merge pull request #4802 from marc1706/ticket/8116-rhea 
[ticket/8116] Add pagination for IP tables and post info -- Rhea version

* github.com:phpbb/phpbb:
  [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:54:41 +02:00
Tristan Darricau
a233f98bbf
Merge pull request #4780 from marc1706/ticket/8116 
[ticket/8116] Add pagination for IP tables and post info

* github.com:phpbb/phpbb:
  [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:54:18 +02:00
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
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
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
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
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
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
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
rxu
f178c06b4f [ticket/15186] Fully implement the force_delete_allowed feature 
PHPBB3-15186
 2017-04-19 21:33:22 +07: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
Marc Alexander
771be9310d
[ticket/8116] Correctly get other users who posted under IP 
PHPBB3-8116
 2017-04-18 19:33:05 +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