1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

27723 Commits

Author SHA1 Message Date
Marc Alexander
ad914a6880 Merge branch '3.1.x' 2016-01-26 08:57:36 +01:00
Marc Alexander
4250bfee29 Merge pull request #4143 from VSEphpbb/ticket/14433
[ticket/14433] Purge cache setting up extension functional tests
2016-01-26 08:57:33 +01:00
Matt Friedman
9940775550 [ticket/14433] Purge cache setting up extension functional tests
PHPBB3-14433
2016-01-25 17:49:50 -08:00
Tristan Darricau
56062a2635 Merge pull request #4009 from cunha17/ticket/14253
* cunha17-master:
  [ticket/14253] Show group requests pending aproval at the ACP groups summary
  [ticket/14253] Show group requests pending aproval at the ACP groups summary

fixes #4009
2016-01-25 13:15:52 +01:00
cunha17
57ce891d5f [ticket/14253] Show group requests pending aproval at the ACP groups summary
Currenty, you need to open each existing group in ACP to know if there
are pending group requests or not. Doing so is really boring and
annoying... :/
This patch displays the number of pending group requests at the ACP groups
summary page.

PHPBB3-14253
2016-01-25 13:13:05 +01:00
cunha17
3d03c834d0 [ticket/14253] Show group requests pending aproval at the ACP groups summary
Currenty, you need to open each existing group in ACP to know if there are
pending group requests or not. Doing so is really boring and annoying... :/
This patch displays the number of pending group requests at the ACP groups
summary page.

PHPBB3-14253
2016-01-25 13:13:05 +01:00
Marc Alexander
8e8051f41d Merge pull request #4131 from Nicofuma/ticket/13717
[ticket/13717] Set the assets after rendering the whole template
2016-01-25 10:31:23 +01:00
Tristan Darricau
b7db2717b2 Merge pull request #4126 from marc1706/ticket/13733
[ticket/13733] Allow non-migration files inside migrations folder

* marc1706/ticket/13733:
  [ticket/13733] Remove validate_classes method argument
  [ticket/13733] Make sure migration classes always have same order in tests
  [ticket/13733] Properly test setting validate_classes to false/true
  [ticket/13733] Use interface for migratinos
  [ticket/13733] Update comment explaining migration class validation
  [ticket/13733] Add isInstantiable() check.
  [ticket/13733] Braces on their own lines
  [ticket/13733] Allow tests the skip class validation
  [ticket/13733] Properly handle nonexistent classes as well
  [ticket/13733] Handle nonexistent classes as well
  [ticket/13733] Only use migration classes that extension the base migration class.
2016-01-25 09:08:23 +01:00
Tristan Darricau
e91b1fa464 [ticket/13717] Fix tests
PHPBB3-13717
2016-01-25 00:31:45 +01:00
Tristan Darricau
52b3d54805 [ticket/13717] Set the assets after rendering the whole template
The goal being to be able to call INCLUDECSS/JS from anywhere in any tempalte or event

PHPBB3-13717
2016-01-25 00:31:45 +01:00
Marc Alexander
fac4672f3f [ticket/13733] Remove validate_classes method argument
PHPBB3-13733
2016-01-24 22:39:37 +01:00
Tristan Darricau
d8af5ac4f9 Merge pull request #4140 from Crizz0/ticket/14418
[ticket/14418] Wrong language variable in viewtopic_topic_tools.html …

* Crizz0/ticket/14418:
  [ticket/14418] Wrong language variable in viewtopic_topic_tools.html fixed
2016-01-24 18:35:04 +01:00
Tristan Darricau
49e4c11bad Merge branch '3.1.x'
* 3.1.x:
  [ticket/14411] Permanently delete post if delete_permanent is set
2016-01-24 18:16:16 +01:00
Tristan Darricau
3566bb9e44 Merge pull request #4124 from marc1706/ticket/14411
[ticket/14411] Permanently delete post if delete_permanent is set

* marc1706/ticket/14411:
  [ticket/14411] Permanently delete post if delete_permanent is set
2016-01-24 18:16:00 +01:00
Tristan Darricau
36ff2c7b59 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14425] Allow setting unix socket in database tests
2016-01-24 18:00:26 +01:00
Tristan Darricau
9059864dac Merge pull request #4136 from marc1706/ticket/14425
[ticket/14425] Allow setting unix socket in database tests

* marc1706/ticket/14425:
  [ticket/14425] Allow setting unix socket in database tests
2016-01-24 17:59:04 +01:00
Tristan Darricau
9d23bf1ec5 Merge pull request #4138 from marc1706/ticket/14428
[ticket/14428] Fix files types remote tests

* marc1706/ticket/14428:
  [ticket/14428] Fix files types remote tests
2016-01-24 17:39:15 +01:00
Crizzo
ca9560fc7a [ticket/14418] Wrong language variable in viewtopic_topic_tools.html fixed
In viewtopic_topic_tools.html was used the language variable L_PM_TOOLS it
had to be changed to L_TOPIC_TOOLS to display the right title in the
moderation wrench in viewtopic.php

PHPBB3-14418
2016-01-24 12:10:03 +01:00
Marc Alexander
911ba68895 Merge pull request #4132 from VSEphpbb/ticket/14420
[ticket/14420] Fix up search results topic lists
2016-01-24 11:10:30 +01:00
Marc Alexander
10bf5c1533 [ticket/14428] Fix files types remote tests
PHPBB3-14428
2016-01-23 13:46:18 +01:00
Marc Alexander
e28a5da457 Merge branch '3.1.x' 2016-01-23 12:04:43 +01:00
Marc Alexander
39538ecb85 Merge pull request #4137 from RMcGirr83/ticket_14427
[ticket/14427] Memberlist displays inaccurate information
2016-01-23 11:55:04 +01:00
Richard McGirr
b74dc1fa95 [ticket/14427] Memberlist displays inaccruate information
PHPBB3-14427
2016-01-22 06:03:42 -05:00
Marc Alexander
10756f3f87 Merge branch '3.1.x' 2016-01-21 17:37:15 +01:00
Marc Alexander
91fbdd9ff8 Merge pull request #4135 from lavigor/ticket/14423
[ticket/14423] Display database size for Aria storage engine
2016-01-21 17:37:11 +01:00
Marc Alexander
57b226ec76 [ticket/14425] Allow setting unix socket in database tests
PHPBB3-14425
2016-01-21 12:20:35 +01:00
lavigor
5832698f4f [ticket/14423] Display database size for Aria storage engine
PHPBB3-14423
2016-01-20 21:34:30 +03:00
Marc Alexander
a60935b99d [ticket/13733] Make sure migration classes always have same order in tests
PHPBB3-13733
2016-01-20 11:16:29 +01:00
Marc Alexander
0defce65c8 [ticket/13733] Properly test setting validate_classes to false/true
PHPBB3-13733
2016-01-19 23:32:07 +01:00
Matt Friedman
98467d2ea5 [ticket/14420] Fix up search results topic lists
PHPBB3-14420
2016-01-18 17:55:31 -08:00
Tristan Darricau
77d033f99e Merge pull request #4116 from marc1706/ticket/14402
[ticket/14402] Tidy plupload cron should not rely on user id/ip being available

* marc1706/ticket/14402:
  [ticket/14402] Directly pass user id and ip
  [ticket/14402] Get rid of globals in tidy_plupload cron
  [ticket/14402] Do not expect user id and ip to be available in cron
2016-01-18 23:46:22 +01:00
Tristan Darricau
39c9baa574 Merge pull request #4121 from marc1706/ticket/11875
[ticket/11875] Use 4-byte integer instead of 3-byte integer for ID columns

* marc1706/ticket/11875:
  [ticket/11875] Add back new line
  [ticket/11875] Change more columns to use UINT and add missings ones
  [ticket/11875] Add migration file
  [ticket/11875] Recreate schemas for install
  [ticket/11875] Create new map for UNSIGNED 4-byte integer
  [ticket/11875] Upgrade default data type from MEDIUMINT to INT
2016-01-18 23:29:41 +01:00
Tristan Darricau
bcc5eac7dd Merge pull request #4130 from marc1706/ticket/14419
[ticket/14419] Update composer dependencies and lock file

* marc1706/ticket/14419:
  [ticket/14419] Update composer dependencies and lock file
  [ticket/13908] "After" clause in migration not working
  [ticket/13908] "After" clause in migration not working
2016-01-18 23:15:56 +01:00
Marc Alexander
6e465c01bf [ticket/14419] Update composer dependencies and lock file
PHPBB3-14419
2016-01-18 21:39:51 +01:00
Marc Alexander
e954b0b82b [ticket/13733] Use interface for migratinos
PHPBB3-13733
2016-01-18 14:54:54 +01:00
Marc Alexander
a30ecb81f8 Merge branch '3.1.x' 2016-01-17 23:28:33 +01:00
Marc Alexander
0c34641abd Merge pull request #3718 from javiexin/ticket/13908
[ticket/13908] "After" clause in migration not working
2016-01-17 23:28:29 +01:00
Marc Alexander
a98f12d1fc Merge branch '3.1.x' 2016-01-16 23:18:13 +01:00
Marc Alexander
12a10de0d1 Merge pull request #4122 from lavigor/ticket/12441
[ticket/12441] Correct database size detection in MariaDB 10
2016-01-16 23:18:13 +01:00
Marc Alexander
8e5b5a5c07 Merge branch '3.1.x' 2016-01-16 23:10:37 +01:00
Marc Alexander
f34df97f8b Merge pull request #4125 from lavigor/ticket/14412
[ticket/14412] Comment fixes for PHPDoc in the events
2016-01-16 23:10:37 +01:00
Marc Alexander
b908524853 [ticket/13733] Update comment explaining migration class validation
PHPBB3-13733
2016-01-15 18:34:12 +01:00
Marc Alexander
0178c27092 Merge pull request #3626 from imkingdavid/ticket/13733
[ticket/13733] Allow non-migration files inside migrations folder
2016-01-15 18:31:27 +01:00
Marc Alexander
8e584dfa6b Merge pull request #4077 from Nicofuma/ticket/14306
[ticket/14306] Automatically enable a safe mode when container building fails
2016-01-15 18:13:34 +01:00
lavigor
fef03a1946 [ticket/14412] Comment fixes for PHPDoc in the events
PHPBB3-14412
2016-01-15 14:07:50 +03:00
Marc Alexander
6710ea3947 [ticket/14402] Directly pass user id and ip
PHPBB3-14402
2016-01-15 11:22:13 +01:00
Marc Alexander
3a555d94af [ticket/14402] Get rid of globals in tidy_plupload cron
PHPBB3-14402
2016-01-15 11:21:08 +01:00
Marc Alexander
3a82ace3eb [ticket/14402] Do not expect user id and ip to be available in cron
PHPBB3-14402
2016-01-15 11:21:07 +01:00
Marc Alexander
97e002cc3d Merge branch '3.1.x'
Conflicts:
	phpBB/phpbb/log/log.php
2016-01-15 11:18:13 +01:00
Marc Alexander
295a424fc7 Merge pull request #4117 from Elsensee/ticket/14403
[ticket/14403] Don't expect user_id and user_ip in phpbb\log
2016-01-15 11:15:56 +01:00