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

23356 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
Nils Adermann
d4faeb064b Merge pull request #3039 from nickvergessen/ticket/13138 
[ticket/13138] Only use cookie data when we do not force a user_id
 2014-10-20 14:49:29 -04: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
57a575b5f0 Merge pull request #3046 from Elsensee/ticket/13187 
[ticket/13187] Fix HTML validity of INSTALL.html
 2014-10-20 16:28:44 +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
009d59335f Merge pull request #2960 from prototech/ticket/12568 
[ticket/12568] Update user docs
 2014-10-20 15:21:00 +02:00
Joas Schilling
ec5729a99f Merge pull request #3045 from Elsensee/ticket/13186 
[ticket/13186] Don't show link on post count when search disabled
 2014-10-20 14:23:46 +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
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
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 Goel
c6272fca07 Merge pull request #3042 from naderman/ticket/13181 
[ticket/13181] Replace database credentials with placeholders in sphinx conf
 2014-10-19 01:28:36 +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
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
Joas Schilling
dec6c7ea8c [ticket/13138] Type hint the variables for IDE usage 
PHPBB3-13138
 2014-10-17 14:53:56 +02:00
Joas Schilling
f847a1a567 [ticket/13138] Fix the session key tests 
PHPBB3-13138
 2014-10-17 14:50:14 +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
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
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
Joas Schilling
e7e016637b [ticket/13138] Do not use cookie data and autologin while forcing a user_id 
PHPBB3-13138
 2014-10-16 12:32:48 +02:00
Joas Schilling
e1af6584d9 Merge pull request #3038 from prototech/ticket/12530 
[ticket/12530] Move style and class to parent <a>.
 2014-10-15 21:15:08 +02:00
Cesar G
23a513baec [ticket/12530] Move style and class to parent <a>. 
PHPBB3-12530
 2014-10-15 10:35:13 -07:00
Joas Schilling
b343bf783a Merge pull request #3037 from PayBas/ticket/13169 
[ticket/13169] Fix RTL forms in responsive mode
 2014-10-15 18:56:11 +02:00
Joas Schilling
8be701db0a Merge pull request #2938 from PayBas/ticket/12530 
[ticket/12530] Fix captcha challange image breaking responsive layout
 2014-10-15 18:47:45 +02:00
Joas Schilling
90771c1762 Merge pull request #3024 from marc1706/ticket/13124 
[ticket/13124] Also trim spaces in front of comments except for first line
 2014-10-15 18:31:46 +02:00
Joas Schilling
759950c1a6 Merge pull request #3036 from prototech/ticket/13177 
[ticket/13177] Fix display of post count-based ranks in viewtopic.
 2014-10-15 18:29:23 +02:00
PayBas
205be67622 [ticket/13169] Fix RTL forms in responsive mode 
PHPBB3-13169
 2014-10-15 17:08:11 +02:00
PayBas
1a128f9a76 [ticket/12796] Use dedicated lang vars 
PHPBB3-12796
 2014-10-15 16:07:01 +02:00
PayBas
223ae1dfc2 [ticket/13163] Check for images 
PHPBB3-13163
 2014-10-15 13:06:54 +02:00
PayBas
965894a875 [ticket/12530] Combine logo and TOS link into one 
PHPBB3-12530
 2014-10-15 12:08:55 +02:00
Cesar G
5c54e96aab [ticket/13177] Fix display of post count-based ranks in viewtopic. 
PHPBB3-13177
 2014-10-14 15:24:57 -07:00
Cesar G
df75b70f3e Merge remote-tracking branch 'PayBas/ticket/13174' into develop-ascraeus 
* PayBas/ticket/13174:
  [ticket/13174] Add missing closing </div> to ucp_pm_viewmessage
 2014-10-14 07:32:54 -07:00
PayBas
4bdae294cb [ticket/12796] Use &amp; in path 
PHPBB3-12796
 2014-10-14 12:58:07 +02:00
PayBas
253c6e1fc1 [ticket/12796] Add view own profile to UCP (and vice versa) 
PHPBB3-12796
 2014-10-14 10:59:03 +02:00
PayBas
9c4ba813d4 [ticket/13174] Add missing closing </div> to ucp_pm_viewmessage 
PHPBB3-13174
 2014-10-14 10:08:48 +02:00
PayBas
41d660dd98 [ticket/13163] Terminate timely when no data-last links exist 
PHPBB3-13163
 2014-10-14 00:05:22 +02:00
PayBas
36d1f87c5a [ticket/13163] Fix responsive link lists 
PHPBB3-13163
 2014-10-13 23:29:01 +02:00