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,583 Commits 17 Branches 190 Tags
Commit Graph

12583 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nils Adermann
bab98ca5c2 Merge branch 'develop-olympus' into develop 
* develop-olympus:
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  [task/travis] Adding Travis Continuous Intergration Support
 2012-03-22 16:12:35 +01:00
Nils Adermann
6f809416ba Merge remote-tracking branch 'github-unknownbliss/task/travis' into develop-olympus 
* github-unknownbliss/task/travis:
  [task/travis] Some more small travis fixes
  [task/travis] Rename travis phpunit config files
  [task/travis] Fixing some travis issues
  [task/travis] Add automated testing to readme
  [task/travis] Removing development information
  [task/travis] Adding Travis Continuous Intergration Support
 2012-03-22 16:11:55 +01:00
Michael Cullum
115ee7f3b8 [task/travis] Some more small travis fixes 
PHPBB3-10718
 2012-03-22 14:44:36 +00:00
Michael Cullum
c7f65fba62 [task/travis] Rename travis phpunit config files 
PHPBB3-10718
 2012-03-22 14:13:25 +00:00
Michael Cullum
d1980f6ad6 [task/travis] Fixing some travis issues 
PHPBB3-10718
 2012-03-22 13:32:58 +00:00
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
Michael Cullum
4325bbf4c6 [task/travis] Add automated testing to readme 
PHPBB3-10718
 2012-03-22 09:08:43 +00:00
Michael Cullum
9120c7691e [task/travis] Removing development information 
PHPBB3-10718
 2012-03-22 09:08:12 +00:00
Michael Cullum
4dafcc2525 [task/travis] Adding Travis Continuous Intergration Support 
PHPBB3-10718
 2012-03-22 09:05:59 +00: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
Andreas Fischer
dad37a4329 Merge remote-tracking branch 'dhruvgoel92/ticket/10691' into develop-olympus 
* dhruvgoel92/ticket/10691:
  [ticket/10691] Fixed the speed of creating search index
 2012-03-19 12:55:24 +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
29b11b69f8 Merge remote-tracking branch 'nickvergessen/ticket/10690' into develop 
* nickvergessen/ticket/10690:
  [ticket/10690] Fix undefined UNAPPROVED_POSTS_ZERO_TOTAL in queue
 2012-03-16 05:29:23 -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
David King
7dfb8d7c20 Merge branch 'develop-olympus' into develop 2012-03-11 12:59:52 -04:00
David King
b652e1a1bb Merge branch 'unknownbliss/ticket/10697' into develop-olympus 2012-03-11 12:58:55 -04:00
Michael Cullum
24f1896b3c [ticket/10697] Updating gitignore to match develop branch 
PHPBB3-10697
 2012-03-11 09:42:56 +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
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
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
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