1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 20:45:29 +02:00

3293 Commits

Author SHA1 Message Date
Marc Alexander
1d40c0f43b
[ticket/14733] Support increasing hashing cost factor
PHPBB3-14733
2016-10-03 22:09:07 +02:00
Marc Alexander
40354f1f90
Merge pull request #27 from phpbb/ticket/security-196
[ticket/security-196] Escapes the exception messages before displaying them
2016-10-02 22:25:30 +01:00
Marc Alexander
71e632b9f0
[prep-release-3.1.10] Add 3.1.10 migration 2016-10-02 21:07:18 +01:00
Tristan Darricau
7a5fbd0257
[ticket/14807] Updates Twig
PHPBB3-14807
2016-10-02 19:24:45 +02:00
Marc Alexander
89f3e5d29e
Merge branch '3.2.x' 2016-10-01 11:07:46 +01:00
Marc Alexander
57fc321c4d
Merge branch '3.1.x' into 3.2.x 2016-10-01 11:07:43 +01:00
Marc Alexander
f1eda6868f
Merge pull request #4465 from Senky/ticket/8301
[ticket/8301] Add log_time index
2016-10-01 11:07:40 +01:00
Marc Alexander
0b1d7cc53f
Merge branch '3.2.x' 2016-09-30 21:49:41 +01:00
rxu
5b32019ad6 [ticket/14799] Remove accidentally added whitespaces into 3.2.x and master
PHPBB3-14799
2016-10-01 02:59:17 +07:00
Tristan Darricau
ab84605991
Merge branch '3.2.x'
* 3.2.x:
  [ticket/14799] purge_notifications() should not leave open transactions.
2016-09-28 20:58:39 +02:00
Tristan Darricau
737ef92a1e
Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14799] purge_notifications() should not leave open transactions.
2016-09-28 20:56:51 +02:00
markshawtoronto
06c980f1ec [ticket/14799] purge_notifications() should not leave open transactions.
When running purge_notifications(), if a notification type does not exist
then a db transaction is started but never completed.

On an error in get_notification_type_id(), end the transaction.

PHPBB3-14799
2016-09-27 11:45:23 -04:00
Jakub Senko
ec24f739e8 [ticket/8301] Add log_time index
PHPBB3-8301
2016-09-25 19:51:37 +02:00
Tristan Darricau
a713f5159a
Merge branch '3.2.x'
* 3.2.x:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
2016-09-25 17:19:18 +02:00
Tristan Darricau
de2c70127f
Merge pull request #4265 from Senky/ticket/10809
[ticket/10809] Remove MSSQL support

* Senky/ticket/10809:
  [ticket/10809] Reflect MSSQL removal in docs files
  [ticket/10809] Remove MSSQL support
2016-09-25 17:19:13 +02:00
Marc Alexander
e2431502d1
Merge branch '3.2.x' 2016-09-24 21:45:36 +02:00
Marc Alexander
164f0e031d
Merge branch '3.1.x' into 3.2.x 2016-09-24 21:45:17 +02:00
Marc Alexander
c958ba13e8
[prep-release-3.1.10] Add migration for 3.1.10-RC1 2016-09-24 14:50:46 +02:00
Marc Alexander
62e288bc90
Merge branch '3.2.x' 2016-09-24 11:50:20 +02:00
Marc Alexander
713f25e552
Merge branch '3.1.x' into 3.2.x 2016-09-24 11:50:17 +02:00
Forumhulp.com
97040dc6ff
[ticket/14796] Use log_table class member instead of table constant
Was still using the old LOG_TABLE constant in the delete method.

PHPBB3-14796
2016-09-24 10:19:12 +02:00
Marc Alexander
8b17274d7f
Merge branch '3.2.x' 2016-09-24 10:04:38 +02:00
Marc Alexander
e02dc7a9c1
Merge branch '3.1.x' into 3.2.x 2016-09-24 10:03:58 +02:00
Marc Alexander
931582aad9
Merge pull request #4432 from Senky/ticket/14762
[ticket/14762] Add core event to session.php
2016-09-24 10:02:41 +02:00
Marc Alexander
bbb1ff325b
Merge branch '3.2.x' 2016-09-23 20:55:24 +02:00
rxu
35c62d1e74 [ticket/14793] Fix "A non-numeric value encountered" PHP warning on PHP 7.1+
PHPBB3-14793
2016-09-22 22:29:18 +07:00
Jakub Senko
abb01946bd [ticket/14762] Add core event to session.php
PHPBB3-14762
2016-09-18 13:32:10 +02:00
Marc Alexander
d21d2bca87
Merge branch '3.2.x' 2016-09-17 08:54:08 +02:00
Marc Alexander
aa95636a4d
Merge branch '3.1.x' into 3.2.x 2016-09-17 08:54:04 +02:00
Marc Alexander
bd59241110
Merge pull request #4406 from rmcgirr83/ticket/14581
[ticket/14581] Add core events to content_visibility
2016-09-17 08:54:00 +02:00
Marc Alexander
ca7fdf4e5b
Merge branch '3.2.x' 2016-09-17 00:05:13 +02:00
Marc Alexander
2dbc9e1016
Merge branch '3.1.x' into 3.2.x 2016-09-17 00:05:09 +02:00
DavidIQ
2ae08dc3ba [ticket/14782] Don't use 'DISTINCT' when using 'SQL_CALC_FOUND_ROWS' 2016-09-16 17:05:20 -04:00
Andreas Fischer
4c54237e3e Merge branch '3.2.x'
* 3.2.x:
  [ticket/14782] Use the $select variable in "Your Posts" search
2016-09-15 19:30:55 +02:00
Andreas Fischer
271e8b43f9 Merge branch '3.1.x' into 3.2.x
* 3.1.x:
  [ticket/14782] Use the $select variable in "Your Posts" search
2016-09-15 19:30:44 +02:00
DavidIQ
6d589a8bb9 [ticket/14782] Use the $select variable in "Your Posts" search 2016-09-13 14:10:50 -04:00
Tristan Darricau
b8260cadf0
[ticket/14769] Fix CLI installer configuration compatibility with SF 3
PHPBB3-14769
2016-09-11 13:41:33 +02:00
Marc Alexander
66e481c501 Merge branch '3.2.x' 2016-09-06 21:50:28 +02:00
Marc Alexander
051323dbc6 Merge branch '3.1.x' into 3.2.x 2016-09-06 21:50:25 +02:00
Marc Alexander
2efdaaa0e2 Merge pull request #4426 from bantu/ticket/14109
[ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.…
2016-09-06 21:50:22 +02:00
Tristan Darricau
e6be2e558f
Merge branch '3.2.x'
* 3.2.x:
  [ticket/10961] Send HTTP 403 when applicable
2016-09-01 14:54:06 +02:00
Tristan Darricau
0c91160856
Merge pull request #4412 from Senky/ticket/14573
[ticket/14573] Extend breadcrumb to support more pages

* Senky/ticket/14573:
  [ticket/14573] Add Whoisonline breadcrumbs
  [ticket/14573] Add Memberlist breadcrumbs
  [ticket/14573] Add MCP breadcrumbs
  [ticket/14573] Add UCP breadcrumbs
  [ticket/14573] Add Search breadcrumbs
  [ticket/14573] Add FAQ breadcrumbs
2016-09-01 14:50:15 +02:00
Jakub Senko
4b6c2c8cde [ticket/10961] Send HTTP 403 when applicable
PHPBB3-10961
2016-09-01 08:48:37 +02:00
Marc Alexander
7a9f8ddee9 Merge branch '3.2.x' 2016-08-31 21:42:15 +02:00
Marc Alexander
dff950162c Merge branch '3.1.x' into 3.2.x
Conflicts:
	phpBB/phpbb/db/migration/tool/module.php
2016-08-31 21:41:17 +02:00
Marc Alexander
f008708d5c Merge pull request #4377 from rxu/ticket/14703
[ticket/14703] Fix parent module selection for custom extension modules
2016-08-31 21:39:09 +02:00
Andreas Fischer
3ee5472a8c [ticket/14109] Increase MySQL Version for InnoDB FULLTEXT Index to 5.6.8.
This is required for proper overall database operation. In previous versions,
InnoDB might error on ALTER statements when multiple FULLTEXT Indexes are
 defined.

PHPBB3-14109
2016-08-28 20:40:10 +01:00
Marc Alexander
e740552bfb Merge branch '3.2.x' 2016-08-28 00:12:57 +02:00
Marc Alexander
08c6f56f4b Merge branch '3.1.x' into 3.2.x 2016-08-28 00:12:53 +02:00
Marc Alexander
863d65112b Merge pull request #3659 from Elsensee/ticket/12230
[ticket/12230] Disable newly registered group when post limit is set to 0
2016-08-28 00:12:43 +02:00