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,208 Commits 17 Branches 190 Tags
Commit Graph

27208 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
d7109fb130 Merge pull request #3947 from marc1706/ticket/14199 
[ticket/14199] Correctly resolve merge conflicts
 2015-10-07 14:41:30 +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
Wardormeur
bf0596d0a1 [ticket/14212] Fix version number 
for core.group_delete_user_after event

PHPBB-14212
 2015-10-06 08:54:48 +02:00
Tristan Darricau
617df4aa0e Merge pull request #3945 from marc1706/ticket/14216 
[ticket/14216] Do not run thumbnail test if gd is disabled

* marc1706/ticket/14216:
  [ticket/14216] Do not run thumbnail test if gd is disabled
 2015-10-04 22:28:13 +02:00
Marc Alexander
664119ec6b [ticket/14216] Do not run thumbnail test if gd is disabled 
PHPBB3-14216
 2015-10-04 21:15:46 +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
Wardormeur
a11d97cb36 [ticket/14212] Adding event after users have been removed to a group 
The idea is to be able to map with others CMS by exposing most commons user configuration & changes.
Difference between the event before and after group belonging removal is that
users belongs to multiple groups, so that the belonging into a group also
depends on the others groups (and not only the deleted one), which is not
reflected before as the user is not yet deleted

PHPBB-14212
 2015-10-04 19:33:54 +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
Marc Alexander
8451272d69 Merge pull request #3933 from hanakin/ticket/14202 
[ticket/14202]Add missing sr-only classes
 2015-10-01 13:48:45 +02:00
Marc Alexander
c35c9a9d9c Merge pull request #3941 from hanakin/ticket/14195 
[ticket/14195]Fix pupload & polls hiding
 2015-10-01 11:42:54 +02:00
Michael Miday
f74743fb65 [ticket/14195]Revert hidden class 
PHPBB3-14195
 2015-09-28 22:06:43 +02:00
Michael Miday
0244be6d75 [ticket/14202]Remove blank line 
PHPBB3-14202
 2015-09-28 18:24:38 +02:00
Michael Miday
d50801a056 [ticket/14202]Add missing sr-only classes 
PHPBB3-14202
 2015-09-28 18:24:24 +02:00
Michael Miday
7806a2f1fd [ticket/14206]Fix button UI 
PHPBB3-14206
 2015-09-28 17:55:27 +02:00
Michael Miday
a19660ad4c [ticket/14206]Fix arrow placement 
PHPBB3-14206
 2015-09-28 17:54:26 +02:00
Zoddo
0947bda39d [ticket/10343] Allows a_user to show inactive accounts in memberlist 
PHPBB3-10343
 2015-09-27 17:55:49 +02:00
HB
66397ae0e4 [ticket/14181] Fix empty denial reason if the reason isn't translated 
PHPBB3-14181
 2015-09-27 17:23:49 +02:00
Zoddo
43d9657130 [ticket/13101] Remove MSN/WLM custom profile field from new installs 
PHPBB3-13101
 2015-09-27 12:55:57 +02:00