mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-01-17 22:28:46 +01:00
Code Issues Releases Wiki Activity
12,588 Commits 17 Branches 190 Tags
Commit Graph

11812 Commits

Author SHA1 Message Date
Andreas Fischer
67ae7f6b60 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10717] Fix profile field sample in prosilver´s memberlist_view.html
 2012-03-22 11:11:31 +01: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
099f8de621 Merge remote-tracking branch 'dhruvgoel92/ticket/10704' into develop 
* dhruvgoel92/ticket/10704:
  [ticket/10704] minor typo in a comment
 2012-03-22 10:59:41 +01:00
Andreas Fischer
89f988ecdd Merge remote-tracking branch 'p/task/php54-ascraeus' into develop 
* p/task/php54-ascraeus:
  [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era.
 2012-03-22 10:56:07 +01:00
Andreas Fischer
21bd0ca31a Merge branch 'develop-olympus' into develop 
With 5efdbfa5e4e3c00c08167cdfff912ee4937f4fd2 reverted.

* develop-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:51:03 +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
Dhruv Goel
92f771eb82 [ticket/10704] minor typo in a comment 
Make sure $id separation is working fine

PHPBB3-10704
 2012-03-22 03:10:14 +05:30
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
Andreas Fischer
cfd0afe4ea Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10691] Fixed the speed of creating search index
 2012-03-19 12:55:37 +01: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
1fa39ea722 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/8636] Add resync option to topic_view moderation page
 2012-03-16 06:18:35 -04:00
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
8de8dc916e Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10689] Fix "First character"-option in "Find a member"-search
 2012-03-16 06:06:56 -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
ccdd176b72 [task/php54-ascraeus] Bring p_master#module_auth into PHP 5 era. 
Split module_auth into a static and a non-static version.

Call the static version statically and the non-static version non-statically.

PHPBB3-10615
 2012-03-16 04:56:41 -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
33dce916e2 [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue 
PHPBB3-10690
 2012-03-14 22:22:22 +01: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
Andreas Fischer
3850b05fbb Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/7432] Delete redundant reference to "appropriate menu item".
  [ticket/7432] Explain what users are inactive in more detail.
 2012-03-09 23:43:11 +01: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
Oleg Pudeyev
c001bb9c03 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9831] Fix saving unchecked checkbox field value
  [ticket/9831] Correctly store checkbox default value for boolean CPF.
 2012-03-09 05:55:56 -05: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
5c4788a24c Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/9084] Explain the logic.
  [ticket/9084] Don't hide 'non-entered' dropdown CPF value if not required
 2012-03-09 04:42:16 -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
Oleg Pudeyev
35309de0b7 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [ticket/10653] Call get_row_count of base class in mysql get_estimated_row_count
  [ticket/9813] Only get posts table row count if we detected a fulltext index.
  [ticket/9813] Also use estimated row count of posts table for fulltext mysql.
  [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1.
  [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count().
  [ticket/10653] Add ability to count table rows to database abstraction layer.
  [ticket/9813] Use table status row count only if greater than 100000 or exact.
  [ticket/9813] Use SHOW TABLE STATUS to get search stats for native on MySQL.
 2012-03-08 08:44:32 -05: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
65e711cbb0 Merge remote-tracking branch 'cyberalien/feature/append_var' into develop 
* cyberalien/feature/append_var:
  [feature/append_var] Adding test case
  [feature/append_var] Adding append_var template class function
 2012-03-07 18:20:49 -05: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
74dfea22a1 Merge remote-tracking branch 'p/ticket/10618' into develop 
* p/ticket/10618:
  [ticket/10618] Change phpBB 3 to phpBB 3.1.
  [ticket/10618] Replace phpBB 3.0 with phpBB 3 for 3.1.
 2012-03-07 12:56:32 +01:00
Oleg Pudeyev
6e207e3f69 [ticket/10618] Change phpBB 3 to phpBB 3.1. 
PHPBB3-10618
 2012-03-06 19:42:33 -05:00
Vjacheslav Trushkin
a98117b229 [feature/append_var] Adding append_var template class function 
Adding append_var template class function

PHPBB3-10666
 2012-03-05 02:41:42 +02: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
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
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