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

13333 commits

This branch
This branch
All branches
Author SHA1 Message Date
Igor Wiedler
5dd5df46a4 [feature/event-dispatcher] Remove copied EventDispatcher code 
PHPBB3-9550
 2012-03-11 14:55:30 +01:00
Michael Cullum
24f1896b3c [ticket/10697] Updating gitignore to match develop branch 
PHPBB3-10697
 2012-03-11 09:42:56 +00: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
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
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
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
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
bb7e86c2b1 [ticket/10658] Do not fetch ranks into the $ranks array, it is no longer used. 
PHPBB3-10658
 2012-03-08 15:19:15 +01: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
Oleg Pudeyev
d380a1a36f Merge remote-tracking branch 'bantu/ticket/9813' into develop-olympus 
* bantu/ticket/9813:
  [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:24 -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
Vjacheslav Trushkin
f70786ab2e [feature/prosilver-cleanup/remove-tweaks2] Updating tweaks 
Removing unnecessary tweaks, changing IE7 tweaks to modern code

PHPBB3-10622
 2012-03-08 01:43:11 +02:00
Vjacheslav Trushkin
dfce7c7e96 [feature/prosilver-cleanup/remove-tweaks2] Copying common tweaks 
Copying commonly used code from tweaks.css to common.css

PHPBB3-10622
 2012-03-08 01:42:27 +02:00
Vjacheslav Trushkin
179fa3ef40 [feature/prosilver-cleanup/remove-tweaks2] Removing tweaks from forms 
Removing IE6 tweaks from forms.css

PHPBB3-10622
 2012-03-08 01:40:09 +02:00
Vjacheslav Trushkin
68fb7356b8 [feature/prosilver-cleanup/remove-tweaks2] Tweaks.css only for IE 
Removing tweaks.css from stylesheet.css, including it for IE8 or older via conditional statements

PHPBB3-10622
 2012-03-08 01:38:16 +02: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
Vjacheslav Trushkin
ebdd03872a [feature/append_var] Adding test case 
Adding test case for append_var

PHPBB3-10666
 2012-03-08 01:01:16 +02: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
Andreas Fischer
0eb7f18c98 Merge remote-tracking branch 'p/ticket/10685' into develop 
* p/ticket/10685:
  [ticket/10685] Refactor template test defaults for php 5.4 compatibility.
 2012-03-07 12:37:53 +01:00
Oleg Pudeyev
6e207e3f69 [ticket/10618] Change phpBB 3 to phpBB 3.1. 
PHPBB3-10618
 2012-03-06 19:42:33 -05:00
Oleg Pudeyev
6e5fc53f0d [ticket/10685] Refactor template test defaults for php 5.4 compatibility. 
PHPBB3-10685
 2012-03-06 19:34:20 -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
f3af5945e3 [ticket/10653] Fix parameter to substr() in unit tests. Should be 1, not -1. 
PHPBB3-10653
 2012-03-04 22:11:45 +01: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
6df721b215 [ticket/10653] Unit tests for get_row_count() and get_estimated_row_count(). 
PHPBB3-10653
 2012-03-04 01:59:40 +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
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