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
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
Patrick Webster
dd6955f833
[ticket/10978] Fix typo in prosilver ucp_groups_membership.html
...
PHPBB3-10978
2012-07-09 19:29:17 -05:00
Nils Adermann
088dbc0b54
Merge remote-tracking branch 'github-bantu/ticket/10974' into develop-olympus
...
* github-bantu/ticket/10974:
[ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php
2012-07-08 23:03:58 +02:00
Andreas Fischer
cde5411e8a
[ticket/10974] Rename tests/mock_user.php -> tests/mock/user.php
...
PHPBB3-10974
2012-07-08 22:46:14 +02:00
Oleg Pudeyev
a7da376004
Merge PR #856 branch 'prep-release-3.0.11' into develop-olympus
...
* prep-release-3.0.11:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:28 -04:00
Oleg Pudeyev
36a568fd56
Merge PR #856 branch 'bantu/ticket/10937' into prep-release-3.0.11
...
* bantu/ticket/10937:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
2012-07-07 16:43:24 -04:00
Patrick Webster
5d0aa8e516
[ticket/10441] Make CDB linking more consistent
...
PHPBB3-10441
2012-07-02 21:38:27 -05:00
Andreas Fischer
2c12f31cdf
[ticket/10937] Update documentation to say which comment styles are removed.
...
PHPBB3-10937
2012-07-03 01:02:42 +02:00
Andreas Fischer
81d5327e44
[ticket/10937] Comment removal functions: Restore backward compatibility
...
PHPBB3-10937
2012-07-03 01:02:42 +02:00
Andreas Fischer
3ecc43d48c
Merge branch 'prep-release-3.0.11' into develop-olympus
...
* prep-release-3.0.11:
[ticket/10773] ACP logo with registered trademark symbol
2012-07-01 00:19:52 +02:00
Andreas Fischer
e5364088c3
Merge remote-tracking branch 'Noxwizard/ticket/10773' into prep-release-3.0.11
...
* Noxwizard/ticket/10773:
[ticket/10773] ACP logo with registered trademark symbol
2012-07-01 00:19:32 +02:00
Patrick Webster
625333ea2e
[ticket/10773] ACP logo with registered trademark symbol
...
PHPBB3-10773
2012-06-30 12:21:37 -05:00
Patrick Webster
6203ef0c61
[ticket/10441] Typo
...
PHPBB3-10441
2012-06-29 12:10:14 -05:00
Oyabun1
c9f9e66328
[ticket/10441] Update to docs/README.html
...
Updated information about styles, languages, and MODs
Added a section about the Knowledge Base.
Various phrase changes.
PHPBB3-10441
2012-06-29 01:39:14 -05:00
Andreas Fischer
7fba5a0f38
Merge branch 'ticket/brunoais/10850' into develop-olympus
...
* ticket/brunoais/10850:
[ticket/10850] Changed the fopen mode to wb
2012-06-28 23:11:01 +02:00
Bruno Ais
3baeb4276d
[ticket/10850] Changed the fopen mode to wb
...
Changed the fopen mode from "wt" to "wb" as requested in the PR.
The objective behind this is to prevent writting stuff like "\r\r\n" in
windows
PHPBB3-10850
2012-06-28 23:10:12 +02:00
Andreas Fischer
80180a6a20
Merge branch 'prep-release-3.0.11' into develop-olympus
...
* prep-release-3.0.11:
[ticket/10935] Limit number of PM rules per user to 5000
2012-06-21 10:30:56 +02:00
Andreas Fischer
f1414386d7
Merge remote-tracking branch 'nickvergessen/ticket/10935' into prep-release-3.0.11
...
* nickvergessen/ticket/10935:
[ticket/10935] Limit number of PM rules per user to 5000
2012-06-21 10:30:41 +02:00
Joas Schilling
80fafdeb1a
[ticket/10935] Limit number of PM rules per user to 5000
...
PHPBB3-10935
2012-06-20 14:29:48 +02:00
Andreas Fischer
3e80268249
Merge branch 'prep-release-3.0.11' into develop-olympus
...
* prep-release-3.0.11:
[ticket/10925] Clarify installation requirements for SQLite
2012-06-20 10:31:23 +02:00
Andreas Fischer
155c93d71a
Merge remote-tracking branch 'Noxwizard/ticket/10925' into prep-release-3.0.11
...
* Noxwizard/ticket/10925:
[ticket/10925] Clarify installation requirements for SQLite
2012-06-20 10:31:08 +02:00
Nils Adermann
08763ac99e
Merge remote-tracking branch 'github-dhruvgoel92/ticket/9551' into develop-olympus
...
* github-dhruvgoel92/ticket/9551:
[ticket/9551] uncomment line and change length to 255
2012-06-19 20:09:23 +02:00
Dhruv Goel
bbd3204a9c
[ticket/9551] uncomment line and change length to 255
...
incase of partial collation change post_subject field will be changed back
to the default collation and length 255.
PHPBB3-9551
2012-06-19 20:03:57 +05:30
Patrick Webster
d26606f986
[ticket/10925] Clarify installation requirements for SQLite
...
PHPBB3-10925
2012-06-19 01:20:58 -05:00
Nils Adermann
4ebcb5319e
Merge remote-tracking branch 'github-p/ticket/10828' into develop-olympus
...
* github-p/ticket/10828:
[ticket/10828] Connect to postgres database by default.
2012-06-12 00:44:59 +02:00
Andreas Fischer
118c5d90da
[develop-olympus] Incrementing the version to 3.0.12-dev in develop-olympus.
2012-05-31 22:07:34 +02:00
Andreas Fischer
19a47dfbbc
[develop-olympus] Add changelog for 3.0.11 release.
2012-05-31 22:07:02 +02:00
Andreas Fischer
2011085c29
[develop-olympus] Bump version numbers for 3.0.11-RC1 release.
2012-05-31 22:07:02 +02:00
Andreas Fischer
d8ddda5121
[develop-olympus] Bumping version numbers to final for 3.0.11 releases.
2012-05-31 20:19:28 +02:00
Nils Adermann
791c4136f7
Merge remote-tracking branch 'github-bantu/ticket/10788' into develop-olympus
...
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10788:
[ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
2012-05-31 20:06:29 +02:00
Andreas Fischer
d22e7ce9df
[ticket/10788] Add Arty to the list of phpBB developers in docs/AUTHORS.
...
PHPBB3-10788
2012-05-31 19:57:13 +02:00
Nils Adermann
f616c4e7a0
Merge remote-tracking branch 'github-bantu/ticket/10790' into develop-olympus
...
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10790:
[ticket/10790] Remove a (kind of) dead code section from submit_pm().
2012-05-31 15:50:19 +02:00
Nils Adermann
7eaedcc8de
Merge remote-tracking branch 'github-bantu/ticket/10550' into develop-olympus
...
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10550:
[ticket/10550] Sort not installed styles list in the styles section of the ACP.
2012-05-31 15:43:09 +02:00
Nils Adermann
b10757ef14
Merge remote-tracking branch 'github-bantu/ticket/10611' into develop-olympus
...
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10611:
[ticket/10611] Filter out not existing database tables when making a backup.
[ticket/10611] Use phpbb_db_tools::sql_list_tables() instead of get_tables().
[ticket/10611] Generate db_tools instance in acp_database module.
2012-05-31 15:34:48 +02:00
Nils Adermann
f6f300d3f9
Merge remote-tracking branch 'github-bantu/ticket/10162' into develop-olympus
...
By Andreas Fischer
via Andreas Fischer
* github-bantu/ticket/10162:
[ticket/10162] Increase maximum length of email address TLD from 6 to 63.
[ticket/10162] Add test cases for top level domain names longer than 6 chars.
2012-05-31 15:29:33 +02:00
