mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-05 05:55:15 +02:00
Code Issues Releases Wiki Activity
12,526 Commits 18 Branches 192 Tags
Commit Graph

12526 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Callum Macrae
784c9725f3 [ticket/10510] Made a couple improvements to phpbb_add_quickmod_option. 
PHPBB3-10510
 2012-03-17 18:06:45 +00:00
Callum Macrae
4f59990d90 [ticket/10510] Added phpbb_add_quickmod_option and moved existing to it. 
PHPBB3-10510
 2012-03-17 18:06:45 +00:00
Callum Macrae
c52e99fdbb [ticket/10510] Fixed a bug where quickmod tools weren't being displayed. 
It was referring to some template variables that were removed in a
previous commit. Changed!

PHPBB3-10510
 2012-03-17 18:06:45 +00:00
Callum Macrae
9a07f5287c [ticket/10510] Moved quick-mod tools into a loop. 
PHPBB3-10510
 2012-03-17 18:06:37 +00:00
Callum Macrae
2b0282cba7 [ticket/10510] Updated quick-mod conditional in subsilver2. 
It was still trying to use the old conditional, which was referring to a
variable which had been removed.

PHPBB3-10510
 2012-03-04 10:51:57 +00:00
callumacrae
c5de658c7f [ticket/10510] Moved quick-mod tools markup to template. 
PHPBB3-10510
 2012-03-04 10:51:46 +00:00
Andreas Fischer
d6a6d63a9e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
 2012-03-02 14:22:32 +01:00
Andreas Fischer
d67fae0f09 Merge branch 'ticket/bantu/8652' into develop-olympus 
* ticket/bantu/8652:
  [ticket/8652] Comment for also updating forum watch table in user_notification.
  [ticket/8652] Sending 2 emails on 2 replies
 2012-03-02 14:22:18 +01:00
Andreas Fischer
b74530259f [ticket/8652] Comment for also updating forum watch table in user_notification. 
PHPBB3-8652
 2012-03-02 14:20:29 +01:00
Bruno Ais
470b79c9e3 [ticket/8652] Sending 2 emails on 2 replies 
This is a fix for the problem of the system sending 2 emails when there are 2
replies to a topic where the user is subscribed in a topic and the forum that
contains the topic.
This simple fix seems to solve the problem. In simple tests I made it shows
it does.

PHPBB3-8652
 2012-03-02 11:08:56 +00:00
David King
331f1f9086 Merge remote-tracking branch 'unknownbliss/ticket/10680' into develop 2012-02-29 17:00:33 -05:00
Michael Cullum
864606feed [ticket/10680] Add /phpBB/ext/* to .gitignore 
PHPBB3-10680
 2012-02-29 21:55:22 +00:00
Andreas Fischer
89af42dfab Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10639] Do not allow negative post count as rank's minimum posts
 2012-02-28 22:29:03 +01:00
Andreas Fischer
2f95a67765 Merge remote-tracking branch 'nickvergessen/ticket/10639' into develop-olympus 
* nickvergessen/ticket/10639:
  [ticket/10639] Do not allow negative post count as rank's minimum posts
 2012-02-28 22:28:54 +01:00
Andreas Fischer
5ee1bcd2e4 Merge remote-tracking branch 'nickvergessen/ticket/10672' into develop 
* nickvergessen/ticket/10672:
  [ticket/10672] Fix total post count language string in statistics and feed
 2012-02-28 22:27:16 +01:00
Andreas Fischer
50d234b9af Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.

Conflicts:
	phpBB/styles/prosilver/template/memberlist_leaders.html
 2012-02-28 22:25:09 +01:00
Andreas Fischer
f6cf8782c8 Merge remote-tracking branch 'nickvergessen/ticket/9220' into develop-olympus 
* nickvergessen/ticket/9220:
  [ticket/9220] Remove margin on table.table1 so it's centered in the blue box.
 2012-02-28 22:23:38 +01:00
Joas Schilling
5924bc1d02 [ticket/10672] Fix total post count language string in statistics and feed 
PHPBB3-10672
 2012-02-27 19:13:31 +01:00
Joas Schilling
d3091da5ea [ticket/9220] Remove margin on table.table1 so it's centered in the blue box. 
The problem here was, that we use width: 100% in combination with the negative
margin. This causes the element to be just moved to the side, so it's not
centered anymore. width: auto would fix this, but it causes strange behaviour
on IE and looks even more ugly. So I decided to just remove the margin at all.
The border is now 1px thicker for all sides.

PHPBB3-9220
 2012-02-27 16:32:29 +01:00
Andreas Fischer
23e845d066 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10453] Fixing spacing
 2012-02-26 16:01:42 +01:00
Andreas Fischer
b2d589634a Merge remote-tracking branch 'cyberalien/ticket/10453' into develop-olympus 
* cyberalien/ticket/10453:
  [ticket/10453] Fixing spacing
 2012-02-26 16:01:33 +01:00
Vjacheslav Trushkin
d3d8793c1f [ticket/10453] Fixing spacing 
Fixing spacing

PHPBB3-10453
 2012-02-26 16:54:31 +02:00
Andreas Fischer
af23811c6d Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10532] Remove unnecessary parentheses around calculations of addition.
  [ticket/10532] Remove one unnecessary level of if block nesting.
  [ticket/10532] Get rid of inline calculation of $start, remove duplicated check
  [ticket/10532] Put $total_match_count assignment onto its own line.
  [ticket/10532] Adjust total match count and limit
  [ticket/10532] Fix $start out of range for pre-made searches

Conflicts:
	phpBB/search.php
 2012-02-26 15:47:16 +01:00
Andreas Fischer
8910ec98d7 Merge remote-tracking branch 'rxu/ticket/10532' into develop-olympus 
* rxu/ticket/10532:
  [ticket/10532] Remove unnecessary parentheses around calculations of addition.
  [ticket/10532] Remove one unnecessary level of if block nesting.
  [ticket/10532] Get rid of inline calculation of $start, remove duplicated check
  [ticket/10532] Put $total_match_count assignment onto its own line.
  [ticket/10532] Adjust total match count and limit
  [ticket/10532] Fix $start out of range for pre-made searches
 2012-02-26 15:44:58 +01:00
Andreas Fischer
7a061cfc6e [ticket/10532] Remove unnecessary parentheses around calculations of addition. 
PHPBB3-10532
 2012-02-26 02:30:44 +01:00
Andreas Fischer
6548a3094f [ticket/10532] Remove one unnecessary level of if block nesting. 
PHPBB3-10532
 2012-02-26 02:19:12 +01:00
Andreas Fischer
459e8dc095 [ticket/10532] Get rid of inline calculation of $start, remove duplicated check 
PHPBB3-10532
 2012-02-26 02:15:39 +01:00
Andreas Fischer
8f3fba8858 [ticket/10532] Put $total_match_count assignment onto its own line. 
PHPBB3-10532
 2012-02-26 01:58:17 +01:00
Andreas Fischer
2f91623392 Merge remote-tracking branch 'nickvergessen/ticket/10458' into develop 
* nickvergessen/ticket/10458:
  [ticket/10458] Fix xHTML errors when print-viewing PMs
 2012-02-25 20:34:23 +01:00
Andreas Fischer
ad3bbcf466 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10456] Add tabindex to subsilver2 captcha
 2012-02-25 20:26:29 +01:00
Andreas Fischer
20d3d279ce Merge remote-tracking branch 'nickvergessen/ticket/10456' into develop-olympus 
* nickvergessen/ticket/10456:
  [ticket/10456] Add tabindex to subsilver2 captcha
 2012-02-25 20:26:19 +01:00
Andreas Fischer
0c3fae0f18 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
  [ticket/10630] Perform array_unique on authors array before creating the query
 2012-02-25 19:58:03 +01:00
Andreas Fischer
825aef72e8 Merge remote-tracking branch 'nickvergessen/ticket/10630' into develop-olympus 
* nickvergessen/ticket/10630:
  [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%'
  [ticket/10630] Perform array_unique on authors array before creating the query
 2012-02-25 19:46:17 +01:00
Vjacheslav Trushkin
b9da8f3a33 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10453] PM viewmessage page is misplacing the online icon
  [ticket/10453] PM viewmessage page is misplacing the online icon
 2012-02-24 20:05:41 +02:00
Vjacheslav Trushkin
8cb95b3b84 Merge branch 'ticket/raimon/10453' into develop-olympus 
* ticket/raimon/10453:
  [ticket/10453] PM viewmessage page is misplacing the online icon
  [ticket/10453] PM viewmessage page is misplacing the online icon
 2012-02-24 20:05:26 +02:00
Andreas Fischer
dd160e19a2 Merge remote-tracking branch 'naderman/ticket/10663' into develop 
* naderman/ticket/10663:
  [ticket/10663] Extension finder should not find subdirs with directory filter
  [ticket/10663] Adding nested directory to finder test
 2012-02-24 13:55:36 +01:00
Joas Schilling
30c08bfe5b [ticket/10458] Fix xHTML errors when print-viewing PMs 
PHPBB3-10458
 2012-02-23 16:25:47 +01:00
Nils Adermann
c9b36c5a2e Merge remote-tracking branch 'github-igorw/extensions-tests-mysq55' into develop 
* github-igorw/extensions-tests-mysq55:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode
 2012-02-21 20:33:13 +01:00
Nils Adermann
a4090ba07c Merge remote-tracking branch 'github-cyberalien/ticket/10655' into develop 
* github-cyberalien/ticket/10655:
  [ticket/10655] Error in template inheritance test
 2012-02-21 20:20:01 +01:00
Igor Wiedler
cbd20c1bbe [ticket/10667] Fix tests under MySQL 5.5 strict mode 
PHPBB3-10667
 2012-02-21 18:51:08 +01:00
Nils Adermann
41870c4095 [ticket/10663] Extension finder should not find subdirs with directory filter 
The directory filter pattern now has a $ in the end, do avoid subdirectories
from being matched as well.

PHPBB3-10663
 2012-02-21 18:32:08 +01:00
Vjacheslav Trushkin
3762bf5e99 [ticket/10663] Adding nested directory to finder test 
Adding nested directory to finder test, triggering finder bug

PHPBB3-10663
 2012-02-21 18:19:14 +02:00
Joas Schilling
340a8f19d6 [ticket/10456] Add tabindex to subsilver2 captcha 
Did not set tabindex on registration page, as the hole page does not have any.

PHPBB3-10456
 2012-02-21 11:25:22 +01:00
Joas Schilling
ef154b78a1 [ticket/10630] Use sql_like_expression() method instead of hardcoded LIKE '%x%' 
PHPBB3-10630
 2012-02-20 02:18:48 +01:00
Joas Schilling
afcf9cbc86 [ticket/10630] Perform array_unique on authors array before creating the query 
This is needed to avoid an additional appearance for an author for every
post he made.

PHPBB3-10630
 2012-02-20 02:17:13 +01:00
Joas Schilling
c3265c9138 [ticket/10639] Do not allow negative post count as rank's minimum posts 
PHPBB3-10639
 2012-02-20 01:52:33 +01:00
Vjacheslav Trushkin
9f2a2a03a8 [ticket/10655] Error in template inheritance test 
Fixing error in template inheritance test

PHPBB3-10655
 2012-02-18 00:04:32 +02:00
Igor Wiedler
625a1f2b20 Merge remote-tracking branch 'cyberalien/ticket/10378' into develop 
* cyberalien/ticket/10378:
  [ticket/10378] Missing entries from imageset to css conversion
  [ticket/10378] Imageset to css convertor typo
 2012-02-17 14:08:03 +01:00
Igor Wiedler
5e0b4e63d0 Merge branch 'ticket/10380' into develop 
* ticket/10380:
  [ticket/10380] BIDI support for imageset
 2012-02-17 14:04:13 +01:00
Igor Wiedler
10bc51614d Merge branch 'master' of github.com:phpbb/phpbb3 into develop 
* 'master' of github.com:phpbb/phpbb3:
 2012-02-17 14:04:07 +01:00