1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-05-24 08:10:13 +02:00

4115 Commits

Author SHA1 Message Date
Oliver Schramm
7a32f79752 Merge branch '3.2.x' 2017-09-08 16:06:52 +02:00
Oliver Schramm
16da17a4ba Merge branch '3.1.x' into 3.2.x 2017-09-08 16:06:47 +02:00
Rubén Calvo
bace8dd31f [ticket/15201] Add casting
PHPBB3-15201
2017-09-08 15:02:29 +02:00
Rubén Calvo
c87b94133c [ticket/15330] Fix typo
PHPBB3-15330
2017-09-08 14:39:04 +02:00
Tristan Darricau
9b2c45d892
Merge pull request #4894 from rubencm/ticket/15276
[ticket/15276] Use storage in avatars

* github.com:phpbb/phpbb: (34 commits)
  [ticket/15276] Changed annotation
  [ticket/15276] Remove unused code
  [ticket/15276] Revert some changes
  [ticket/15276] Use IniGetWrapper
  [ticket/15276] Add missing dependency
  [ticket/15276] Remove unused dependency
  [ticket/15276] Add missing properties
  [ticket/15276] Use InitGetWrapper
  [ticket/15276] Fix comments
  [ticket/15276] Fix code and add phpdoc
  [ticket/15276] Use stream_copy_to_stream
  [ticket/15276] Fix typo
  [ticket/15276] Use mimetype guesser
  [ticket/15276] Update file_info to get size of images
  [ticket/15276] Update
  [ticket/15276] Remove avatar_path
  [ticket/15276] Remove avatar_path from acp
  [ticket/15276] Use finfo to get mimetype
  [ticket/15276] Update file_info
  [ticket/15276] Fix code style
  ...
2017-09-08 13:32:38 +02:00
Rubén Calvo
21f3c53882 [ticket/15330] Twig function to know if a language string is defined
PHPBB3-15330
2017-09-08 11:56:20 +02:00
Rubén Calvo
4b1ec6abb7 [ticket/15201] Fix tests
PHPBB3-15201
2017-09-08 10:59:47 +02:00
Marc Alexander
7e4498dfb5
[ticket/15347] Fix query quotes in update hashes cli command
PHPBB3-15347
2017-09-08 10:54:58 +02:00
Rubén Calvo
443c5034ce [ticket/15276] Changed annotation
PHPBB3-15276
2017-09-07 16:44:01 +02:00
Marc Alexander
38cbdb6768
[ticket/15347] Use single quotes in update hashes query
PHPBB3-15347
2017-09-07 16:27:49 +02:00
Rubén Calvo
a8ba4a99e3 [ticket/15276] Remove unused code
PHPBB3-15276
2017-09-07 15:10:52 +02:00
Máté Bartus
b1fe0f9dbe Merge branch '3.2.x' 2017-09-07 15:09:40 +02:00
Máté Bartus
f6166225cf Merge pull request #4902 from MoleDJ/patch-1
[ticket/15320] 	Redis cache does not save keys withouth expiration
2017-09-07 15:09:08 +02:00
Máté Bartus
da357f80f8 Merge pull request #4903 from rxu/ticket/15323
[ticket/15323] Allow Twig syntax in bbcode.html
2017-09-07 15:08:12 +02:00
Rubén Calvo
ed282199ac [ticket/15276] Revert some changes
PHPBB3-15276
2017-09-07 14:59:55 +02:00
Rubén Calvo
9fcf30d504 [ticket/15276] Use IniGetWrapper
PHPBB3-15276
2017-09-07 14:50:55 +02:00
Máté Bartus
049971d31d Merge branch '3.2.x' 2017-09-07 14:39:03 +02:00
Máté Bartus
908b1c9bc9 Merge pull request #4906 from rxu/ticket/15327
[ticket/15327] Add post anchor to the log postlink
2017-09-07 14:37:51 +02:00
Máté Bartus
6211b69a6f Merge branch '3.2.x' 2017-09-07 14:32:51 +02:00
Máté Bartus
6e7593a5db Merge pull request #4918 from kasimi/ticket/15328
[ticket/15328] Disable checkbox if notification method isn't supported
2017-09-07 14:31:04 +02:00
Máté Bartus
60dba82e1d Merge branch '3.2.x' 2017-09-07 14:13:58 +02:00
Máté Bartus
384ece3621 Merge pull request #4924 from rubencm/ticket/15346
[ticket/15346] Check if extension is enableable during install
2017-09-07 14:12:18 +02:00
Máté Bartus
6459bcf98f Merge branch '3.2.x' 2017-09-07 14:07:26 +02:00
Rubén Calvo
b255209574 [ticket/15276] Remove unused dependency
PHPBB3-15276
2017-09-07 13:36:25 +02:00
Rubén Calvo
bb886667d2 [ticket/15276] Add missing properties
PHPBB3-15276
2017-09-07 13:35:15 +02:00
kasimi
edd1ce7443 [ticket/15328] Use type_interface
PHPBB3-15328
2017-09-07 13:30:39 +02:00
Rubén Calvo
354dda5cc8 [ticket/15276] Use InitGetWrapper
PHPBB3-15276
2017-09-07 13:29:35 +02:00
Rubén Calvo
bf289de26f [ticket/15349] Return 1 instead of 2 in case of error
PHPBB3-15346
2017-09-07 12:56:39 +02:00
Rubén Calvo
aa23af38d4 [ticket/15349] Check if extension is enableable before enable
PHPBB3-15346
2017-09-07 12:56:29 +02:00
Marc Alexander
a6fb569fa9
Merge branch '3.2.x' 2017-09-06 19:07:35 +02:00
JoshyPHP
837dc9b3a7 [ticket/15348] Ignore smilies that are immediately followed by a word
PHPBB3-15348
2017-09-06 03:35:26 +02:00
Rubén Calvo
d99dbf1f0e [ticket/15346] Add log message if extension is not enableable
PHPBB3-15346
2017-09-05 18:48:02 +02:00
Rubén Calvo
e854e5b71f [ticket/15346] Check if extension is enableable during install
PHPBB3-15346
2017-09-03 17:53:10 +02:00
Rubén Calvo
13b0f39961 [ticket/15201] Migration to fix current invalid styles
PHPBB3-15201
2017-08-28 18:33:38 +02:00
Rubén Calvo
4719f94cec [ticket/15201] Remove wrong user style check
PHPBB3-15201
2017-08-28 18:33:38 +02:00
Rubén Calvo
da3c9b3de7 [ticket/15276] Fix code and add phpdoc
PHPBB3-15276
2017-08-28 17:55:19 +02:00
Rubén Calvo
c3e9aa1c18 [ticket/15276] Use mimetype guesser
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
09856aeb26 [ticket/15276] Update file_info to get size of images
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
0ff80fead8 [ticket/15276] Remove avatar_path from acp
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
090ed9bf79 [ticket/15276] Use finfo to get mimetype
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
400e663347 [ticket/15276] Update file_info
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
8d7336e57c [ticket/15276] Fix code style
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
006990f1d0 [ticket/15276] Fix file_info errors
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
9e018e7c12 [ticket/15276] Use streams
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
946f0348a2 [ticket/15276] Add methods to get file info
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
286b1bbe33 [ticket/15276] Change adapter to provider in config_name
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
ee094dd0de [ticket/15276] Remove annotation
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
41af01b1ee [ticket/15276] Rename exception
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
ef00bb4da5 [ticket/15276] Resolve conflicts
PHPBB3-15276
2017-08-25 15:31:58 +02:00
Rubén Calvo
0417482d55 [ticket/15276] Fix migration
PHPBB3-15276
2017-08-25 15:31:58 +02:00