makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-24 20:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity
29713 commits 18 branches 192 tags 207 MiB
Commit graph

25179 commits

Author SHA1 Message Date
Nils Adermann
b7386c0c82 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13189] Do not use confirm box for marking all notifications read
 2014-10-21 09:49:42 -04:00
Nils Adermann
1358acfd7c Merge pull request #3049 from marc1706/ticket/13189 
[ticket/13189] Do not use confirm box for marking all notifications read
 2014-10-21 09:49:16 -04:00
Marc Alexander
75c5d6085b Merge branch 'develop-ascraeus' into develop 2014-10-20 22:44:47 -05:00
Cesar G
b9b15b7007 [ticket/13070] Adjust template hook name to match that provided in the class. 
PHPBB3-13070
 2014-10-20 19:59:56 -07:00
Marc Alexander
293d64e122 [ticket/13189] Do not use confirm box for marking all notifications read 
We already use a token for preventing CSRF when marking notifications read.
Making a user confirm the marking read action serves no real purpose. No
information will be lost by just marking the notifications read but it will
prevent users from always having to confirm this action.

PHPBB3-13189
 2014-10-20 21:55:36 -05:00
Andreas Fischer
a16f185413 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
 2014-10-20 23:20:43 +02:00
Andreas Fischer
b71cf56bda Merge pull request #3047 from Elsensee/ticket/13168 
[ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility

* Elsensee/ticket/13168:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
 2014-10-20 23:20:42 +02:00
Andreas Fischer
afada9ed40 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility
 2014-10-20 23:20:42 +02:00
Joas Schilling
7c2ed57a99 Merge branch 'develop-ascraeus' into develop 2014-10-20 22:19:43 +02:00
Joas Schilling
75b6545bc2 Merge pull request #3040 from nickvergessen/ticket/13138-asc 
[3.1] Ticket/13138 Only use cookie data when we do not force a user_id

Conflicts:
	phpBB/phpbb/session.php
 2014-10-20 22:19:25 +02:00
Nils Adermann
79d6f67e81 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13188] Correctly format string concatenation
  [ticket/13188] Add missing where clause to post_id query in sphinx index
 2014-10-20 15:31:06 -04:00
Nils Adermann
973dfbf868 Merge pull request #3048 from naderman/ticket/13188 
[ticket/13188] Add missing where clause to post_id query in sphinx index
 2014-10-20 15:30:08 -04:00
Nils Adermann
ee97b92e5d Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id
 2014-10-20 14:53:52 -04:00
Nils Adermann
99f63f39eb Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/13138] Do not use cookie data and autologin while forcing a user_id

Conflicts:
	phpBB/phpbb/session.php
 2014-10-20 14:53:38 -04:00
Tristan Darricau
981d3005f3 [ticket/13126] Fix tests 
PHPBB3-13126
 2014-10-20 20:46:11 +02:00
Tristan Darricau
faf4b03c43 [ticket/13126] Change messages verbosity levels 
PHPBB3-13126
 2014-10-20 19:42:54 +02:00
Tristan Darricau
8f6fcd2744 [ticket/13126] Move migrator_output_handler to an interface 
PHPBB3-13126
 2014-10-20 19:41:32 +02:00
Nils Adermann
941cf6979e [ticket/13188] Correctly format string concatenation 
PHPBB3-13188
 2014-10-20 12:20:44 -04:00
Nils Adermann
566c8a1bbc [ticket/13188] Add missing where clause to post_id query in sphinx index 
PHPBB3-13188
 2014-10-20 12:08:35 -04:00
Oliver Schramm
53f166274a [ticket/13168] Fix mbstring warnings in ACP for PHP 5.6 compatibility 
PHPBB3-13168
 2014-10-20 16:47:52 +02:00
Joas Schilling
ac29211f91 Merge branch 'develop-ascraeus' into develop 2014-10-20 16:28:59 +02:00
Oliver Schramm
51044167d1 [ticket/13187] Fix HTML validity of INSTALL.html 
PHPBB3-13187
 2014-10-20 15:36:27 +02:00
Joas Schilling
9c6b3d3931 Merge branch 'develop-ascraeus' into develop 2014-10-20 15:21:11 +02:00
Joas Schilling
009d59335f Merge pull request #2960 from prototech/ticket/12568 
[ticket/12568] Update user docs
 2014-10-20 15:21:00 +02:00
Joas Schilling
c08563b6a8 Merge branch 'develop-ascraeus' into develop 2014-10-20 14:24:15 +02:00
Oliver Schramm
86c472f4f7 [ticket/13186] Don't show link on post count when search disabled 
PHPBB3-13186
 2014-10-20 13:25:07 +02:00
Oliver Schramm
30213816ae [ticket/13100] Display only confirmation buttons when deleting shadow topic 
PHPBB3-13100
 2014-10-20 00:24:16 +02:00
Marc Alexander
c6d65b051c Merge branch 'develop-ascraeus' into develop 2014-10-18 21:47:36 -04:00
Marc Alexander
c939f1b2c7 Merge pull request #3030 from Senky/ticket/13164 
[ticket/13164] data sent to core.submit_post_end event does not include fresh post_visibility
 2014-10-18 21:47:15 -04:00
Marc Alexander
6216771ac0 Merge branch 'develop-ascraeus' into develop 2014-10-18 18:00:38 -04:00
Marc Alexander
b3421e397d Merge pull request #3041 from nickvergessen/ticket/13171 
[ticket/13171] Check the correct (soft)delete permission when deleting in MCP
 2014-10-18 17:59:48 -04:00
Dhruv
1bb3d6b410 Merge branch 'develop-ascraeus' into develop 
# By Nils Adermann
# Via Dhruv Goel (1) and Nils Adermann (1)
* develop-ascraeus:
  [ticket/13181] Replace database credentials with placeholders in sphinx conf
 2014-10-19 01:30:26 +05:30
Nils Adermann
e7ad87e15f [ticket/13181] Replace database credentials with placeholders in sphinx conf 
PHPBB3-13181
 2014-10-18 12:32:39 -04:00
Mario Skouat
737894027a [ticket/13041] Added multiple changes 
- Improper english in some sentences.
- Improper use of singular/plural in some sentences
- Replace "the board administrator" by "a board administrator"
- Update the category "Posting Issues" and "Subscriptions and Bookmarks"

PHPBB3-13041
 2014-10-18 13:28:18 +02:00
Oliver Schramm
f049fcd604 [ticket/11863] Display warning to user because of activation method 
PHPBB3-11863
 2014-10-17 15:42:11 +02:00
Oliver Schramm
01df1d3301 [ticket/11863] Grey out unavailable activation methods when emails disabled 
Further fall back to USER_ACTIVATION_DISABLE when emails are disabled
but evaluate it at runtime.

PHPBB3-11863
 2014-10-17 15:40:03 +02:00
Joas Schilling
66342f5b89 [ticket/13171] Check the correct (soft)delete permission when deleting in MCP 
PHPBB3-13171
 2014-10-17 15:39:20 +02:00
Cesar G
6763de2f25 [ticket/12568] Fix awkward use of "phpBB Limited." 
PHPBB3-12568
 2014-10-16 20:37:26 -07:00
Cesar G
09b6add6ee [ticket/12568] The "Purge cache" option in the Customise tab no longer exists. 
PHPBB3-12568
 2014-10-16 20:33:24 -07:00
Cesar G
810d249ca2 [ticket/12568] Update GitHub link. 
PHPBB3-12568
 2014-10-16 20:20:15 -07:00
Cesar G
29ea1c85b4 [ticket/12568] Fix typo - "directorie" -> "directories" 
PHPBB3-12568
 2014-10-16 20:18:52 -07:00
Cesar G
f19a6b9714 [ticket/12568] Remove various unnecessary references to phpBB3. 
PHPBB3-12568
 2014-10-16 20:17:01 -07:00
Cesar G
d06c2cf0f7 [ticket/12568] Update style installation instructions. 
PHPBB3-12568
 2014-10-16 19:47:02 -07:00
Cesar G
7e08109229 [ticket/12568] Update path to language pack installation page. 
PHPBB3-12568
 2014-10-16 19:47:02 -07:00
Cesar G
defd36ad7f [ticket/12568] Replace modifications explanation with extensions. 
PHPBB3-12568
 2014-10-16 19:47:02 -07:00
Cesar G
b22650d323 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12796] Use dedicated lang vars
  [ticket/12796] Use & in path
  [ticket/12796] Add view own profile to UCP (and vice versa)
 2014-10-16 19:32:28 -07:00
Cesar G
39e51e5599 Merge remote-tracking branch 'PayBas/ticket/12796' into develop-ascraeus 
* PayBas/ticket/12796:
  [ticket/12796] Use dedicated lang vars
  [ticket/12796] Use & in path
  [ticket/12796] Add view own profile to UCP (and vice versa)
 2014-10-16 19:32:11 -07:00
Cesar G
1dbc5fc092 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/13163] Check for images
  [ticket/13163] Terminate timely when no data-last links exist
  [ticket/13163] Fix responsive link lists
 2014-10-16 19:20:17 -07:00
Cesar G
6768490f69 Merge remote-tracking branch 'PayBas/ticket/13163' into develop-ascraeus 
* PayBas/ticket/13163:
  [ticket/13163] Check for images
  [ticket/13163] Terminate timely when no data-last links exist
  [ticket/13163] Fix responsive link lists
 2014-10-16 19:19:53 -07:00
Joas Schilling
55b97ffc27 Merge branch 'ticket/13138-2' into ticket/13138-asc 
Conflicts:
	phpBB/phpbb/session.php
 2014-10-16 12:48:13 +02:00