mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00
Code Issues Releases Wiki Activity
10,995 Commits 17 Branches 190 Tags
Commit Graph

10444 Commits

Author SHA1 Message Date
David King
10d4f8c35e Merge branch 'harderthanfire/ticket/10129' into develop-olympus 2012-03-29 20:37:50 -04:00
Jan Schejbal
fff9f6611e [ticket/10730] Added label tag around "select" text in post splitting UI 
Added label tags around the "select" text in the post splitting UI in the MCP.
Had to add IDs based on the post ID to the select boxes to allow label to
work. Tested in Firefox and Chrome.

PHPBB3-10730
 2012-03-29 04:16:34 +02:00
Andreas Fischer
2516b1e8f1 Merge remote-tracking branch 'Dickyf/ticket/10708' into develop-olympus 
* Dickyf/ticket/10708:
  [ticket/10708] Check converted passwords for multi-byte characters
 2012-03-29 00:51:12 +02:00
Andreas Fischer
a618e22fca Merge remote-tracking branch 'unknownbliss/ticket/10694' into develop-olympus 
* unknownbliss/ticket/10694:
  [ticket/10694] Adjusting details link to 5.3 announcement
  [ticket/10694] Update PHP warning to 5.3.2
 2012-03-26 00:06:17 +02:00
HTF
2768db44f5 [ticket/10129] Remove apostrophes and plurals in ACP user management -> permissions language file as per ticket. 
PHPBB3-10129
 2012-03-24 15:13:04 +00:00
Andreas Fischer
57eb50812f Merge remote-tracking branch 'rxu/ticket/10684' into develop-olympus 
* rxu/ticket/10684:
  [ticket/10684] Adjust function and parameter name, minor changes.
  [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter
  [ticket/10684] Remove intval mapping for array keys
  [ticket/10684] Adjust pm_notifications() to handle stale bans
  [ticket/10684] Cast user_id to integer
  [ticket/10684] Refactor $sql_ignore_users array update
  [ticket/10684] Remove isset() for $sql_ignore_users update
  [ticket/10684] Fix 2 typos in comment lines.
  [ticket/10684] Send notifications for users with stale bans
 2012-03-22 18:14:13 +01:00
rxu
5a9dd1994f [ticket/10684] Adjust function and parameter name, minor changes. 
PHPBB3-10684
 2012-03-22 21:19:01 +08:00
Andreas Fischer
99a271f34b Merge remote-tracking branch 'nickvergessen/ticket/10717' into develop-olympus 
* nickvergessen/ticket/10717:
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
 2012-03-22 11:11:21 +01:00
Andreas Fischer
e5205ba2f8 Merge remote-tracking branch 'p/task/php54-olympus' into develop-olympus 
* p/task/php54-olympus:
  [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4.
  [task/php54] Refactor error_reporting call slightly.
 2012-03-22 10:49:37 +01:00
Joas Schilling
2005c339ff [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html 
PHPBB3-10717
 2012-03-20 17:45:08 +01:00
Richard Foote
70d88965c7 [ticket/10708] Check converted passwords for multi-byte characters 
Check for multi-byte characters in converted passwords.

PHPBB3-10708
 2012-03-19 23:19:21 -04:00
Dhruv Goel
c551b46115 [ticket/10691] Fixed the speed of creating search index 
$time is now initialized after each batch iteration.
Speed for each batch iteration of creating search index is fixed.

PHPBB3-10691
 2012-03-19 17:11:30 +05:30
Oleg Pudeyev
81eeafbb8d Merge remote-tracking branch 'nickvergessen/ticket/8636' into develop-olympus 
* nickvergessen/ticket/8636:
  [ticket/8636] Add resync option to topic_view moderation page
 2012-03-16 06:18:29 -04:00
Oleg Pudeyev
95e011ccbe Merge remote-tracking branch 'nickvergessen/ticket/10689' into develop-olympus 
* nickvergessen/ticket/10689:
  [ticket/10689] Fix "First character"-option in "Find a member"-search
 2012-03-16 06:06:44 -04:00
Oleg Pudeyev
5efdbfa5e4 [task/php54] Disable E_STRICT in Olympus when running on PHP 5.4. 
We cannot use static in Olympus because it must be PHP 4 compatible.

Therefore disable E_STRICT for Olympus.

This commit should be reverted for Ascraeus.

PHPBB3-10615
 2012-03-15 22:47:42 -04:00
Oleg Pudeyev
71afba0ded [task/php54] Refactor error_reporting call slightly. 
Separate error level assignment into a variable in this commit
so that the only difference between Olympus and Ascraeus
is the addition of logic altering $level.

PHPBB3-10615
 2012-03-15 22:46:06 -04:00
Joas Schilling
3b7a6a3efa [ticket/10689] Fix "First character"-option in "Find a member"-search 
PHPBB3-10689
 2012-03-12 00:39:12 +01:00
rxu
ff8d523768 [ticket/10684] Rename function phpbb_get_banned_users_ids() parameter 
PHPBB3-10684
 2012-03-12 01:57:51 +08:00
rxu
da395edbca [ticket/10684] Remove intval mapping for array keys 
PHP manual for arrays http://php.net/manual/en/language.types.array.php states
that the following key cast will occur: Strings containing valid integers will
be cast to the integer type. E.g. the key "8" will actually be stored under 8.
Thus, no intval mapping for numeric array keys is needed.

PHPBB3-10684
 2012-03-12 01:47:28 +08:00
rxu
321d0d9b56 [ticket/10684] Adjust pm_notifications() to handle stale bans 
- Add parameter (array) to the function phpbb_get_banned_users_ids()
- Fix function pm_notification() to handle users with stale bans

PHPBB3-10684
 2012-03-12 01:44:00 +08:00
rxu
a79b3490c2 [ticket/10684] Cast user_id to integer 
PHPBB3-10684
 2012-03-11 00:56:07 +08:00
Michael Cullum
668c61686b [ticket/10694] Adjusting details link to 5.3 announcement 
PHPBB3-10694
 2012-03-10 16:47:07 +00:00
Andreas Fischer
aee79c6cdb Merge remote-tracking branch 'p/ticket/7432' into develop-olympus 
* p/ticket/7432:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
 2012-03-09 23:41:43 +01:00
rxu
89a6cb2886 [ticket/10684] Refactor $sql_ignore_users array update 
PHPBB3-10684
 2012-03-10 00:17:39 +08:00
Michael Cullum
fbe8086697 [ticket/10694] Update PHP warning to 5.3.2 
PHPBB3-10694
 2012-03-09 16:10:02 +00:00
rxu
f563647e4b [ticket/10684] Remove isset() for $sql_ignore_users update 
PHPBB3-10684
 2012-03-09 22:35:13 +08:00
Oleg Pudeyev
bd1fb91dd2 Merge remote-tracking branch 'rxu/ticket/9831' into develop-olympus 
* rxu/ticket/9831:
  [ticket/9831] Fix saving unchecked checkbox field value
  [ticket/9831] Correctly store checkbox default value for boolean CPF.
 2012-03-09 05:24:03 -05:00
Oleg Pudeyev
0ec8e9dbff Merge remote-tracking branch 'rxu/ticket/9084' into develop-olympus 
* rxu/ticket/9084:
  [ticket/9084] Explain the logic.
  [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
 2012-03-09 04:42:05 -05:00
Oleg Pudeyev
cd61de4bfd [ticket/9084] Explain the logic. 
PHPBB3-9084
 2012-03-09 04:35:09 -05:00
rxu
ee6783109a [ticket/10684] Fix 2 typos in comment lines. 
PHPBB3-10684
 2012-03-09 16:41:49 +08:00
rxu
025de9ee19 [ticket/10684] Send notifications for users with stale bans 
PHPBB3-10684
 2012-03-08 23:28:03 +08:00
Andreas Fischer
c11607bdd1 [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count 
There is no point in fetching the table status again.

PHPBB3-10653
 2012-03-08 14:39:03 +01:00
Andreas Fischer
01d90e59a8 [ticket/9813] Only get posts table row count if we detected a fulltext index. 
PHPBB3-9813
 2012-03-08 14:38:59 +01:00
Oleg Pudeyev
89a0cbc57e [ticket/7432] Delete redundant reference to "appropriate menu item". 
PHPBB3-7432
 2012-03-07 18:00:57 -05:00
Andreas Fischer
785c75254e [ticket/9813] Also use estimated row count of posts table for fulltext mysql. 
Since this is 'only' for statistics anyway, using an estimated value does no
harm. Also, if MyISAM is the underlying storage engine for the posts table,
the value will actually be exact.

PHPBB3-9813
 2012-03-05 00:29:28 +01:00
Andreas Fischer
f9953fc339 [ticket/10653] Add ability to count table rows to database abstraction layer. 
PHPBB3-10653
 2012-03-03 21:04:01 +01:00
Andreas Fischer
97cf433dea [ticket/9813] Use table status row count only if greater than 100000 or exact. 
PHPBB3-9813
 2012-03-03 21:03:55 +01:00
Andreas Fischer
efe25a0b49 [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL. 
PHPBB3-9813
 2012-03-03 21:03:50 +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
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
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
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
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
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