1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-17 07:01:22 +02:00
Commit Graph

3612 Commits

Author SHA1 Message Date
Marc Alexander
70e30a0591 Merge pull request #4741 from flash1452/ticket/11515
[ticket/11515] Extra check after acquiring locks.
2017-06-11 16:40:48 +02:00
Tristan Darricau
5e6d8f44c9 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15219] Add console command for updating hashes to bcrypt
  [ticket/15219] Add missing space
  [ticket/15219] Update hashes to bcrypt with cron
2017-06-06 09:33:57 +02:00
Tristan Darricau
1571c76ccd Merge pull request #4826 from marc1706/ticket/15219-rhea
[ticket/15219] Update hashes to bcrypt with cron -- Rhea

* github.com:phpbb/phpbb:
  [ticket/15219] Add console command for updating hashes to bcrypt
  [ticket/15219] Add missing space
  [ticket/15219] Update hashes to bcrypt with cron
2017-06-06 09:33:22 +02:00
Marc Alexander
c0abca3c1a Merge pull request #4836 from hanakin/ticket/15234
[ticket/15234] quickfix notification avatar sizes
2017-06-05 11:55:06 +02:00
Marc Alexander
92195ede52 Merge branch '3.2.x' 2017-06-05 11:53:07 +02:00
Marc Alexander
4177edf33a Merge pull request #4833 from javiexin/ticket/15227
[ticket/15227] Check PHP version and remove old unused code
2017-06-05 11:53:02 +02:00
Marc Alexander
970c44b05f Merge branch '3.2.x' 2017-06-05 11:16:35 +02:00
Marc Alexander
fd5a013f06 Merge pull request #4811 from rxu/ticket/15200
[ticket/15200] Allow extensions using custom templates for help/faq controllers
2017-06-05 11:16:32 +02:00
Marc Alexander
509ea30aa2 Merge branch '3.2.x' 2017-06-05 11:02:49 +02:00
Marc Alexander
346c784bf3 Merge branch '3.1.x' into 3.2.x 2017-06-05 11:02:30 +02:00
Marc Alexander
a6939fcb8e Merge pull request #4784 from rubencm/ticket/15150
[ticket/15150] Add Jabber SSL context configuration options
2017-06-05 11:00:38 +02:00
Marc Alexander
77d73678a1 Merge branch 'ticket/15219' into ticket/15219-rhea 2017-06-03 11:13:03 +02:00
Marc Alexander
170613848a [ticket/15219] Add console command for updating hashes to bcrypt
PHPBB3-15219
2017-06-03 11:07:34 +02:00
Michael Miday
686a8e6d3a [ticket/15234] patch avatar sizes
PHPBB3-15234
2017-06-01 16:35:21 -04:00
Marc Alexander
145a3a2c75 Merge branch '3.2.x' 2017-05-29 12:14:10 +02:00
Marc Alexander
7dc288cb89 Merge remote-tracking branch 'javiexin/ticket/15068' into 3.2.x 2017-05-29 12:13:41 +02:00
Marc Alexander
0a3d290551 Merge branch '3.2.x' 2017-05-25 21:50:23 +02:00
David Colón
9029a925aa [ticket/14992] Add temp index migration for removing duplicates 2017-05-25 14:42:45 -04:00
Marc Alexander
cb3ce2b19a Merge branch '3.2.x' 2017-05-25 19:38:02 +02:00
Marc Alexander
deb9240546 Merge pull request #4701 from DavidIQ/ticket/14992
[ticket/14992] Improve user_notifications table performance
2017-05-25 19:36:26 +02:00
David Colón
a6317dc52d [ticket/14992] Reduce notification table col sizes 2017-05-25 09:40:58 -04:00
David Colón
4c67f65d5d [ticket/14992] 'method' is needed for the unique index 2017-05-24 16:56:24 -04:00
David Colón
c2711fb6c4 [ticket/14992] Remove temp index migration 2017-05-23 14:01:30 -04:00
Marc Alexander
f3c782b358 [ticket/14992] Make unit tests run more verbose
PHPBB3-14992
2017-05-21 22:19:44 +02:00
Marc Alexander
bcc85ab679 [ticket/14992] Correctly remove table name and prefix from keys
PHPBB3-14992
2017-05-21 16:01:27 +02:00
Marc Alexander
11f968e774 [ticket/14992] Shorten index name for user_id and item_id
PHPBB3-14992
2017-05-21 14:18:10 +02:00
javiexin
1d5f5ccffc [ticket/15227] Remove STRIP, as always false
PHPBB3-15227
2017-05-21 12:58:05 +02:00
Vishal Pandey
fa108176e5 [ticket/11515] If condition changes
Duplicate return statements removed.

PHPBB3-11515
2017-05-14 12:08:20 +05:30
Vishal Pandey
8897dbf9fe [ticket/11515] Inverted Logic
Inverted the logic to raise exception inside if.

PHPBB3-11515
2017-05-14 11:47:48 +05:30
Tristan Darricau
52dd4895c8 Merge branch '3.2.x'
* 3.2.x:
  [ticket/15226] Add index for latest topics to topics table
2017-05-12 17:27:06 +02:00
Tristan Darricau
60d1e49e43 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/15226] Add index for latest topics to topics table
2017-05-12 17:27:01 +02:00
Marc Alexander
18b29ca074 [ticket/15226] Add index for latest topics to topics table
PHPBB3-15226
2017-05-11 18:30:51 +02:00
Marc Alexander
8fd78e607d Merge branch 'ticket/15219' into ticket/15219-rhea 2017-05-05 21:26:07 -04:00
Marc Alexander
7034986427 [ticket/15219] Add missing space
PHPBB3-15219
2017-05-05 21:25:29 -04:00
Marc Alexander
710a943b00 Merge branch 'ticket/15219' into ticket/15219-rhea 2017-05-05 21:08:13 -04:00
Marc Alexander
18fe3b2833 [ticket/15219] Update hashes to bcrypt with cron
PHPBB3-15219
2017-05-05 20:52:21 -04:00
Marc Alexander
d8e11c7983 Merge branch '3.2.x' 2017-04-30 20:36:15 -04:00
javiexin
1e8f467964 [ticket/15202] To disable, an extension must be enabled
PHPBB3-15202
2017-04-28 23:47:51 +02:00
rxu
3114e5399c [ticket/15200] Allow extensions using custom templates for help/faq controllers
PHPBB3-15200
2017-04-27 21:14:43 +07:00
Tristan Darricau
1f9a269d78 [ticket/11150] Makes the customisation db lync dynamic
PHPBB3-11150
2017-04-23 21:09:59 +02:00
Tristan Darricau
5376f676bf [ticket/11150] Handle composer context transparently
PHPBB3-11150
2017-04-23 21:01:16 +02:00
Tristan Darricau
69571f9cef [ticket/11150] Fix comments
PHPBB3-11150
2017-04-23 21:01:15 +02:00
Tristan Darricau
d59b26dcec [ticket/11150] Add comments + ignore invaid repositories URLs
PHPBB3-11150
2017-04-23 21:01:15 +02:00
Tristan Darricau
fbf11d61aa [ticket/11150] Updates deps + fix various issues
PHPBB3-11150
2017-04-23 21:01:14 +02:00
Tristan Darricau
ed32ab89ad [ticket/11150] Removes outdated TODO
PHPBB3-11150
2017-04-23 21:01:14 +02:00
Tristan Darricau
4599799fba [ticket/11150] Improves requirements check
PHPBB3-11150
2017-04-23 21:01:14 +02:00
Tristan Darricau
1703b678d0 [ticket/11150] Skip invalid extensions, not the whole list
PHPBB3-11150
2017-04-23 21:01:13 +02:00
Tristan Darricau
5f4aa4f416 [ticket/11150] Uses PHPBB_VERSION, not the composer.json one
PHPBB3-11150
2017-04-23 21:01:13 +02:00
Tristan Darricau
fad379813f [ticket/11150] Always display an error message
PHPBB3-11150
2017-04-23 21:01:13 +02:00
Tristan Darricau
f6eb17048a [ticket/11150] Initialize the errors array in the translate trait
PHPBB3-11150
2017-04-23 21:01:13 +02:00