Commit graph

10537 commits

Author SHA1 Message Date
Wardormeur
e6d3ed5529 [ticket/14213] Mv event group_add_user_after after cache cleaning
In order to match with the rest of the event and to have appropriate info state

PHPBB3-14213
2015-12-07 22:35:08 +01:00
Wardormeur
ffbc2d02d7 [ticket/14213] Fix version number
for core.group_add_user_after event

PHPBB3-14213
2015-12-07 22:35:04 +01:00
Wardormeur
2419f63aab [ticket/14213] Adding missing reference to event dispatcher
Required to dispatch event, wasn't included into global

PHPBB3-14213
2015-12-07 22:34:59 +01:00
Wardormeur
20e26a3920 [ticket/14213] Adding event after users have been added to a group
Allow mapping with others CMS by exposing user configuration & changes

PHPBB3-14213
2015-12-07 22:34:25 +01:00
Tristan Darricau
f14a9b7069 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14261] Fix tests by removing old code.
  [ticket/14261] Move the update of session informations to page_footer()
2015-12-07 21:52:38 +01:00
Tristan Darricau
4989df66a2 Merge pull request #4008 from Zoddo/ticket/14261
[ticket/14261] Move the update of session informations to page_footer()

* Zoddo/ticket/14261:
  [ticket/14261] Fix tests by removing old code.
  [ticket/14261] Move the update of session informations to page_footer()
2015-12-07 21:52:17 +01:00
Tristan Darricau
434a04344e Merge branch '3.1.x'
* 3.1.x:
  [ticket/14343] Add event when locking/unlocking posts/topics
2015-12-07 21:06:39 +01:00
kasimi
94c073672d [ticket/14343] Add event when locking/unlocking posts/topics
PHPBB3-14343
2015-12-06 20:05:27 +01:00
Marc Alexander
7705017f63 [ticket/14272] Make sure phpbb_avatar_manager was defined
PHPBB3-14272
2015-12-03 11:58:53 +01:00
Mate Bartus
fad26c97bc [ticket/14325] Fix variable names in docblocks
PHPBB3-14325
2015-11-30 18:27:06 +01:00
Mate Bartus
065b0a632f [ticket/14325] Preserve event variable BC
PHPBB3-14325
2015-11-30 18:05:46 +01:00
Tristan Darricau
8a3288e3aa [master] Update version to 3.2.0-a2-dev 2015-11-23 23:20:04 +01:00
Tristan Darricau
3698e9b8e0 Merge branch 'prep-release-3.2.0-a1'
* prep-release-3.2.0-a1:
  [prep-release-3.2.0-a1] Add changelog for 3.2.0-a1
  [prep-release-3.2.0-a1] Add migration for 3.2.0-a1
  [prep-release-3.2.0-a1] Update version to 3.2.0-a1
2015-11-23 23:17:01 +01:00
Marc Alexander
77f447c07c Merge branch '3.1.x' 2015-11-12 08:50:22 +01:00
Marc Alexander
8398e0700a Merge pull request #3910 from kinerity/ticket/14170
[ticket/14170] Fix mcp_change_poster_after event
2015-11-12 08:50:18 +01:00
Marc Alexander
87446452f5 Merge branch '3.1.x' 2015-11-12 08:46:09 +01:00
Tristan Darricau
f8236cc907 [prep-release-3.2.0-a1] Update version to 3.2.0-a1 2015-11-09 20:20:26 +01:00
Marc Alexander
c99386e155 [ticket/14272] Remove useless check
PHPBB3-14272
2015-11-08 13:11:16 +01:00
Richard McGirr
865c16cf26 [ticket/14276] Adjust function get_folder_status
PHPBB3-14276
2015-11-07 15:33:24 -05:00
Oliver Schramm
fbb9f8859a Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_captcha.php
2015-11-06 13:28:24 +01:00
Oliver Schramm
854ee0b04d Merge pull request #3975 from prototech/ticket/11971
[ticket/11971] Validate "Spambot countermeasures" settings before saving
2015-11-06 12:06:47 +01:00
Marc Alexander
685449bfe3 [ticket/14272] Fix invalid or missing min/max settings
PHPBB3-14272
2015-11-06 10:31:56 +01:00
Marc Alexander
be5a40f6a9 [ticket/14272] Assign min/max for all allowed types
PHPBB3-14272
2015-11-06 10:25:31 +01:00
Marc Alexander
aca6e64669 [ticket/14272] Only use maxlength and size for allowed input elements
PHPBB3-14272
2015-11-06 10:20:05 +01:00
Tristan Darricau
c783c37c73 Merge pull request #3995 from CHItA/ticket/14044
[ticket/14044] Deduplicate the installers

* CHItA/ticket/14044:
  [ticket/14044] Add config as global in notify user
  [ticket/14044] Fix language selection data loss
  [ticket/14044] Patch language::set_fallback_array()
  [ticket/14044] Fix tests
  [ticket/14044] Fix wrong descriptions in install
  [ticket/14044] Solve missing email template error
  [ticket/14044] global $table_prefix in constants.php
  [ticket/14044] Try to fix missing table prefix
  [ticket/14044] Use the correct language file version
  [ticket/14044] Automatically trigger rollback on insert in transaction
  [ticket/14044] Use empty instead of !count
  [ticket/14044] Fix Sqlite error in tests
  [ticket/14044] Deduplicate the installers
2015-11-03 20:35:24 +01:00
Andreas Fischer
996886de17 Merge branch '3.1.x'
* 3.1.x:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
2015-11-02 21:48:32 +01:00
Andreas Fischer
afbeda7cfd Merge pull request #3983 from prototech/ticket/13831
[ticket/13831] Store provided reason when deleting from Mod. Queue module.

* prototech/ticket/13831:
  [ticket/13831] Store provided reason when deleting from Mod. Queue module.
2015-11-02 21:48:32 +01:00
Mate Bartus
33db26d0cf [ticket/14044] global $table_prefix in constants.php
PHPBB3-14044
2015-10-28 01:12:52 +01:00
Zoddo
88dd8a4849 [ticket/14261] Move the update of session informations to page_footer()
Currently, the unique way to disable the update of session_page is to pass
"false" to the parameter of session_begin(). This method is directly
called in app.php, so pages served from the routing system can't disable
the update of session informations.

By moving the update to page_footer, we can allow controllers to tell to
the session manager that we don't want to update the session infos.

PHPBB3-14261
2015-10-27 17:26:18 +01:00
Mate Bartus
597297b169 [ticket/14044] Deduplicate the installers
PHPBB3-14044
2015-10-22 21:29:52 +02:00
Cesar G
a246cb6414 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14249] Fix online list order
2015-10-22 10:05:25 -07:00
Oliver Schramm
93208d597a [ticket/14249] Fix online list order
PHPBB3-14249
2015-10-21 21:51:43 +02:00
Tristan Darricau
326ba5325b Merge branch '3.1.x'
* 3.1.x:
  [ticket/9252] Do not try to disapprove a post that was just approved
2015-10-19 14:37:06 +02:00
Tristan Darricau
dfd5ec6835 Merge pull request #3666 from marc1706/ticket/9252
[ticket/9252] Do not try to disapprove a post that was just approved

* marc1706/ticket/9252:
  [ticket/9252] Do not try to disapprove a post that was just approved
2015-10-19 14:36:51 +02:00
Marc Alexander
3f4abbd5ce Merge branch '3.1.x' 2015-10-17 12:02:14 +02:00
Cesar G
c7d7967a91 [ticket/13945] Send reactivation requests to admins using notifications system.
PHPBB3-13945
2015-10-15 22:26:14 -07:00
Marc Alexander
2974353101 Merge branch '3.1.x' 2015-10-15 11:02:02 +02:00
Cesar G
e634d2902d [ticket/12616] Remove report notifications when post is deleted/disapproved.
PHPBB3-12616
2015-10-14 22:50:50 -07:00
Cesar G
f657680311 [ticket/13831] Store provided reason when deleting from Mod. Queue module.
PHPBB3-13831
2015-10-14 19:41:44 -07:00
Tristan Darricau
886fb7c3f4 Merge branch '3.1.x'
* 3.1.x:
  [ticket/14159] Hide version info on ACP if we don't have the permission
2015-10-14 16:56:44 +02:00
Tristan Darricau
240d07d0cf Merge pull request #3900 from Zoddo/ticket/14159
[ticket/14159] Hide version info on ACP if we don't have the permission

* Zoddo/ticket/14159:
  [ticket/14159] Hide version info on ACP if we don't have the permission
2015-10-14 16:40:06 +02:00
Tristan Darricau
e94f9d7830 Merge branch '3.1.x'
* 3.1.x:
  [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
2015-10-14 16:25:15 +02:00
Marc Alexander
bf72a27c5f [ticket/10572] Remove excessive new line
PHPBB3-10572
2015-10-14 15:50:15 +02:00
Cesar G
5d8e900483 [ticket/11971] Validate "Spambot countermeasures" settings before saving.
PHPBB3-11971
2015-10-14 03:31:34 -07:00
Cesar G
fb3073029f [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
The u_sendpm check in ucp_pm.php is merely for the purpose of displaying the
error message within the UCP template. Otherwise it could be removed as
compose_pm() will check the appropriate permission pertaining to the attempted
action.

PHPBB3-9153
2015-10-14 03:09:06 -07:00
Tristan Darricau
e0fb680dbb Merge branch '3.1.x'
* 3.1.x:
  [ticket/10572] Unguarded includes in acp files
2015-10-14 10:17:04 +02:00
Tristan Darricau
1d6e173259 Merge pull request #3965 from marc1706/ticket/14234
[ticket/14234] Use replacement variables instead of references in events

* marc1706/ticket/14234:
  [ticket/14234] Fix event doc blocks
  [ticket/14234] Get rid of undefined variables
  [ticket/14234] Fix change version and remove more references
  [ticket/14234] Replace more references with variables
  [ticket/14234] Use replacement variables instead of references in events
2015-10-14 08:59:17 +02:00
Tristan Darricau
cac090b659 Merge pull request #3913 from marc1706/ticket/14168
[ticket/14168] Refactor attachment management functions into classes

* marc1706/ticket/14168: (36 commits)
  [ticket/14168] Correctly state return type of upload and upload_attachment
  [ticket/14168] Use attachment manager instead of separate classes
  [ticket/14168] Fix docblock in manager
  [ticket/14168] Add more test cases for attachment manager
  [ticket/14168] Add new test method and more tests
  [ticket/14168] Fix tabs in manager and add test file
  [ticket/14168] Fix tests after rebase
  [ticket/14168] Add attachment manager service
  [ticket/14168] Use correct docblock
  [ticket/14168] Add services_attachment.yml to services.yml
  [ticket/14168] Minor coding style fixes
  [ticket/14168] Move attachment service definitions to services_attachment
  [ticket/14168] Improve code coverage in upload class
  [ticket/14168] Move image check and don't use trigger_error()
  [ticket/14168] Add tests for init_error() during upload
  [ticket/14168] Add basic test file for attachments upload
  [ticket/14168] Fix CS issue
  [ticket/14168] No longer use deprecated functions in core files
  [ticket/14168] Move phpbb_unlink() into attachment delete class
  [ticket/14168] Reset sequence before tests in delete tests
  ...
2015-10-14 08:40:01 +02:00
Kailey Truscott
08739751b2 [ticket/14170] Revert mcp_change_poster_after @since change
Revert the @since change back to 3.1.6-RC1.
Add @changed line 3.1.7-RC1 and description.

PHPBB3-14170
2015-10-13 21:26:24 -04:00
Richard McGirr
d003b53922 [ticket/10572] Unguarded includes in acp files
PHPBB3-10572
2015-10-13 11:52:52 -04:00