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

21230 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
fd37f63614 [feature/sqlite3] Correctly recreate indexes when recreating a table 
PHPBB3-9728
 2014-05-02 15:45:22 +02:00
Joas Schilling
b5267d97f4 [feature/sqlite3] Fix sql_index_drop() for sqlite3 
PHPBB3-9728
 2014-05-02 15:45:22 +02:00
Joas Schilling
07042e484e [feature/sqlite3] Remove trailing comma from column list 
PHPBB3-9728
 2014-05-02 15:45:21 +02:00
Patrick Webster
8c2b80e3d2 [feature/sqlite3] Update docblocks and function visibility 
Added missing docblock annotations and added visibility identifiers.

PHPBB3-9728
 2014-05-02 15:45:21 +02:00
Patrick Webster
b39b0369aa [feature/sqlite3] Add support for SQLite 3 
Minimum version requirement is 3.6.15 as that's what ships with PHP 5.3.0
when support for SQLite 3 was added.

PHPBB3-9728
 2014-05-02 15:45:20 +02:00
Nils Adermann
564de1b513 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
 2014-05-02 15:41:01 +02:00
Nils Adermann
d52c2d1b5c Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
 2014-05-02 15:39:52 +02:00
Nils Adermann
c7450592d8 Merge remote-tracking branch 'github-bantu/ticket/12468' into develop-olympus 
* github-bantu/ticket/12468:
  [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'.
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
 2014-05-02 15:36:59 +02:00
Joas Schilling
b988511a1c Merge remote-tracking branch 'p/develop-ascraeus' into develop 2014-05-02 15:09:51 +02:00
Joas Schilling
fa1ac3c54d Merge pull request #2336 from Nicofuma/ticket/12413 
[ticket/12413] Fatal Error log created for feed.php file
 2014-05-02 15:08:15 +02:00
Nils Adermann
65e90ecd24 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/11881] Move convert_timezones_test to migrator
  [ticket/11881] Fix test filename
  [ticket/11881] Limit to 500
  [ticket/11881] Make sure user_timezone isn't converted twice
  [ticket/11881] Better split the timezone conversion into chunks; add test
  [ticket/11881] Timezone migration can take a long time
 2014-05-02 14:46:40 +02:00
Nils Adermann
4f17d0653a Merge branch 'exreaction/ticket/11881' into develop-ascraeus 
* exreaction/ticket/11881:
  [ticket/11881] Move convert_timezones_test to migrator
  [ticket/11881] Fix test filename
  [ticket/11881] Limit to 500
  [ticket/11881] Make sure user_timezone isn't converted twice
  [ticket/11881] Better split the timezone conversion into chunks; add test
  [ticket/11881] Timezone migration can take a long time
 2014-05-02 14:46:25 +02:00
Nils Adermann
46c5ab64d4 [ticket/11881] Move convert_timezones_test to migrator 
PHPBB3-11881
 2014-05-02 14:45:53 +02:00
Andreas Fischer
370015c1a5 [ticket/12468] Having mbstring.http_input set to '' is as good as 'pass'. 
PHPBB3-12468
 2014-05-02 14:41:08 +02:00
Andreas Fischer
bfc31f55b2 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
 2014-05-02 14:22:09 +02:00
Andreas Fischer
5e95815503 Merge branch 'develop-olympus' into develop-ascraeus 
* develop-olympus:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
 2014-05-02 14:22:02 +02:00
Andreas Fischer
43c6fd768f Merge pull request #2371 from nickvergessen/ticket/12467 
[ticket/12467] Add config*.php and tests_config*.php to .gitignore

* nickvergessen/ticket/12467:
  [ticket/12467] Add config*.php and tests_config*.php to .gitignore
 2014-05-02 14:21:54 +02:00
PayBas
c63f2656a8 [ticket/12366] Conform to new event coding guidelines 
PHPBB3-12366
 2014-05-02 14:12:01 +02:00
PayBas
573ec0dbe9 [ticket/12366] Expanded event vars 
PHPBB3-12366
 2014-05-02 14:10:04 +02:00
PayBas
fadbd23456 [ticket/12366] Include ORDER BY into the query builder 
PHPBB3-12366
 2014-05-02 14:10:03 +02:00
PayBas
03e081df26 [ticket/12366] Changed to sql_build_query 
PHPBB3-12366
 2014-05-02 14:10:03 +02:00
PayBas
baf51dd5fd [ticket/12366] Add Event core.search_get_posts_data 
PHPBB3-12366
 2014-05-02 14:10:02 +02:00
PayBas
91ab67d1d9 [ticket/12411] Missed on bool var 
sloppy

PHPBB3-12411
 2014-05-02 13:54:06 +02:00
PayBas
598d1ecda8 [ticket/12411] Corrected event vars description 
PHPBB3-12411
 2014-05-02 13:54:05 +02:00
PayBas
ceca2e9ba1 [ticket/12411] Expand vars of event: core.search_modify_tpl_ary 
PHPBB3-12411
 2014-05-02 13:54:05 +02:00
Joas Schilling
535cd5670f [ticket/12467] Add config*.php and tests_config*.php to .gitignore 
PHPBB3-12467
 2014-05-02 13:47:30 +02:00
Nils Adermann
b6925ca6d1 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/12403] Add template events to acp_users_prefs.html
 2014-05-02 13:35:09 +02:00
Nils Adermann
2a280513ca Merge remote-tracking branch 'github-rxu/ticket/12403' into develop-ascraeus 
* github-rxu/ticket/12403:
  [ticket/12403] Add template events to acp_users_prefs.html
 2014-05-02 13:35:01 +02:00
Nils Adermann
f1a1a84bf0 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/8960] Allow changing avatar path if it's not writable
 2014-05-02 13:26:31 +02:00
Nils Adermann
ef0600bfa2 Merge remote-tracking branch 'github-marc1706/ticket/8960' into develop-ascraeus 
* github-marc1706/ticket/8960:
  [ticket/8960] Allow changing avatar path if it's not writable
 2014-05-02 13:26:03 +02:00
Nicofuma
8812cfcfbf [ticket/12413] Update configuration's asserts 
PHPBB3-12413
 2014-05-02 13:25:55 +02:00
Nicofuma
2bc4c0e39f [ticket/12413] Update init 
PHPBB3-12413
 2014-05-02 13:25:54 +02:00
Nicofuma
87fe1e6136 [ticket/12413] Remove unnecessary casts 
PHPBB3-12413
 2014-05-02 13:25:52 +02:00
Nicofuma
dcadc04b18 [ticket/12413] Disabled unapproved and solftdeleted tests 
PHPBB3-12413
 2014-05-02 13:25:51 +02:00
Nicofuma
21e2f5c517 [ticket/12413] Move parent:open() call to the end of the function 
PHPBB3-12413
 2014-05-02 13:25:49 +02:00
Nicofuma
ff2d26e7e8 [ticket/12413] Coding style again 
PHPBB3-12413
 2014-05-02 13:25:47 +02:00
Nicofuma
80b4a7f337 [ticket/12413] Fix coding style 
PHPBB3-12413
 2014-05-02 13:25:46 +02:00
Nicofuma
7d8d8394fc [ticket/12413] Fix: coding style 
PHPBB3-12413
 2014-05-02 13:25:44 +02:00
Nicofuma
ac59b6a199 [ticket/12413] Fixing the failed test 
The test was failing because travis is too fast: 2 posts had the same
timestamp.

PHPBB3-12413
 2014-05-02 13:25:42 +02:00
Nicofuma
edf0fd0fbd [ticket/12413] Adding the missing visibilities 
PHPBB3-12413
 2014-05-02 13:25:40 +02:00
Tristan Darricau
6c58f8cdee [ticket/12413] Using static attribute instead of @depends 
Using a static attribute to store the initial state of the feeds instead
of transmit it with the @depends annotation.

This attribute is also added to backupStaticAttributesBlackList

PHPBB3-12413
 2014-05-02 13:25:38 +02:00
Tristan Darricau
13d939b7e1 [ticket/12413] Useing @depends to transmit the state of the board 
the state of the board is calculate in the first test and transmit to the
others thanks to the @depends annotation.

PHPBB3-12413
 2014-05-02 13:25:36 +02:00
Tristan Darricau
103befc3d6 [ticket/12413] Tests: Adding functional tests for the feeds 
Some tests are disabled until PHPBB3-12418 (#2331) and PHPBB3-12421 (#2330) are
fixed and merged

PHPBB3-12413
 2014-05-02 13:25:35 +02:00
Tristan Darricau
e7f970e26d [ticket/12413] Fatal Error for feed.php?mode=forums 
https://tracker.phpbb.com/browse/PHPBB3-12413
http://area51.phpbb.com/phpBB/viewtopic.php?f=81&t=45475

PHPBB3-12413
 2014-05-02 13:25:33 +02:00
Nils Adermann
fa230b48ec Merge remote-tracking branch 'github-marc1706/ticket/8960-olympus' into develop-olympus 
* github-marc1706/ticket/8960-olympus:
  [ticket/8960] Allow changing avatar path if it's not writable
 2014-05-02 13:25:29 +02:00
Nils Adermann
f91b27584b Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/8558] htmlspecialchars_decode the contact name for emails
 2014-05-02 13:03:59 +02:00
Nils Adermann
76574d4b5e [ticket/8558] htmlspecialchars_decode the contact name for emails 
PHPBB3-8558
 2014-05-02 13:03:14 +02:00
Nils Adermann
9d00e95229 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/8558] Fix operator
  [ticket/8558] Fix field length in ACP
  [ticket/8558] Use only one variable and improve explain string
  [ticket/8558] Add config in migrations and schema_data
  [ticket/8558] Add display name in emails from board
 2014-05-02 12:50:24 +02:00
Nils Adermann
854854b60f Merge remote-tracking branch 'github-elsensee/ticket/stenudd/8558-2' into develop-ascraeus 
* github-elsensee/ticket/stenudd/8558-2:
  [ticket/8558] Fix operator
  [ticket/8558] Fix field length in ACP
  [ticket/8558] Use only one variable and improve explain string
  [ticket/8558] Add config in migrations and schema_data
  [ticket/8558] Add display name in emails from board

Conflicts:
	phpBB/includes/functions_messenger.php
 2014-05-02 12:49:07 +02:00
Nils Adermann
367abd2297 Merge branch 'develop-ascraeus' into develop 
* develop-ascraeus:
  [ticket/8558] Do string concatenation only once and do htmlspecialchars
  [ticket/8558] Add display name in emails from board
 2014-05-02 12:43:20 +02:00