1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-06 23:55:26 +02:00

31672 Commits

Author SHA1 Message Date
Marc Alexander
445afbaeba Merge branch '3.2.x' 2018-07-30 13:58:30 +02:00
Marc Alexander
1e6a37431b Merge branch 'prep-release-3.2.3' into 3.2.x 2018-07-30 13:57:02 +02:00
Marc Alexander
81b02587cd Merge remote-tracking branch 'senky/ticket/11847' into prep-release-3.2.3 2018-07-30 13:56:33 +02:00
Marc Alexander
7a91766caa Merge branch '3.2.x' 2018-07-30 13:46:50 +02:00
Marc Alexander
2bac84c51f Merge branch 'prep-release-3.2.3' into 3.2.x 2018-07-30 13:45:50 +02:00
Marc Alexander
0e4a38956a Merge remote-tracking branch 'rubencm/ticket/15731' into prep-release-3.2.3 2018-07-30 13:44:48 +02:00
Jakub Senko
8276b3d337 [ticket/11847] Add depends_on() to auth_provider_oauth
PHPBB3-11847
2018-07-30 11:37:37 +02:00
Rubén Calvo
a6a3899aea [ticket/15731] Fix language string parameters
PHPBB3-15731
2018-07-30 11:20:42 +02:00
Marc Alexander
b6a0c997b3
Merge pull request from rxu/ticket/15725
[ticket/15725] Fix installing ext in tests for master branch
2018-07-30 11:17:37 +02:00
rxu
c90e8d270f [ticket/15725] Fix installing ext in tests for master branch
PHPBB3-15725
2018-07-29 17:57:21 +07:00
Marc Alexander
a9e0d91cc1
Merge branch '3.2.x' 2018-07-18 22:19:59 +02:00
Marc Alexander
065c68e2be
Merge pull request from marc1706/ticket/15677-master
[ticket/15677] Update composer dependencies to latest -- Master version
2018-07-18 22:19:47 +02:00
Marc Alexander
04899d1efd
Merge branch 'prep-release-3.2.3' into 3.2.x 2018-07-18 21:54:51 +02:00
Marc Alexander
c72d443738
Merge pull request from marc1706/ticket/15677
[ticket/15677] Update symfony  to 2.8.42, others to latest
2018-07-18 21:54:12 +02:00
Marc Alexander
e240a6fb23
Merge pull request from rubencm/ticket/15689
[ticket/15689] Show statistics of storages on acp_storage
2018-07-15 10:59:07 +02:00
Rubén Calvo
38e657bec5 [ticket/15689] Use twig syntax
PHPBB3-15689
2018-07-14 11:25:09 +02:00
Rubén Calvo
f8423600b1 [ticket/15689] Handle storage stats outside template
PHPBB3-15689
2018-07-12 21:57:26 +02:00
Rubén Calvo
50af5409a6 [ticket/15689] Remove format_bytes filter from twig
PHPBB3-15689
2018-07-12 21:57:26 +02:00
Rubén Calvo
0fed1054db [ticket/15689] Show unknown if can't retrieve free space
PHPBB3-15689
2018-07-12 21:57:26 +02:00
Rubén Calvo
584d03a9fe [ticket/15689] Show statistics of storages on acp_storage
PHPBB3-15689
2018-07-12 21:57:26 +02:00
Marc Alexander
5087d5d6b6
Merge pull request from rubencm/ticket/15342
[ticket/15342] Track storage files
2018-07-12 21:49:04 +02:00
Rubén Calvo
e40daea4bd [ticket/15342] Update comments
PHPBB3-15342
2018-07-12 15:56:17 +02:00
Rubén Calvo
af7e3662b8 [ticket/15342] Catch exception in check_disk_space
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
e5d8b1600b [ticket/15342] free_space return float and throws exception
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
117d9e69ce [ticket/15342] Fix comments
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
0e0e157e87 [ticket/15342] If the file haven't been moved, remove it from the filesystem
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
78c8674643 [ticket/15342] Fix check_disk_space
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
7d7217c381 [ticket/15342] Move call to remove file
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
c039fcba18 [ticket/15342] free_space() now return false if there is any error
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
6d2aae5853 [ticket/15342] Fix docblock
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
0cc77d2c99 [ticket/15342] Check if is resource before close it
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
bdf3a0c913 [ticket/15342] Escape strings in sql querys
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
522ff2f792 [ticket/15342] Fix sql condition
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
3ed63388b4 [ticket/15342] Use track_rename when renaming files
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
db9daf1dea [ticket/15342] Fix docblock
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
238247b5fc [ticket/15342] Remove unused variables
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
a3d949c3d0 [ticket/15342] Fix migration
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
f9c1901317 [ticket/15342] Fix test
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
22b2e95531 [ticket/15342] Add again check of free space when uploading attachments
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
4cff370f8d [ticket/15342] Add method to get free space
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
bb0d705ebf [ticket/15342] Fix files not being tracked
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
944432d382 [ticket/15342] Remove comment since they are a little diferent things
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
1d686fecb5 [ticket/15342] Fix parameter that could be null
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
9184d34a51 [ticket/15342] Use cache to get the number of files and the size of any storage
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
80e5fe255b [ticket/15342] Add method to storage to get number of tracked files
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
83d559afc5 [ticket/15342] Track attachments thumbnails
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
b823ae85cf [ticket/15342] Track current uploaded files
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
cc7178a6e0 [ticket/15342] Small improvements to storage
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
28c0db86cf [ticket/15342] Add dependencies to migration
PHPBB3-15342
2018-07-11 09:27:08 +02:00
Rubén Calvo
b91ce7610b [ticket/15342] Fix tests
PHPBB3-15342
2018-07-11 09:27:08 +02:00