1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

11278 Commits

Author SHA1 Message Date
Andreas Fischer
5407f9b00d [ticket/11060] Backport ca4cee86afb88820a52ac1535de18c4dbb365f0e to olympus.
PHPBB3-11060
2012-08-26 15:09:00 +02:00
Andreas Fischer
446607ef53 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [prep-release-3.0.11] Bumping version number for 3.0.11 final.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2012-08-20 16:40:50 +02:00
Andreas Fischer
6da03913bf [prep-release-3.0.11] Bumping version number for 3.0.11 final. 2012-08-20 16:32:34 +02:00
Andreas Fischer
ac81611b90 Merge remote-tracking branch 'igorw/ticket/11059' into develop-olympus
* igorw/ticket/11059:
  [ticket/11059] Use https for the README logo
2012-08-19 23:44:31 +02:00
Oleg Pudeyev
97020399fa Merge PR #950 branch 'dhruvgoel92/ticket/10943' into develop-olympus
* dhruvgoel92/ticket/10943:
  [ticket/10943] displays searched query in search result
  [ticket/10943] use keywords variable to display in search box
2012-08-18 22:38:25 -04:00
Igor Wiedler
0ae4b20160 [ticket/11059] Use https for the README logo
It's causing troubles since we moved the site to HTTPS

PHPBB3-11059
2012-08-19 02:20:58 +02:00
Dhruv Goel
2ba1cef5b0 [ticket/10943] displays searched query in search result
Search backend displays an additional normalized search query just above
the ignored words.

PHPBB3-10943
2012-08-11 02:26:46 +05:30
Dhruv Goel
83a4d9abb5 [ticket/10943] use keywords variable to display in search box
$keywords which contains the string as entered by the user should be used
to display in search box instead of search_query.

PHPBB3-10943
2012-08-11 02:21:14 +05:30
Andreas Fischer
cb007acc76 Merge remote-tracking branch 'Fyorl/ticket/11034' into develop-olympus
* Fyorl/ticket/11034:
  [ticket/11034] Re-arranged install order to emulate real install
2012-07-30 19:00:17 +02:00
Fyorl
647d395908 [ticket/11034] Re-arranged install order to emulate real install
PHPBB3-11034
2012-07-30 14:13:28 +01:00
Andreas Fischer
49a53755e6 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release.
  [prep-release-3.0.11] Bumping version number for 3.0.11-RC2.

Conflicts:
	phpBB/includes/constants.php
	phpBB/install/database_update.php
	phpBB/install/schemas/schema_data.sql
2012-07-23 23:45:17 +02:00
Andreas Fischer
ece4a2edb7 [prep-release-3.0.11] Update Changelog for 3.0.11-RC2 release. release-3.0.11-RC2 2012-07-23 23:41:58 +02:00
Andreas Fischer
9f073e4c75 [prep-release-3.0.11] Bumping version number for 3.0.11-RC2. 2012-07-23 23:41:47 +02:00
Andreas Fischer
60acd63c70 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
2012-07-23 23:39:58 +02:00
Andreas Fischer
9279c8f5ee Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11
* naderman/ticket/10965:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
2012-07-23 23:39:42 +02:00
Nils Adermann
296fadfca4 [ticket/10965] Profile data is only grabbed when show_novalue is enabled
PHPBB3-10965
2012-07-23 23:35:48 +02:00
Andreas Fischer
27d9e3133b Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
2012-07-23 22:56:47 +02:00
Andreas Fischer
3c64cccecc Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11
* naderman/ticket/10965:
  [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
2012-07-23 22:56:36 +02:00
Nils Adermann
2f5692d4bb [ticket/10965] Make sure all profile fields are always grabbed on viewtopic
PHPBB3-10965
2012-07-23 22:38:38 +02:00
Andreas Fischer
7b98e75ec3 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
2012-07-23 15:48:53 +02:00
Andreas Fischer
3da72e9864 Merge remote-tracking branch 'naderman/ticket/10965' into prep-release-3.0.11
* naderman/ticket/10965:
  [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
  [ticket/10965] Introduce a new profile field option to display no value
2012-07-23 15:48:40 +02:00
Nils Adermann
19237f5613 [ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
PHPBB3-10965
2012-07-23 15:46:04 +02:00
Nils Adermann
10172887fd [ticket/10965] Introduce a new profile field option to display no value
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.

PHPBB3-10965
2012-07-23 15:45:57 +02:00
Nils Adermann
da8d610011 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-22 01:46:46 +02:00
Nils Adermann
55aaa596d7 Merge branch 'ticket/10667' into prep-release-3.0.11
* ticket/10667:
  [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
2012-07-22 01:46:01 +02:00
Igor Wiedler
6ed63088fe [ticket/10667] Fix tests under MySQL 5.5 strict mode (once again)
PHPBB3-10667
2012-07-22 01:45:30 +02:00
Nils Adermann
29bee5b01a Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 16:15:32 +02:00
Nils Adermann
3dfcb212dc Merge remote-tracking branch 'github-nickvergessen/ticket/10950' into prep-release-3.0.11
* github-nickvergessen/ticket/10950:
  [ticket/10950] Fix grammar in comments
  [ticket/10950] Delete PMs for users that have not yet read the pm
  [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
  [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
  [ticket/10950] Remove deleted entries in tests instead of commenting them out
  [ticket/10950] Use database count() and group by instead of doing that in php
  [ticket/10950] Check $delete_ids to be not empty
  [ticket/10950] Recreated the behaviour of phpbb_delete_user_pms()
  [ticket/10950] Fix unit tests to reflect desired behaviour
  [ticket/10950] Add some first and simple unit tests for phpbb_delete_user_pms()
  [ticket/10950] Correct comment for the second query.
  [ticket/10950] Add empty line to make unset() call more visible.
  [ticket/10950] Select the correct columns in SQL queries.
  [ticket/10950] Use a variable for the private message id.
  [ticket/10950] Move array initialisation to the front.
  [ticket/10950] Remove redundant if statement.
  [ticket/10950] Fix SQL coding style (indentation) in second SQL query.
  [ticket/10950] Use proper ' in order to fix comment.
2012-07-21 15:21:26 +02:00
Nils Adermann
1e87e0dab8 Merge remote-tracking branch 'github-bantu/ticket/11009' into develop-olympus
* github-bantu/ticket/11009:
  [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
2012-07-21 00:35:03 +02:00
Andreas Fischer
be44f32008 [ticket/11009] Backport build.xml from develop to fix Bamboo Unit Testing.
PHPBB3-11009
2012-07-21 00:24:09 +02:00
Joas Schilling
3036db481a [ticket/10950] Fix grammar in comments
PHPBB3-10950
2012-07-20 18:03:06 +02:00
Joas Schilling
a3517232f9 [ticket/10950] Delete PMs for users that have not yet read the pm
PHPBB3-10950
2012-07-20 17:11:20 +02:00
Joas Schilling
a9c091fad4 [ticket/10950] Fix unit tests to fit the new pm deleting behaviour
Undelivered PMs should not be delivered to recipients that have not yet received them.

PHPBB3-10950
2012-07-20 17:08:54 +02:00
Nils Adermann
9d099eebab Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html
2012-07-19 17:55:43 +02:00
Nils Adermann
a65b432165 Merge remote-tracking branch 'github-noxwizard/ticket/10441' into prep-release-3.0.11
* github-noxwizard/ticket/10441:
  [ticket/10441] Make CDB linking more consistent
  [ticket/10441] Typo
  [ticket/10441] Update to docs/README.html
2012-07-19 17:55:22 +02:00
Andreas Fischer
3bbb882fe8 Merge remote-tracking branch 'Fyorl/ticket/10981' into develop-olympus
* Fyorl/ticket/10981:
  [ticket/10981] Added check for PHP version before running composer
  [ticket/10981] Modified travis to use composer with --dev
  [ticket/10981] Removed setupBeforeClass
  [ticket/10981] Modified functional framework to account for goutte changes
  [ticket/10981] Added goutte via composer
2012-07-19 16:40:33 +02:00
Andreas Fischer
eeef82ecc5 Merge remote-tracking branch 'Noxwizard/ticket/10996' into develop-olympus
* Noxwizard/ticket/10996:
  [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
2012-07-18 09:46:14 +02:00
Patrick Webster
d157c3b3f4 [ticket/10996] Use correct DBMS name in Travis config for PostgreSQL
PHPBB3-10996
2012-07-18 01:22:24 -05:00
Fyorl
aa2f7bcc2c [ticket/10981] Added check for PHP version before running composer
PHPBB3-10981
2012-07-17 21:39:49 +01:00
Fyorl
74074994ba [ticket/10981] Modified travis to use composer with --dev
PHPBB3-10981
2012-07-17 21:39:49 +01:00
Fyorl
7a412f846a [ticket/10981] Removed setupBeforeClass
PHPBB3-10981
2012-07-17 21:39:48 +01:00
Nils Adermann
4a87bc2aa9 Merge remote-tracking branch 'github-noxwizard/ticket/10678' into develop-olympus
* github-noxwizard/ticket/10678:
  [ticket/10678] Typo and formatting
  [ticket/10678] Add port handling for MSSQL tests
  [ticket/10678] Move config changes to new location
  [ticket/10678] Rename helper class file
  [ticket/10678] Lowercase class name, adjust comment width
  [ticket/10678] More formatting and docblocks
  [ticket/10678] More formatting requests
  [ticket/10678] Fix formatting
  [ticket/10678] Add better support for Firebird, Oracle, and MSSQL

Conflicts:
	tests/RUNNING_TESTS.txt
2012-07-17 21:12:47 +02:00
Andreas Fischer
0f70c930df Merge remote-tracking branch 'bantu/ticket/10995' into develop-olympus
* bantu/ticket/10995:
  [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
2012-07-17 20:56:41 +02:00
Patrick Webster
ae07e80a65 [ticket/10995] Return false in mssqlnative sql_fetchrow on empty result
PHPBB3-10995
2012-07-17 20:53:29 +02:00
Andreas Fischer
3a70bc2c75 Merge remote-tracking branch 'mvinny/ticket/10789' into develop-olympus
* mvinny/ticket/10789:
  [ticket/10789] Remove unnecessary variables from PM print - prosilver
2012-07-17 20:42:17 +02:00
Fyorl
d88411e10d [ticket/10981] Modified functional framework to account for goutte changes
PHPBB3-10981
2012-07-16 17:52:03 +01:00
Fyorl
797ee16eaf [ticket/10981] Added goutte via composer
composer.phar added and autoloaded before tests

PHPBB3-10981
2012-07-16 17:52:03 +01:00
Joas Schilling
d9a32ce614 [ticket/10950] Update undelivered pm counts in batches not 1 by 1 for each user
PHPBB3-10950
2012-07-16 17:22:10 +02:00
Andreas Fischer
8f5182bf84 Merge branch 'prep-release-3.0.11' into develop-olympus
* prep-release-3.0.11:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:40 +02:00
Andreas Fischer
35e18a49a9 Merge remote-tracking branch 'Noxwizard/ticket/10978' into prep-release-3.0.11
* Noxwizard/ticket/10978:
  [ticket/10978] Fix typo in prosilver ucp_groups_membership.html
2012-07-12 18:19:19 +02:00