1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 20:44:01 +01:00

25123 Commits

Author SHA1 Message Date
Marc Alexander
1c1fe43e16 Merge pull request #3930 from rxu/ticket/14201
[ticket/14201] Add multiple ACP template events
2015-11-10 17:40:04 +01:00
Marc Alexander
966c34d0ad [ticket/14271] Properly use try_files in nginx sample config
PHPBB3-14271
2015-11-10 08:32:51 +01:00
Marc Alexander
b27be0b857 [ticket/14271] Improve try_files and use split path info
PHPBB3-14271
2015-11-09 09:26:05 +01:00
Richard McGirr
865c16cf26 [ticket/14276] Adjust function get_folder_status
PHPBB3-14276
2015-11-07 15:33:24 -05: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
27e95864a8 [ticket/14271] Update sample config
PHPBB3-14271
2015-11-05 16:55:19 +01:00
Marc Alexander
8dbf3976fd Merge pull request #4012 from RMcGirr83/ticket_14228
[ticket/14228] Vertical align of numbers in polls
2015-11-03 09:36:14 +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
Richard McGirr
22d234a345 [ticket/14228] Vertical align of numbers in polls
PHPBB3-14228
2015-11-01 05:39:07 -05:00
RMcGirr83
21aa6cc120 [ticket/14242] Revert some changes
PHPBB3-14242
2015-10-30 13:09:55 -04:00
Zoddo
fbacd1df16 [ticket/14261] Fix tests by removing old code.
This will obselete GH-4007

PHPBB3-14261
PHPBB3-13202
2015-10-28 12:32:24 +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
Richard McGirr
c1d47d9e16 [ticket/14242] Fix u_sort_posts to use correct sort key
PHPBB3-14242
2015-10-26 06:42:33 -04:00
Marc Alexander
6a7567459d Merge pull request #4004 from paul999/ticket/14258
[ticket/14258] Add event into auth::login before session creation
2015-10-24 18:23:49 +02:00
Paul Sohier
9596db9b88 [ticket/14258] Add event into auth::login before session creation
Fix typo

PHPBB3-14258
2015-10-24 18:00:55 +02:00
Paul Sohier
2a218c2959 [ticket/14258] Add event into auth::login before session creation
Update comments regarding variables.

PHPBB3-14258
2015-10-24 17:47:04 +02:00
Paul Sohier
7615a5c22f [ticket/14258] Add event into auth::login before session creation
Add a new event in the login method just before the session create,
so extensions can do some additional validation during login.

PHPBB3-14258
2015-10-24 14:28:29 +02:00
Cesar G
5576c9f3b9 Merge pull request #3998 from Elsensee/ticket/14249
[ticket/14249] Fix online list order
2015-10-22 10:05:01 -07:00
Oliver Schramm
93208d597a [ticket/14249] Fix online list order
PHPBB3-14249
2015-10-21 21:51:43 +02:00
Máté Bartus
fa44e98e72 Merge pull request #3997 from CHItA/ticket/13976
[ticket/13976] Fix comment typo in salted_md5.php
2015-10-21 00:29:05 +02:00
Sumanai
6b433eab4c [ticket/13976] Fix comment typo in salted_md5.php
PHPBB3-13976
2015-10-21 00:22:42 +02:00
RMcGirr83
b23c0f1442 [ticket/14242] Fix memberlist sort method
PHPBB3-14242
2015-10-19 09:53:43 -04:00
Tristan Darricau
a6fd55db35 Merge pull request #3647 from marc1706/ticket/13799
[ticket/13799] Do not rawurlencode category in gallery avatar

* marc1706/ticket/13799:
  [ticket/13799] Split lines in HTML files for better readability
  [ticket/13799] Add missing space before checked attribute
  [ticket/13799] Correctly urlencode category and show selected avatar
  [ticket/13799] Do not rawurlencode category in gallery avatar
2015-10-19 14:39:14 +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
9ccb596a06 Merge pull request #3993 from DavidIQ/ticket/10343
[ticket/10343] Show clearer indication an account is inactive in memberlist
2015-10-18 10:32:41 +02:00
DavidIQ
da9a5c70d5 [ticket/10343] Add inactive indicator to subsilver2 memberlist
PHPBB3-10343
2015-10-17 18:39:14 -04:00
DavidIQ
9a8393c912 [ticket/10343] Show clearer indication an account is inactive in memberlist
PHPBB3-10343
2015-10-17 18:38:53 -04:00
Marc Alexander
3a5336452c Merge pull request #3985 from prototech/ticket/13892
[ticket/13892] Respect "Someone reports a post" notification setting.
2015-10-17 12:06:27 +02:00
Marc Alexander
6fba5613f8 Merge pull request #3987 from prototech/ticket/13945
[ticket/13945] Send reactivation requests to admins using notifications system.
2015-10-17 12:02:10 +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
Cesar G
aaca64e13e [ticket/13892] Replace other uses of self with static.
PHPBB3-13892
2015-10-15 02:39:55 -07:00
Cesar G
9de5668b80 [ticket/13892] Respect "Someone reports a post" notification setting.
report_post inherits from post_in_queue, therefore using self:: instead of
static:: results in the incorrect notification type being used to determine
which users to exclude from the notification.

PHPBB3-13892
2015-10-15 02:28:55 -07:00
Marc Alexander
bc6a4c4583 Merge pull request #3984 from prototech/ticket/12616
[ticket/12616] Remove report notifications when post is deleted/disapproved.
2015-10-15 11:01:59 +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
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
f6776c1017 Merge pull request #3926 from Senky/ticket/14192
[ticket/14192] Add core.memberlist_memberrow_before event

* Senky/ticket/14192:
  [ticket/14192] Add core.memberlist_memberrow_before event
2015-10-14 16:35:24 +02:00
Tristan Darricau
bab85da820 Merge pull request #3935 from Zoddo/ticket/10343
[ticket/10343] Allows a_user to show inactive accounts in memberlist

* Zoddo/ticket/10343:
  [ticket/10343] Add a distinction for inactive users on memberlist
  [ticket/10343] Allows a_user to show inactive accounts in memberlist
2015-10-14 16:32:33 +02:00
Tristan Darricau
bc11e648af Merge pull request #3978 from RMcGirr83/ticket_13851
[ticket/13851] Fix ignore flood limit check

* RMcGirr83/ticket_13851:
  [ticket/13851] Fix ignore flood limit check
2015-10-14 16:26:54 +02:00
Tristan Darricau
669618b5a0 Merge pull request #3979 from prototech/ticket/9153
[ticket/9153] Allow users without u_sendpm permission to delete existing PM's

* prototech/ticket/9153:
  [ticket/9153] Allow users without u_sendpm permission to delete existing PM's.
2015-10-14 16:25:08 +02:00
Cesar G
50bf3411d4 Merge pull request #3959 from marc1706/ticket/13684
[ticket/13684] Prevent horizontal resize of attach comment textarea
2015-10-14 04:28:34 -07:00
Richard McGirr
a49a3091f9 [ticket/13851] Fix ignore flood limit check
PHPBB3-13851
2015-10-14 07:25:35 -04: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
Marc Alexander
3367f0036a Merge pull request #3977 from Nicofuma/ticket/14236
[ticket/14236] Don't dump Opcache config in Travis
2015-10-14 12:04:12 +02:00
Tristan Darricau
69b57eab5e [ticket/14236] Don't dump Opcache config in Travis
PHPBB3-14236
2015-10-14 11:46:47 +02:00
Marc Alexander
6bcec956ba [ticket/13684] Prevent horizontal resize of attach comment textarea
PHPBB3-13684
2015-10-14 11:13:15 +02:00
Marc Alexander
ccb3d0ac78 Merge pull request #3973 from Nicofuma/ticket/14236
[ticket/14236] Disable Opcache on Travis when running the tests
2015-10-14 10:41:06 +02:00
Tristan Darricau
6572164754 Merge pull request #3542 from RMcGirr83/ticket/10572
[ticket/10572] Unguarded includes in acp files

* RMcGirr83/ticket/10572:
  [ticket/10572] Unguarded includes in acp files
2015-10-14 10:09:36 +02:00
Tristan Darricau
345e8ad822 [ticket/14236] Disable Opcache on Travis when running the tests
PHPBB3-14236
2015-10-14 09:45:11 +02:00