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

29567 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jakub Senko
27b2d91713
[ticket/15217] Add core.user_format_date_override event 
PHPBB3-15217
 2017-06-05 13:02:05 +02:00
Marc Alexander
877760ef98
Merge branch '3.1.x' into 3.2.x 2017-05-02 13:16:36 -04:00
Marc Alexander
ca9e3eb528
Merge pull request #4815 from kasimi/ticket/15187 
[ticket/15187] Add paths of newly enabled extensions to template
 2017-05-02 13:16:32 -04:00
Marc Alexander
521760aeb7
Merge pull request #4816 from javiexin/ticket/15202 
[ticket/15202] To disable, an extension must be enabled
 2017-04-30 20:36:12 -04:00
kasimi
5808c9fae1
[ticket/15187] Use $this->template property 2017-04-29 13:45:20 +02:00
kasimi
bc404a3701
[ticket/15187] Add ACP style after enabling an extension 2017-04-29 11:01:55 +02:00
javiexin
1e8f467964 [ticket/15202] To disable, an extension must be enabled 
PHPBB3-15202
 2017-04-28 23:47:51 +02:00
kasimi
0082dd8039
[ticket/15187] Reverted commits e6b7def & 90a80b7 
PHPBB3-15187
 2017-04-28 22:20:24 +02:00
kasimi
90a80b7b31
[ticket/15187] Fail gracefully if template service is unavailable 2017-04-28 16:58:08 +02:00
kasimi
e6b7defd38
[ticket/15187] Add paths of newly enabled extensions to template 
When enabling an extension its paths aren't added immediately to
the template which results in ACP events not being registered in
the compiled template files.

PHPBB3-15187
 2017-04-28 16:32:11 +02:00
Tristan Darricau
64f33e7a94
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
 2017-04-28 11:30:15 +02:00
Tristan Darricau
7254980753
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-28 11:30:14 +02:00
Marc Alexander
476e51f7db
Merge pull request #4813 from marc1706/ticket/13603 
[ticket/13603] Add missing event to events.md
 2017-04-27 10:04:10 -04:00
Marc Alexander
bcfbae567f
[ticket/13603] Add missing event to events.md 
PHPBB3-13603
 2017-04-27 09:46:27 -04:00
Marc Alexander
abbb782820
Merge pull request #4710 from nomind60s/ticket/15086 
[ticket/15086] Replace quote.gif with Font Awesome icon
 2017-04-27 09:34:16 -04: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
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