mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 13:04:24 +01:00
Code Issues Releases Wiki Activity
27,061 Commits 17 Branches 190 Tags
Commit Graph

27061 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marc Alexander
8c3fdfe4e1 Merge branch '3.1.x' 2015-10-11 10:48:53 +02:00
Marc Alexander
f6c8338358 Merge pull request #3864 from Zoddo/ticket/8920 
[ticket/8920] Add a MCP PM reports view permission
 2015-10-11 10:47:44 +02:00
Marc Alexander
f6f796770a Merge pull request #3903 from Zoddo/ticket/13101 
[ticket/13101] Remove MSN/WLM custom profile field
 2015-10-10 20:52:52 +02:00
Marc Alexander
d1b7101fed Merge pull request #3896 from Zoddo/ticket/14157 
[ticket/14157] Allow to set the alt/title attribute on post icons
 2015-10-10 16:43:15 +02:00
Zoddo
3937f1f4ae [ticket/14157] Allow to set the alt/title attribute on post icons 
PHPBB3-14157
 2015-10-10 15:29:31 +02:00
Zoddo
21201aa1ab [ticket/13101] Remove existing MSN/WLM custom profile field 
PHPBB3-13101
 2015-10-10 15:24:22 +02:00
Marc Alexander
6ebadee5d0 Merge branch '3.1.x' 2015-10-09 16:51:35 +02:00
Marc Alexander
def21f27a2 Merge pull request #3893 from VSEphpbb/ticket/14155 
[ticket/14155] Row highlighting for extension/styles management

Conflicts:
	phpBB/adm/style/acp_ext_list.html
 2015-10-09 16:51:00 +02:00
Marc Alexander
b2e7de0379 Merge branch '3.1.x' 2015-10-09 16:45:07 +02:00
Marc Alexander
8683824ed3 Merge pull request #3934 from Zoddo/ticket/14181 
[ticket/14181] Fix empty denial reason if the reason isn't translated
 2015-10-09 16:43:53 +02:00
Marc Alexander
c664bbdf9c Merge pull request #3912 from hanakin/ticket/14175 
[ticket/14175] Refactor responsive implementation for easier manipulation
 2015-10-09 15:51:31 +02:00
Tristan Darricau
415a9daa6a Merge branch '3.1.x' 
* 3.1.x:
  [ticket/8800] Add "mark topics read" link to "View unread posts"
 2015-10-09 11:00:39 +02:00
Tristan Darricau
b04b5dea36 Merge pull request #3869 from Zoddo/ticket/8800 
[ticket/8800] Add "mark topics read" link to "View unread posts"

* Zoddo/ticket/8800:
  [ticket/8800] Add "mark topics read" link to "View unread posts"
 2015-10-09 11:00:09 +02:00
Michael Miday
4c1f7e1134 [ticket/14175]Remove styles in 700 for lastpost 
PHPBB3-14175
 2015-10-09 06:40:08 +02:00
Michael Miday
b671aae1ec [ticket/14175]Remove "only screen and" 
PHPBB3-14175
 2015-10-09 06:40:08 +02:00
Michael Miday
ab3af7984a [ticket/14175]Include responsive.css same as rest 
PHPBB3-14175
 2015-10-09 06:40:08 +02:00
Michael Miday
bb9bfec624 [ticket/14175]Remove max-device width 
PHPBB3-14175
 2015-10-09 06:40:08 +02:00
Michael Miday
6a17cc5560 [ticket/14175] Fix online overlap issues 
PHPBB3-14175
 2015-10-09 06:40:08 +02:00
Michael Miday
8062c2a18a [ticket/14175] Refactor the file 
PHPBB3-14175
 2015-10-09 06:40:07 +02:00
Máté Bartus
73fd3d1df8 Merge pull request #3955 from Nicofuma/ticket/14225 
[ticket/14225] Inject the loader resolver when using the delegating loader
 2015-10-08 23:23:57 +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
Marc Alexander
a0dafbfb5f Merge pull request #3953 from rxu/ticket/14073-fix-whitespaces 
[ticket/14073] Fix trailing whitespaces
 2015-10-08 17:21:51 +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
Tristan Darricau
fdc9c06209 Merge pull request #3950 from marc1706/ticket/14222 
[ticket/14222] Use request class instead of request_var in acp_users

* marc1706/ticket/14222:
  [ticket/14222] Use request class instead of request_var in acp_users
 2015-10-08 10:59:01 +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