mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-03-23 00:50:30 +01:00
Code Issues Releases Wiki Activity
25,540 Commits 18 Branches 191 Tags
Commit Graph

25540 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
ac36cc25eb
[ticket/11483] Add tests for generating user act key on force reactivate 
PHPBB3-11483
 2016-11-06 11:58:31 +01:00
Marc Alexander
20148e4d06
[ticket/11483] Generate user act key if database entry is empty 
The force reactivation action in the ACP will no longer overwrite the
generated activation key in case the key stored in the database is empty.
It will also save the generated key back to the database to actually allow
the activation by the user.

PHPBB3-11483
 2016-10-16 11:16:06 +02:00
Marc Alexander
1dd0ceabf6
Merge branch 'prep-release-3.1.10' into 3.1.x 2016-10-12 21:40:59 +02:00
Tristan Darricau
1ad64f89b8
Merge pull request #4471 from dsinn/ticket/14802 
[ticket/14802] Empty/blank lines should not be additional poll options

* dsinn/ticket/14802:
  [ticket/14802] Add test for empty/blank lines in poll options
  [ticket/14802] Empty/blank lines should not be additional poll options
 2016-10-03 20:05:49 +02:00
Daniel Sinn
bf8ee698f9 [ticket/14802] Add test for empty/blank lines in poll options 
PHPBB3-14802
 2016-10-03 12:24:02 -04:00
Marc Alexander
40354f1f90
Merge pull request #27 from phpbb/ticket/security-196 
[ticket/security-196] Escapes the exception messages before displaying them
release-3.1.10 		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
Marc Alexander
cb226f83be
[prep-release-3.1.10] Update version numbers for 3.1.10 2016-10-02 21:06:56 +01:00
Tristan Darricau
85e4566223
Merge pull request #4467 from Senky/ticket/14786 
[ticket/14786] Add mcp_forum_actions_before/after events

* Senky/ticket/14786:
  [ticket/14786] Add mcp_forum_actions_before/after events
 2016-10-02 18:11:48 +02:00
Tristan Darricau
55a0570567
Merge pull request #4469 from rxu/ticket/14787-2 
[ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters

* rxu/ticket/14787-2:
  [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters
 2016-10-02 18:08:09 +02:00
Tristan Darricau
b4e673acc1
Merge pull request #4470 from rxu/ticket/14801 
[ticket/14801] Highlighting utf8 strings in search results

* rxu/ticket/14801:
  [ticket/14801] Highlighting utf8 strings in search results
 2016-10-02 17:43:55 +02:00
Tristan Darricau
cd4190a72d
Merge pull request #4474 from marc1706/ticket/14789 
[ticket/14789] Move form key checks to where they actually do something

* marc1706/ticket/14789:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:22 +02:00
Tristan Darricau
6b798d02fb
Merge branch 'prep-release-3.1.10' into 3.1.x 
* prep-release-3.1.10:
  [ticket/14789] Remove obsolete check_form_key() and add missing hashes
  [ticket/14789] Move form key checks to where they actually do something
 2016-10-02 17:18:22 +02:00
Tristan Darricau
cdaed8dabf
Merge pull request #4475 from marc1706/ticket/14805 
[ticket/14805] Ignore platform requirements while building packages

* marc1706/ticket/14805:
  [ticket/14805] Ignore platform requirements while building packages
  [ticket/8301] Add log_time index
 2016-10-02 17:14:49 +02:00
Tristan Darricau
165e0edb2a
Merge branch 'prep-release-3.1.10' into 3.1.x 
* prep-release-3.1.10:
  [ticket/14805] Ignore platform requirements while building packages
 2016-10-02 17:14:49 +02:00
Marc Alexander
5a6933fee7
Merge pull request #4466 from Senky/ticket/14795 
[ticket/14795] Merge topic views when merging topics
 2016-10-01 16:58:02 +01:00
Marc Alexander
047c7375a5
[ticket/14805] Ignore platform requirements while building packages 
PHPBB3-14805
 2016-10-01 16:46:48 +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
4e5f29a21b
[ticket/14789] Remove obsolete check_form_key() and add missing hashes 
PHPBB3-14789
 2016-09-30 23:26:04 +01:00
Marc Alexander
88d7c4fe57
[ticket/14789] Move form key checks to where they actually do something 
PHPBB3-14789
 2016-09-30 22:32:54 +01:00
Daniel Sinn
0b3951cb81 [ticket/14802] Empty/blank lines should not be additional poll options 
PHPBB3-14802
 2016-09-29 14:43:36 -04:00
rxu
ae76bfc99e [ticket/14801] Highlighting utf8 strings in search results 
PHPBB3-14801
 2016-09-29 17:18:58 +07:00
rxu
cc62b68243 [ticket/14787] Add 1 more parameter to the core.search_modify_url_parameters 
PHPBB3-14787
 2016-09-29 01:59:16 +07:00
Tristan Darricau
6972d06f59
Merge branch 'prep-release-3.1.10' into 3.1.x 
* prep-release-3.1.10:
  [ticket/14799] purge_notifications() should not leave open transactions.
 2016-09-28 20:53:10 +02:00
Tristan Darricau
2fd2fb94cf
Merge pull request #4468 from markshawtoronto/ticket/14799 
[ticket/14799] purge_notifications() should not leave open transactions.

* markshawtoronto/ticket/14799:
  [ticket/14799] purge_notifications() should not leave open transactions.
  [3.1.x] Increase version for 3.1.11 development
 2016-09-28 20:50:06 +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
f66ca6a9cc [ticket/14786] Add mcp_forum_actions_before/after events 
PHPBB3-14786
 2016-09-26 11:13:11 +02:00
Jakub Senko
ec24f739e8 [ticket/8301] Add log_time index 
PHPBB3-8301
 2016-09-25 19:51:37 +02:00
Jakub Senko
c588332aa5 [ticket/14795] Merge topic views when merging topics 
PHPBB3-14795
 2016-09-25 19:49:01 +02:00
Marc Alexander
51d830a6d3
[3.1.x] Increase version for 3.1.11 development 2016-09-24 21:39:47 +02:00
Marc Alexander
32d9efff47
Merge branch 'prep-release-3.1.10' into 3.1.x 2016-09-24 21:35:42 +02:00
Marc Alexander
7d73d1ff83
[prep-release-3.1.10] Add changelog for 3.1.10-RC1 release-3.1.10-RC1 2016-09-24 14:57:23 +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
2f17757f4e
[prep-release-3.1.10] Update version to 3.1.10-RC1 2016-09-24 14:50:46 +02:00
Marc Alexander
b8bbf9db03
Merge pull request #4461 from marc1706/ticket/14785 
[ticket/14785] Add template event overall_header_headerbar_after/before
 2016-09-24 13:04:21 +02:00
Marc Alexander
4267cc3a43
Merge pull request #4462 from marc1706/ticket/14796 
[ticket/14796] Use log_table class member instead of table constant
 2016-09-24 11:50:15 +02:00
GerB
90e9d5c462
[ticket/14785] Add template event overall_header_headerbar_after/before 
PHPBB3-14785
 2016-09-24 11:04:23 +02:00
Tristan Darricau
cdd56c0505
Merge pull request #4394 from marc1706/ticket/14484 
[ticket/14484] Add possibility to use extensions in UI tests

* marc1706/ticket/14484:
  [ticket/14484] Properly enable extensions in UI tests
  [ticket/14484] Move facebook/webdriver back to tests dir composer.json
  [ticket/14484] Move facebook webdriver to main composer.json
 2016-09-24 10:31:06 +02:00
Marc Alexander
18f9c9f6e2
Merge pull request #3527 from Elsensee/ticket/13709 
[ticket/13709] Add fallback for email templates used by extensions
 2016-09-24 10:28:37 +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
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
3910387ee5
Merge pull request #4433 from Senky/ticket/14747 
[ticket/14747] Add post_data to core.modify_posting_auth
 2016-09-24 09:56:25 +02:00
Marc Alexander
d2f95ef875
Merge pull request #4460 from marc1706/ticket/14784 
[ticket/14784] missing rewrite for lighttpd
 2016-09-24 09:39:01 +02:00
Tobi Schäfer
537dca0892
[ticket/14784] missing rewrite for lighttpd 
PHPBB3-14784
 2016-09-24 08:21:27 +02:00
Marc Alexander
2436af94e3
Merge pull request #4392 from ErnadoO/PHPBB3-14592 
[ticket/14592] [PHP] core.search_backend_search_after
 2016-09-22 21:26:31 +02:00
Marc Alexander
75f57fa407
Merge pull request #4454 from rxu/tcket/14787-1 
[ticket/14787] Add more parameters to the core.search_modify_url_parameters
 2016-09-22 21:23:55 +02:00
rxu
a078336cb1 [ticket/14787] Add more parameters to the core.search_modify_url_parameters 
PHPBB3-14787
 2016-09-19 02:48:23 +07:00
Tristan Darricau
4da479d47f
Merge pull request #4450 from rxu/ticket/14787 
[ticket/14787] Add more parameters to the core.search_modify_url_pameters

* rxu/ticket/14787:
  [ticket/14787] Add more parameters to the core.search_modify_url_parameters
 2016-09-18 21:25:14 +02:00
Tristan Darricau
bc08813866
Merge pull request #4452 from marc1706/ticket/14789 
[ticket/14789] Further harden ACP link and form checks

* marc1706/ticket/14789:
  [ticket/14789] Add form tokens to tests and uncomment add_form_key
  [ticket/14789] Add link hashes and form tokens to all acp links/buttons
 2016-09-18 21:12:19 +02:00
Erwan Nader
6b435cbf13 [ticket/14592] Fix variable type 
PHPBB3-14592
 2016-09-18 19:55:00 +02:00