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

25565 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tristan Darricau
dc32b900c5 Merge pull request #4486 from marc1706/ticket/11483 
[ticket/11483] Generate user act key if database entry is empty

* github.com:phpbb/phpbb:
  [ticket/11483] Add tests for generating user act key on force reactivate
  [ticket/11483] Generate user act key if database entry is empty
 2016-11-06 15:41:46 +01:00
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
85898d3d2c
Merge pull request #4489 from rxu/ticket/14830 
[ticket/14830] Fix FORM_INVALID error during some ACP setting operations
 2016-10-28 19:36:49 +02:00
Marc Alexander
466bdee8e6 [ticket/14823] Move check_form_key() inside actual save data step 
PHPBB3-14823
 2016-10-28 21:37:00 +07:00
Tristan Darricau
e3a85ff0a7
Merge pull request #4487 from gmixo/patch-2 
[ticket/14818] Optimize generate_board_url function

* gmixo/patch-2:
  [ticket/14818] Optimize generate_board_url function
 2016-10-24 23:08:06 +02:00
Tristan Darricau
163292bc11
Merge pull request #4491 from rxu/ticket/14831 
[ticket/14831] Fix extension modules installation issues

* rxu/ticket/14831:
  [ticket/14831] Optimize code construction
  [ticket/14831] Add more tests against UCP modules
  [ticket/14831] Add more tests, better name for $e placeholder
  [ticket/14831] Do not throw exception on the module existence checking
  [ticket/14831] Fix module migrator tool
 2016-10-24 22:24:23 +02:00
rxu
a41b16d06a [ticket/14830] Fix FORM_INVALID error on cpf settings changing 
PHPBB3-14830
 2016-10-24 23:22:00 +07:00
Marc Alexander
cac8ac8242
Merge pull request #4477 from rxu/ticket/14808 
[ticket/14808] Add template event overall_header_searchbox_after
 2016-10-24 18:21:14 +02:00
rxu
cefbd39b82 [ticket/14830] Fix tests 
PHPBB3-14830
 2016-10-24 01:54:40 +07:00
rxu
77f1bac64b [ticket/14831] Optimize code construction 
PHPBB3-14831
 2016-10-24 01:41:24 +07:00
rxu
849cd74700 [ticket/14831] Add more tests against UCP modules 
PHPBB3-14831
 2016-10-23 23:33:03 +07:00
rxu
51ef1ae346 [ticket/14831] Add more tests, better name for $e placeholder 
PHPBB3-14831
 2016-10-23 22:44:47 +07:00
rxu
a02b124dd0 [ticket/14831] Do not throw exception on the module existence checking 
PHPBB3-14831
 2016-10-23 21:58:29 +07:00
Marc Alexander
3cb09358fe
Merge pull request #4490 from kasimi/ticket/14827 
[ticket/14827] Fix adding multiple form keys
 2016-10-23 11:48:53 +02:00
rxu
0cc0920734 [ticket/14831] Fix module migrator tool 
PHPBB3-14831
 2016-10-23 00:57:37 +07:00
rxu
8afa9fdf28 [ticket/14830] Fix FORM_INVALID error during AСP search index deletion 
PHPBB3-14830
 2016-10-21 01:23:45 +07:00
rxu
244ff0f969 [ticket/14830] Fix ACP search control functional tests 
PHPBB3-14830
 2016-10-21 01:23:45 +07:00
rxu
eca10dc08f [ticket/14830] Fix FORM_INVALID error on search backend changing 
PHPBB3-14830
 2016-10-21 01:23:44 +07:00
rxu
8e54c9ef8b [ticket/14830] Fix link hash checking case 
PHPBB3-14830
 2016-10-21 01:23:43 +07:00
rxu
832a87b924 [ticket/14830] Fix FORM_INVALID error during AXP search index creation/deletion 
PHPBB3-14830
 2016-10-21 01:23:43 +07:00
Máté Bartus
05d0879795 Merge pull request #4482 from marc1706/ticket/14821 
[ticket/14821] Replace escaped strong tags with actual tags
 2016-10-20 18:33:48 +02:00
kasimi
f02afe58bc
[ticket/14827] Possibility to add multiple form keys 
PHPBB3-14827
 2016-10-19 22:42:52 +02:00
Marc Alexander
d98a1c4bc4
[ticket/14821] Simplify regex for converting <strong> tags back to HTML 
PHPBB3-14821
 2016-10-18 22:07:54 +02:00
MIkhail Gulyaev
868d55913d [ticket/14818] Optimize generate_board_url function 
if $config['force_server_vars'] no need to calculate $request
 2016-10-17 12:54:08 +07: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
1f0c616974
[ticket/14821] Replace escaped strong tags with actual tags 
Everything else will still be escaped. This will however add back support for
bold text in exception messages.

PHPBB3-14821
 2016-10-14 22:47:43 +02:00
Marc Alexander
1dd0ceabf6
Merge branch 'prep-release-3.1.10' into 3.1.x 2016-10-12 21:40:59 +02:00
rxu
98a6133c1e [ticket/14808] Add template event overall_header_searchbox_after 
PHPBB3-14808
 2016-10-04 16:58:51 +07: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