mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-04-04 07:53:06 +02:00
Code Issues Releases Wiki Activity
29,969 Commits 18 Branches 192 Tags
Commit Graph

25386 Commits

Author SHA1 Message Date
Marc Alexander
c92c2aa2f4
Merge branch '3.2.x' 2017-04-16 11:42:53 +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
905e189c77
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15090] Ensure send stats module exists before removing
 2017-04-16 10:22:01 +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
Marc Alexander
58929bdccd
Merge branch '3.2.x' 2017-04-15 18:19:16 +02:00
Marc Alexander
269150ed40
Merge pull request #4612 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
Marc Alexander
fba8595421
Merge branch '3.2.x' 2017-04-11 21:28:08 +02:00
Marc Alexander
675b98c89f
Merge pull request #4790 from VSEphpbb/ticket/15142-merge32x 
[ticket/15142] merge32x
 2017-04-11 21:27:19 +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
4a657d0732
Merge branch '3.2.x' 2017-04-09 14:11:10 +02:00
Marc Alexander
a26e8a1aa4
Merge branch '3.1.x' into 3.2.x 2017-04-09 14:10:49 +02:00
Matt Friedman
450402ea42 [ticket/15142] Remove duplicate code 
PHPBB3-15142
 2017-04-03 11:34:40 -07: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
Marc Alexander
798dda2cbc
Merge branch '3.2.x' 2017-03-28 19:42:59 +02:00
hanakin
b30e775bf1 [ticket/15157] simple header 
PHPBB3-15157
 2017-03-28 10:55:54 -04:00
hanakin
64b863728b [ticket/15157] Add proper google font call 
PHPBB3-15157
 2017-03-28 09:56:41 -04:00
Matt Friedman
c6321fc61b [ticket/15153] Update to newer homestead for vagrant 
PHPBB3-15153
 2017-03-26 16:31:59 -07:00
Marc Alexander
835d8f429d
Merge pull request #4727 from hanakin/ticket/15116 
[ticket/15116] Fix admin errors
 2017-03-26 22:39:45 +02:00
Marc Alexander
e2a746c644
Merge branch '3.2.x' 2017-03-26 17:12:43 +02:00
Marc Alexander
ecef296bee
Merge pull request #4530 from senky/ticket/14557 
[ticket/14557] Simplify updating overloaded events for extensions
 2017-03-26 17:12:39 +02:00
hanakin
6dc1bdc1ca [ticket/15116] fix new errors after rc update 
PHPBB3-15116
 2017-03-25 17:40:15 -04:00
hanakin
f0e07ceb90 [ticket/15116] Fix admin errors 
PHPBB3-15116
 2017-03-25 17:37:58 -04:00
Marc Alexander
f36d5691c8
Merge pull request #4726 from hanakin/ticket/15115 
[ticket/15115] Update CSS error checking Stylelintrc file
 2017-03-25 16:48:05 +01:00
Michael Miday
84fdd1a5d4
[ticket/15115] Fix typo 
PHPBB3-15115
 2017-03-25 16:47:51 +01:00
Marc Alexander
f23ff335c7
Merge branch '3.2.x' 2017-03-25 16:37:37 +01:00
Marc Alexander
936426178b
Merge pull request #4762 from Nicofuma/ticket/15137 
[ticket/15137] Global Announcements shouldn't always be never ending
 2017-03-25 16:37:33 +01:00
Tristan Darricau
38cf5c10f9
[ticket/15137] Global Announcements shouldn't always be never ending 
PHPBB3-15137
 2017-03-25 14:11:20 +01:00
Marc Alexander
097f77dc66
Merge branch '3.2.x' 2017-03-25 11:30:35 +01:00
Marc Alexander
bf6822ed1b
Merge pull request #4750 from rubencm/ticket/15134 
[ticket/15134] Replace php native functions for filesystem service methods
 2017-03-25 11:30:13 +01:00
hanakin
74fcd60afe [ticket/15115] Update grads & single line rules 
PHPBB3-15115
 2017-03-24 20:33:24 -04:00
hanakin
79f865bd56 [ticket/15115] Fix errors 
PHPBB3-15115
 2017-03-24 20:01:10 -04:00
hanakin
8f25f40321 [ticket/15115] Fix print.css errors 
PHPBB3-15115
 2017-03-24 20:01:09 -04:00
hanakin
f1ad532a56 [ticket/15115] pkg.json must be in root 
PHPBB3-15115
 2017-03-24 20:01:09 -04:00
hanakin
c6f2f00a78 [ticket/15115] more prep for rebase 
PHPBB3-15115
 2017-03-24 20:01:09 -04:00
hanakin
8713c71776 [ticket/15115] prep for rebase 
PHPBB3-15115
 2017-03-24 20:01:09 -04:00
hanakin
ec71279a77 [ticket/15115] Fix errors 
PHPBB3-15115
 2017-03-24 20:01:09 -04:00
hanakin
2ca1402476 [ticket/15115] Update stylelintrc & pkg.json files 
PHPBB3-15115
 2017-03-24 20:01:09 -04:00
Tristan Darricau
e4c13af894
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15143] Fix display of version update in ACP
 2017-03-24 23:20:08 +01:00
Tristan Darricau
e86f199d16
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15143] Fix display of version update in ACP
 2017-03-24 23:19:54 +01:00
Tristan Darricau
1f1baf3e30
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15135] Correctly pass exception arguments and add back link again
  [ticket/15135] Parse language files in acp_extensions instead of md manager
 2017-03-24 23:08:02 +01:00
Tristan Darricau
2af371d2f4
Merge pull request #4751 from marc1706/ticket/15135 
[ticket/15135] Parse language files in acp_extensions instead of md manager

* github.com:phpbb/phpbb:
  [ticket/15135] Correctly pass exception arguments and add back link again
  [ticket/15135] Parse language files in acp_extensions instead of md manager
 2017-03-24 23:07:59 +01:00
Matt Friedman
afddb81acf [ticket/15142] Handle versions for unmatched branches 
PHPBB3-15142
 2017-03-24 11:47:03 -07:00
Matt Friedman
91ab27ecc9 [ticket/15142] Check extension updates on current branch 
PHPBB3-15142
 2017-03-24 09:37:14 -07:00
Marc Alexander
a975a35734
[ticket/15135] Correctly pass exception arguments and add back link again 
PHPBB3-15135
 2017-03-23 21:52:35 +01:00
Matt Friedman
45c3cb52e4 [ticket/15143] Fix display of version update in ACP 
PHPBB3-15143
 2017-03-22 12:14:05 -07:00
Tristan Darricau
9b6fa7421b
Merge branch '3.2.x' 
* 3.2.x:
  [ticket/15137] Missed one language string change
  [ticket/15137] Global announcements can stick for a non-zero number of days
 2017-03-21 16:29:38 +01:00
Tristan Darricau
c9aab0baef
Merge pull request #4752 from nomind60s/ticket/15137 
[ticket/15137] Global Announcements shouldn't always be never ending

* github.com:phpbb/phpbb:
  [ticket/15137] Missed one language string change
  [ticket/15137] Global announcements can stick for a non-zero number of days

fixes #4752
 2017-03-21 16:29:10 +01:00
nomind60s
d15b88af2a [ticket/15137] Missed one language string change 
Change STICKY_ANNOUNCE_TIME_LIMIT for consistency

PHPBB3-15137
 2017-03-21 06:50:25 -06:00
nomind60s
7609ba71e9 [ticket/15137] Global announcements can stick for a non-zero number of days 
To be consistent with Sticky and Announcements topic types, Global
announcements can now stick for a non-zero number of days, i.e. they are
no longer never ending.

Before this change, if the topic type was Global and a non-zero number of
days where set to stick topic, the number was silently ignored and a Global
announcement was always never ending.

PHPBB3-15137
 2017-03-20 23:06:34 -06:00