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

12007 Commits

Author SHA1 Message Date
Joas Schilling
1dfb52b805 Merge branch 'develop-olympus' into develop 2011-10-30 16:12:22 +01:00
Joas Schilling
a63490f744 Merge remote-tracking branch 'remotes/marc1706/ticket/9778' into develop-olympus 2011-10-30 16:10:45 +01:00
Marc Alexander
75a44a6970 [ticket/9778] Replaced "Find a member" with "Enter username"
When clicking on the "Users and groups" tab in the ACP, the user is
able to either enter the username of the member he wants to manage
or click on "Find a member" below the input field. Unfortunately,
the label for the input field is also "Find a member", which leads
some users to the idea that they can search for users using that
input field. By changing the label to "Enter username" this should
be clear to the user.

PHPBB3-9778
2011-10-30 15:46:52 +01:00
Igor Wiedler
72a3bcd048 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9307] Add config variable to installation schema.
  [ticket/9307] Remove hardcoded chunk size of mass emails.

Conflicts:
	phpBB/install/database_update.php
2011-10-29 13:03:04 +02:00
Igor Wiedler
6d913d3646 Merge remote-tracking branch 'cs278/ticket/9307' into develop-olympus
* cs278/ticket/9307:
  [ticket/9307] Add config variable to installation schema.
  [ticket/9307] Remove hardcoded chunk size of mass emails.
2011-10-29 13:01:03 +02:00
Igor Wiedler
5351195dd7 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10420] Update includes/startup.php for PHP 5.4.
2011-10-29 12:37:32 +02:00
Igor Wiedler
319d12bedf Merge remote-tracking branch 'bantu/ticket/10420' into develop-olympus
* bantu/ticket/10420:
  [ticket/10420] Update includes/startup.php for PHP 5.4.
2011-10-29 12:37:16 +02:00
Igor Wiedler
27a80d0379 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10422] Invalid "if" in viewtopic_body.html
2011-10-29 12:35:44 +02:00
Igor Wiedler
d0bbb3f7f0 Merge remote-tracking branch 'cyberalien/ticket/10422' into develop-olympus
* cyberalien/ticket/10422:
  [ticket/10422] Invalid "if" in viewtopic_body.html
2011-10-29 12:35:30 +02:00
Igor Wiedler
189bd6dc9b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
2011-10-29 12:32:39 +02:00
Igor Wiedler
020106eeb9 Merge remote-tracking branch 'bantu/ticket/10421' into develop-olympus
* bantu/ticket/10421:
  [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
2011-10-29 12:32:25 +02:00
Igor Wiedler
acd72fad7b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10430] Fix typos/etc in coding guidelines
2011-10-29 12:22:17 +02:00
Igor Wiedler
17451e0842 Merge remote-tracking branch 'dellsystem/ticket/olympus/10430' into develop-olympus
* dellsystem/ticket/olympus/10430:
  [ticket/10430] Fix typos/etc in coding guidelines
2011-10-29 12:22:02 +02:00
Igor Wiedler
735e89c91b Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10259] Do not send notifications to user accounts joining free groups.
2011-10-29 11:43:44 +02:00
Igor Wiedler
5e3f73c498 Merge remote-tracking branch 'bantu/ticket/10259' into develop-olympus
* bantu/ticket/10259:
  [ticket/10259] Do not send notifications to user accounts joining free groups.
2011-10-29 11:43:28 +02:00
Igor Wiedler
7c10058787 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
2011-10-29 11:41:01 +02:00
Igor Wiedler
983b3d7f64 Merge remote-tracking branch 'bantu/ticket/10166' into develop-olympus
* bantu/ticket/10166:
  [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
2011-10-29 11:38:57 +02:00
Andreas Fischer
2e9e0a7d78 [ticket/10166] No longer refer to previous mail in admin_welcome_activated.txt
It does not make much sense to say "the username you received in a previous
e-mail" when the message itself contains the username.

PHPBB3-10166
2011-10-29 00:32:38 +02:00
dellsystem
8b99f04943 [ticket/10430] Fix typos/etc in coding guidelines
Mainly minor changes to correct errors and improve readability.

* "overcroud" --> "overcrowd"
* "concentinations" --> "concatenations"
* "SQL Statements", "SQL Formatting" - unnecessary capitalisation removed
* "keep a very close eye to it" --> "keep a very close eye on it"
* Fixed some fragmented sentences under the SQL Quotes section
* Added capitalisation of "sql", "select", "select distinct"
* "noticable" --> "noticeable"
* "outputed" --> "outputted"
* Added a missing "it" on the line about append_sid()
* And some other grammatical/stylistic changes, not worth listing them all

PHPBB3-10430
2011-10-28 10:27:38 -04:00
Oleg Pudeyev
83d71ecb88 Merge remote-tracking branch 'VSEphpbb/ticket/10390' into develop
* VSEphpbb/ticket/10390:
  [ticket/10390] Revert back to escaped script tags inside document.write
  [ticket/10390] Fix wording: fallback should be fall back
  [ticket/10390] Serve jQuery from Google CDN Yes/No button in ACP
  [ticket/10390] Use simpler HTML5 compliant js for the jQuery fallback
  [ticket/10390] Drop http protocol for Microsoft's CDN option
  [ticket/10390] Reword the language for jQuery host/server options
  [ticket/10390] Fix a type-o - captialize AJAX
  [ticket/10390] Improve the jQuery CDN url generation function
  [ticket/10390] Move jQuery version definition
  [ticket/10390] Allow option for jQuery to be hosted by a remote CDN

Conflicts:
	phpBB/install/database_update.php
2011-10-20 20:46:48 -04:00
Andreas Fischer
ba1464b6e0 [ticket/10421] Correct parameter order for phpbb_check_hash() in acp_users.php
PHPBB3-10421
2011-10-18 21:25:27 +02:00
Andreas Fischer
cd184e4912 [ticket/10420] Update includes/startup.php for PHP 5.4.
PHP 5.4 dropped support for register globals and magic quotes.

Calling set_magic_quotes_runtime() on PHP 5.4 actually results in an
E_CORE_ERROR error.

PHPBB3-10420
2011-10-18 21:16:42 +02:00
Vjacheslav Trushkin
c8399b8e30 [ticket/10422] Invalid "if" in viewtopic_body.html
Fixing incorrect "IF" in viewtopic_body.html

PHPBB3-10422
2011-10-18 21:37:51 +03:00
Andreas Fischer
8f6cfc77d2 [ticket/10259] Do not send notifications to user accounts joining free groups.
It does not make sense to send notifications to users joining a freely open
group. They already know that they were added to the group, because they
triggered the actual join.

PHPBB3-10259
2011-10-17 19:10:41 +02:00
Andreas Fischer
c6e370d33a Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9525] Minimum post length 0 is accepted but not working.
2011-10-17 16:44:08 +02:00
Andreas Fischer
cfb5135805 Merge remote-tracking branch 'nickvergessen/ticket/9525' into develop-olympus
* nickvergessen/ticket/9525:
  [ticket/9525] Minimum post length 0 is accepted but not working.
2011-10-17 16:43:58 +02:00
Andreas Fischer
88d064b6f4 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
2011-10-17 16:43:33 +02:00
Andreas Fischer
af11d94fb0 Merge remote-tracking branch 'naderman/ticket/10414' into develop
* naderman/ticket/10414:
  [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2
2011-10-17 16:35:10 +02:00
Nils Adermann
9c861a0350 [ticket/10414] Skip functional tests on PHP 5.2 - requires PHPUnit 3.6 on 5.2
Tests still execute correctly using PHPUnit 3.5 on PHP 5.3 and above. The php
version limitation for a directory was added in PHPUnit 3.6. A separate test
suite is required because the functional tests are in the whitelisted tests
directory. The base test for functional testing is only included in bootstrap
in versions 5.3 and above.

PHPBB3-10414
2011-10-17 06:52:34 +02:00
Igor Wiedler
ff0839e76b Merge remote-tracking branch 'bantu/ticket/10416' into develop-olympus
* bantu/ticket/10416:
  [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
2011-10-17 02:40:44 +02:00
Igor Wiedler
2d42dbc385 Merge remote-tracking branch 'bantu/ticket/10417' into develop
* bantu/ticket/10417:
  [ticket/10417] Fix array_merge() on undefined $config variable.
2011-10-17 02:38:20 +02:00
Andreas Fischer
38e7f3fff7 [ticket/10417] Fix array_merge() on undefined $config variable.
PHPBB3-10417
2011-10-16 20:34:25 +02:00
Andreas Fischer
c451a15504 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10413] Fix CS
  [ticket/10413] Make create_schema_files usable
2011-10-16 20:16:25 +02:00
Andreas Fischer
cc227cc6f6 Merge remote-tracking branch 'igorw/ticket/10413' into develop-olympus
* igorw/ticket/10413:
  [ticket/10413] Fix CS
  [ticket/10413] Make create_schema_files usable
2011-10-16 20:16:12 +02:00
Andreas Fischer
fa1d9a4571 [ticket/10416] Pass dbport to PDO object in ...connection_manager::connect().
PHPBB3-10416
2011-10-16 20:10:37 +02:00
Igor Wiedler
8d33dea2cd [ticket/10413] Fix CS
PHPBB3-10413
2011-10-16 19:30:33 +02:00
Nils Adermann
95fed7806d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10377] Do not allow all moderators to sticky posts
2011-10-14 17:56:46 +02:00
Nils Adermann
7813135365 Merge remote-tracking branch 'github-igorw/ticket/10377' into develop-olympus
* github-igorw/ticket/10377:
  [ticket/10377] Do not allow all moderators to sticky posts
2011-10-14 17:56:38 +02:00
Igor Wiedler
99d6f00d51 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
2011-10-14 17:50:53 +02:00
Igor Wiedler
cafefe9379 Merge remote-tracking branch 'bantu/ticket/10327' into develop-olympus
* bantu/ticket/10327:
  [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
  [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
2011-10-14 17:50:08 +02:00
Nils Adermann
8a82ec95a5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/8240] Add ability to get a list of columns of a tables to db_tools.
  [ticket/8240] Add ability to get a list of tables to db_tools.
2011-10-14 17:48:15 +02:00
Igor Wiedler
27279afa1e [ticket/10377] Do not allow all moderators to sticky posts
In the mcp the change_topic_type does not properly check permissions,
allowing moderators to make any post sticky or announced by visiting the
correct URL.

PHPBB3-10377
2011-10-14 17:37:12 +02:00
Igor Wiedler
207a73537b Merge remote-tracking branch 'naderman/feature/functional-tests' into develop
* naderman/feature/functional-tests:
  [feature/functional-tests] Don't add elements to backup list twice
  [feature/functional-tests] Generate config correctly and install only once
  [feature/functional-tests] Configure functional tests through config file
  [feature/functional-tests] Implementing functional test framework with goutte
2011-10-14 17:24:03 +02:00
Nils Adermann
a8aa7fd6c0 [feature/functional-tests] Don't add elements to backup list twice
PHPBB3-10414
2011-10-14 17:23:31 +02:00
Nils Adermann
a3928bf82d [feature/functional-tests] Generate config correctly and install only once
PHPBB3-10414
2011-10-14 17:23:31 +02:00
Andreas Fischer
607761e830 [ticket/10327] Use $this->tools instead of creating a new instance of db_tools.
PHPBB3-10327
2011-10-14 17:23:29 +02:00
Andreas Fischer
7e18d2b861 [ticket/10327] Also change CREATE UNIQUE INDEX to use ALTER TABLE.
PHPBB3-10327
2011-10-14 17:23:21 +02:00
Nils Adermann
0ffe494edd [feature/functional-tests] Configure functional tests through config file
The functional tests now also use the test database

PHPBB3-10414
2011-10-14 17:20:54 +02:00
Igor Wiedler
637d8eabe7 [feature/functional-tests] Implementing functional test framework with goutte
PHPBB3-10414
2011-10-14 17:20:53 +02:00
Andreas Fischer
4effe8fb8b [ticket/8240] Add ability to get a list of columns of a tables to db_tools.
PHPBB3-8240
2011-10-14 16:35:14 +02:00