makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 22:08:54 +00:00
Code Issues Projects Releases Packages Wiki Activity
27044 commits 18 branches 192 tags 206 MiB
Commit graph

22985 commits

Author SHA1 Message Date
Marc Alexander
d1030450f5 [ticket/14168] Move function for attachment deletion into class 
PHPBB3-14168
 2015-10-09 09:53:05 +02:00
Marc Alexander
16d5208d9a [ticket/14168] Use attachment upload class in message_parser 
PHPBB3-14168
 2015-10-09 09:46:11 +02:00
Marc Alexander
a60beb6f2f [ticket/14168] Further split up attachment upload class 
PHPBB3-14168
 2015-10-09 09:46:10 +02:00
Marc Alexander
e10aa45470 [ticket/14168] Further split up attachment upload class 
PHPBB3-14168
 2015-10-09 09:46:10 +02:00
Marc Alexander
6c1cd26b7a [ticket/14168] Split thumbnail creation to separate method 
PHPBB3-14168
 2015-10-09 09:46:10 +02:00
Marc Alexander
07c8e21e80 [ticket/14168] Use language class and fix incorrect docblock 
PHPBB3-14168
 2015-10-09 09:46:10 +02:00
Marc Alexander
e50718008a [ticket/14168] Add attachment upload class 
PHPBB3-14168
 2015-10-09 09:46:10 +02:00
Tristan Darricau
0799a4808d [ticket/14225] Inject the loader resolver when using the delegating loader 
PHPBB3-14225
 2015-10-08 23:19:09 +02:00
Marc Alexander
8f10212f38 Merge branch '3.1.x' 2015-10-08 17:21:57 +02:00
rxu
70b5ffc41d [ticket/14073] Fix trailing whitespaces 
PHPBB3-14073
 2015-10-08 22:19:44 +07:00
Marc Alexander
0af9ee869d Merge branch '3.1.x' 2015-10-08 17:08:21 +02:00
Marc Alexander
e63ef0b28f Merge pull request #3814 from rxu/ticket/14073 
[ticket/14073] Add several core events to the functions_admin.php
 2015-10-08 17:08:15 +02:00
Marc Alexander
5f117bcb5e Merge branch '3.1.x' 2015-10-08 16:53:14 +02:00
Marc Alexander
6360d748db Merge pull request #3844 from rxu/ticket/14113 
[ticket/14113] Add core events for customizing members search
 2015-10-08 16:53:08 +02:00
rxu
e5b895de7b [ticket/14113] Add core events for customizing members search 
Add core events to the memberlist.php for customizing members search.

PHPBB3-14113
 2015-10-08 20:57:10 +07:00
rxu
3469cdce76 [ticket/14073] Add several core events to the functions_admin.php 
Add core events to the functions move_posts(), delete_posts(),
delete_attachments().

PHPBB3-14073
 2015-10-08 20:53:54 +07:00
Tristan Darricau
0c0e43e110 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/14219] Add email to inactive user listing
 2015-10-08 15:49:45 +02:00
Tristan Darricau
7a60cdd1d3 Merge pull request #3951 from RMcGirr83/ticket_14219 
[ticket/14219] Add email to inactive user listing

* RMcGirr83/ticket_14219:
  [ticket/14219] Add email to inactive user listing
 2015-10-08 15:49:39 +02:00
Tristan Darricau
73f9e7936a Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13934] Add enctype clause for profile fields
 2015-10-08 15:45:46 +02:00
Tristan Darricau
5b7b0894e0 Merge pull request #3733 from javiexin/ticket/13934 
[ticket/13934] Add enctype clause for profile fields

* javiexin/ticket/13934:
  [ticket/13934] Add enctype clause for profile fields
 2015-10-08 15:45:34 +02:00
Tristan Darricau
6e90311550 Merge branch '3.1.x' 
* 3.1.x:
  [ticket/13960] Profile field validation breaks ACP
 2015-10-08 15:42:55 +02:00
Tristan Darricau
542498e457 Merge pull request #3724 from javiexin/ticket/13960 
[ticket/13960] Profile field validation breaks ACP

* javiexin/ticket/13960:
  [ticket/13960] Profile field validation breaks ACP
 2015-10-08 15:42:33 +02:00
Marc Alexander
4f356661c5 Merge branch '3.1.x' 2015-10-08 15:11:35 +02:00
Marc Alexander
c38a128663 Merge pull request #3824 from rxu/ticket/14088 
[ticket/14088] Add more core events to the search.php
 2015-10-08 15:11:12 +02:00
Máté Bartus
ce2caf248c Merge pull request #3948 from Nicofuma/ticket/14220 
[ticket/14220] Move route loading to services
 2015-10-08 14:55:23 +02:00
Marc Alexander
a0ba6b7dc6 Merge branch '3.1.x' 
Conflicts:
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/subsilver2/template/viewforum_body.html
 2015-10-08 14:44:58 +02:00
Marc Alexander
c05a27396d Merge pull request #3820 from rxu/ticket/14080 
[ticket/14080] Add template events around the topic row in viewforum_body.html
 2015-10-08 14:43:12 +02:00
Tristan Darricau
403c647b9e [ticket/14220] Move route loading to services 
PHPBB3-14220
 2015-10-08 14:15:44 +02:00
Richard McGirr
4830b3eacd [ticket/14219] Add email to inactive user listing 
in ACP.  May help in spotting spam accounts quickly

PHPBB3-14219
 2015-10-08 06:10:49 -04:00
Marc Alexander
82743c7922 Merge pull request #3949 from hanakin/ticket/14221 
[ticket/14221]Fix the header
 2015-10-08 12:02:56 +02:00
Marc Alexander
a679380f09 [ticket/14222] Use request class instead of request_var in acp_users 
PHPBB3-14222
 2015-10-08 10:52:00 +02:00
Michael Miday
78babc09fc [ticket/14221]Fix the header 
PHPBB3-14221
 2015-10-08 08:08:10 +02:00
Marc Alexander
b13393078c Merge branch '3.1.x' 
Conflicts:
	phpBB/includes/acp/acp_users.php
 2015-10-07 16:55:57 +02:00
Marc Alexander
cf62b303a6 Merge pull request #3440 from CHItA/ticket/13636 
[ticket/13636] Deleting inactive user in acp_users gives unexpected link
 2015-10-07 16:54:50 +02:00
Marc Alexander
f3ea34b311 Merge branch '3.1.x' 2015-10-07 16:50:43 +02:00
Marc Alexander
e5b2dc922f Merge pull request #3615 from rxu/ticket/13846 
[ticket/13846] Fix softdelete feature workflow in viewtopic
 2015-10-07 16:50:35 +02:00
Marc Alexander
3c448f889f Merge pull request #3871 from Zoddo/ticket/10165 
[ticket/10165] Add a "Send test email" feature
 2015-10-07 15:08:08 +02:00
Marc Alexander
da4d6dfa28 Merge pull request #3857 from Nicofuma/ticket/14124 
[ticket/14124] Automatically translate exceptions in CLI
 2015-10-07 14:47:23 +02:00
Marc Alexander
5e2ccb2dd7 [ticket/14199] Correctly resolve merge conflicts 
PHPBB3-14199
 2015-10-07 14:38:26 +02:00
Marc Alexander
ebb3169d56 Merge branch '3.1.x' 2015-10-07 14:18:50 +02:00
Marc Alexander
3fd1fa5492 Merge pull request #3716 from javiexin/ticket/13748 
[ticket/13748] Wrong tooltip after poll vote change
 2015-10-07 14:11:16 +02:00
Marc Alexander
64641f9b1f Merge pull request #3904 from Zoddo/ticket/14162 
[ticket/14162] Add CLI commands to manage migrations
 2015-10-07 14:03:02 +02:00
Marc Alexander
f68d5a59e6 Merge pull request #3927 from hanakin/ticket/14199 
[ticket/14199] Fix screen reader compatability

Conflicts:
	phpBB/styles/prosilver/template/mcp_topic.html
	phpBB/styles/prosilver/template/overall_header.html
	phpBB/styles/prosilver/template/pagination.html
	phpBB/styles/prosilver/template/posting_buttons.html
	phpBB/styles/prosilver/template/posting_topic_review.html
	phpBB/styles/prosilver/template/search_results.html
	phpBB/styles/prosilver/template/ucp_pm_history.html
	phpBB/styles/prosilver/template/ucp_pm_message_header.html
	phpBB/styles/prosilver/template/ucp_pm_viewmessage.html
	phpBB/styles/prosilver/template/viewforum_body.html
	phpBB/styles/prosilver/template/viewtopic_body.html
	phpBB/styles/prosilver/template/viewtopic_topic_tools.html
 2015-10-07 12:05:38 +02:00
Marc Alexander
2695950a61 Merge pull request #3940 from hanakin/ticket/14206 
[Ticket/14206]Fix jumpbox UI consistency
 2015-10-07 11:52:08 +02:00
Marc Alexander
7bda33b525 Merge pull request #3932 from hanakin/ticket/14193 
[ticket/14193]Fix secondary buttons
 2015-10-07 11:48:56 +02:00
Marc Alexander
4437d0c794 Merge pull request #3939 from Nicofuma/ticket/14205 
[ticket/14205] Bump PHP requirement to PHP 5.4
 2015-10-04 20:27:43 +02:00
Tristan Darricau
f3dc2a801d [ticket/14205] Bump PHP requirement to PHP 5.4 
PHPBB3-14205
 2015-10-04 16:19:48 +02:00
Michael Miday
8907a66156 [ticket/14193]Minor cleanups 
PHPBB3-14193
 2015-10-03 05:16:08 +02:00
Michael Miday
6b7fa249f1 [ticket/14193]Fix posting buttons 
PHPBB3-14193
 2015-10-03 05:15:16 +02:00
Michael Miday
9da14c9b24 [ticket/14199]Add aria-hidden to all icons 
PHPBB3-14199
 2015-10-01 20:21:38 +02:00