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

29453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Marc Alexander
82e1b8fd72
Merge pull request #4581 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 #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
24f9a41654
Merge branch '3.1.x' into 3.2.x 2017-04-11 21:27:38 +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
Marc Alexander
f9a596c544
Merge pull request #4761 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 #4778 from marc1706/ticket/15139 
[ticket/15139] Assigned 'topics_per_page' before template included
 2017-04-09 14:09:07 +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
33a050ade9
Merge pull request #4775 from hanakin/ticket/15157 
[ticket/15157] Add proper google font call
 2017-03-28 19:42:55 +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
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
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
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
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
827ded82b8
Merge pull request #4757 from VSEphpbb/ticket/15143 
[ticket/15143] Fix display of version update in ACP

* github.com:phpbb/phpbb:
  [ticket/15143] Fix display of version update in ACP
 2017-03-24 23:18:50 +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
74054317d2 [ticket/15142] Add ext branch update tests 
PHPBB3-15142
 2017-03-24 11:47:28 -07: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
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
Rubén Calvo
27ab639fbe [ticket/15134] Return false if error 
PHPBB3-15134
 2017-03-20 11:49:34 +01:00
Marc Alexander
6f1de69bbe
[ticket/15135] Parse language files in acp_extensions instead of md manager 
PHPBB3-15135
 2017-03-19 22:37:19 +01:00
Rubén Calvo
29ce6e6352 [ticket/15134] Follow coding guideliness 
PHPBB3-15134
 2017-03-19 19:26:08 +01:00
Tristan Darricau
bd34b2301e
Merge pull request #4711 from javiexin/ticket/15102 
[ticket/15102] Missing parameter calling version_check

* github.com:phpbb/phpbb:
  [ticket/15102] Missing parameter calling version_check
 2017-03-19 18:53:19 +01:00
Tristan Darricau
d1248ad5ce
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14758] Improve the ACP Parameter wording
 2017-03-19 18:49:47 +01:00
Tristan Darricau
927220c873
Merge branch 'mukeshkharita-ticket/14758' into 3.1.x 
* mukeshkharita-ticket/14758:
  [ticket/14758] Improve the ACP Parameter wording

fixes #4724
 2017-03-19 18:49:26 +01:00
Mukesh Kumar Kharita
dcdb0dcd23
[ticket/14758] Improve the ACP Parameter wording 
PHPBB3-14758
 2017-03-19 18:48:55 +01:00
Tristan Darricau
c46efa461e
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14806] Fix ACP test emails authentication failure
 2017-03-19 18:45:29 +01:00
Tristan Darricau
6abcfe41e0
Merge pull request #4734 from rxu/ticket/14806 
[ticket/14806] Fix ACP test emails authentication failure

* github.com:phpbb/phpbb:
  [ticket/14806] Fix ACP test emails authentication failure
 2017-03-19 18:44:41 +01:00
Tristan Darricau
ed2d086302
Merge branch 'ticket/14928' into 3.2.x 
* ticket/14928:
  [ticket/14928] fixing valid stability %s
 2017-03-19 18:39:07 +01:00
Rishabh04-02
12a70f63b4
[ticket/14928] fixing valid stability %s 
PHPBB3-14928
 2017-03-19 18:38:43 +01:00
Tristan Darricau
4b6b73ea9d
Merge pull request #4736 from rubencm/ticket/15123 
[ticket/15123] Check if extension was enabled/disabled before enable or disable

* rubencm/ticket/15123:
  [ticket/15123] modified return error codes
  [ticket/15123] modified language strings
  [ticket/15123] modified language string
  [ticket/15123] removed blank spaces
  [ticket/15123] add check before enable or disable extension
 2017-03-19 18:17:41 +01:00
Tristan Darricau
0730d14247
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/15122] Add cache driver for memcached
 2017-03-19 18:14:56 +01:00
Tristan Darricau
c8670d5324
Merge pull request #4737 from marc1706/ticket/15122 
[ticket/15122] Add cache driver for memcached

* marc1706/ticket/15122:
  [ticket/15122] Add cache driver for memcached
 2017-03-19 18:14:52 +01:00
Tristan Darricau
224330f3a5
Merge pull request #4740 from rubencm/ticket/14974 
[ticket/14974] Make cookie notice configurable via language files

* rubencm/ticket/14974:
  [ticket/14974] make cookie notice configurable via language files
 2017-03-19 18:11:40 +01:00
Tristan Darricau
552da2e805
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/13558] Change options prefix and add settings precautions.
  [ticket/13558] Make SSL context specific options more SMTP general
  [ticket/13558] Add smtp SSL context configuration options
 2017-03-19 18:07:14 +01:00
Tristan Darricau
0b2369901a
Merge pull request #4745 from rxu/ticket/13558 
[ticket/13558] Add smtp SSL context configuration options

* rxu/ticket/13558:
  [ticket/13558] Change options prefix and add settings precautions.
  [ticket/13558] Make SSL context specific options more SMTP general
  [ticket/13558] Add smtp SSL context configuration options
 2017-03-19 18:04:53 +01:00
Tristan Darricau
67509edd40
Merge branch '3.1.x' into 3.2.x 
* 3.1.x:
  [ticket/14844] Add CSS classes for strong and italics text to BBCodes
 2017-03-19 18:00:35 +01:00