1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-25 04:23:38 +01:00

14888 Commits

Author SHA1 Message Date
Nathan Guse
9420647c43 Merge remote-tracking branch 'remotes/imkingdavid/ticket/11243' into develop 2012-12-11 12:24:28 -06:00
David King
53c4a328a6 [ticket/11243] Show download all link on all pages of topic with attachments
PHPBB3-11243
2012-12-11 11:42:34 -05:00
David King
2212294ba3 Merge remote-tracking branch 'p/feature/template-events' into develop
* p/feature/template-events:
  [feature/template-events] Pass arguments in correct order.

Conflicts:
	phpBB/includes/style/style.php
2012-12-10 14:27:18 -05:00
David King
a9db155c28 Merge remote-tracking branch 'p/feature/template-events' into develop
# By Oleg Pudeyev (36) and others
# Via Oleg Pudeyev
* p/feature/template-events: (47 commits)
  [feature/template-events] Pass arguments in correct order.
  [feature/template-events] Order extensions in mock extension manager.
  [feature/template-events] Changes per imkingdavid's review.
  [feature/template-events] Make style names private on template.
  [feature/template-events] Test for event that is defined in parent style only.
  [feature/template-events] Specify style names, add inheritance tests.
  [feature/template-events] Normalize expected directory trees.
  [feature/template-events] Allow dataset to be correctly selectable.
  [feature/template-events] Dataset for template event testing with inheritance.
  [feature/template-events] Use style names array in template filter.
  [feature/template-events] Generate style names array in set_style.
  [feature/template-events] Convert a single style name to array of them.
  [feature/template-events] Chase dependency injection for template context.
  [feature/template-events] Adjust template events test to use the dataset.
  [feature/template-events] Create a dataset for template event tests.
  [feature/template-events] Indentation fix.
  [feature/template-events] Cosmetic changes.
  [feature/template-events] Wording: wrongly -> improperly.
  [feature/template-events] Indentation fix.
  [feature/template-events] Rename template_name to style_name.
  ...
2012-12-10 14:09:10 -05:00
Oleg Pudeyev
a0211ff2eb [feature/template-events] Pass arguments in correct order.
Thank you imkingdavid.

PHPBB3-9550
2012-12-10 14:02:57 -05:00
Oleg Pudeyev
0446886f91 [feature/template-events] Pass arguments in correct order.
Thank you imkingdavid.

PHPBB3-9550
2012-12-10 13:35:15 -05:00
Oleg Pudeyev
eaa0319867 Merge PR #1125 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users

Conflicts:
	tests/mock/cache.php
	tests/test_framework/phpbb_functional_test_case.php
2012-12-10 06:25:51 -05:00
Oleg Pudeyev
3c542b852a Merge PR #1125 branch 'p/ticket/10972' into develop-olympus
* p/ticket/10972:
  [ticket/10972] Drop user deletion.
  [ticket/10972] Tweak user addition.
  [ticket/10972] Add destroy method to mock cache.
  [ticket/10972] Add mock null cache.
  [ticket/10972] Backport get_db from develop.
  [ticket/10972] Added explicit checks for creating duplicate users.
  [ticket/10972] Moved tests into appropriate places and added comments
  [ticket/10972] Added methods for creating and deleting basic users
2012-12-10 06:04:24 -05:00
Igor Wiedler
3fe381eed5 Merge remote-tracking branch 'exreaction/ticket/11257' into develop
* exreaction/ticket/11257:
  [ticket/11257] Do not require set_name() method to exist
2012-12-09 19:02:04 +01:00
Andreas Fischer
bd987b6e14 Merge remote-tracking branch 'p/ticket/11095-develop' into develop
* p/ticket/11095-develop:
  [ticket/11095] Restore brace on previous line.
  [ticket/11095] Docs and tests for phpbb_build_hidden_fields_for_query_params.
  [ticket/11095] Forward GET parameters into hidden fields for jumpbox.
  [ticket/11095] Python quoteattr port.
  [ticket/11095] Use get method in jumpboxes.
2012-12-08 16:14:42 +01:00
Andreas Fischer
f043b14f79 Merge remote-tracking branch 'p/ticket/11255' into develop
* p/ticket/11255:
  [ticket/11255] Change search tests to use mock cache.
  [ticket/11255] Fix dbal write sequence test to run standalone.
2012-12-08 14:11:34 +01:00
Nathan Guse
8a28271dd5 [ticket/11257] Do not require set_name() method to exist
To use Service Collection

PHPBB3-11257
2012-12-07 21:25:42 -06:00
Andreas Fischer
b7b8fefdd0 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10205] Reduce nesting in mysql drivers.
  [ticket/10205] Rewrite _sql_error implementations to have a single return.
  [ticket/10205] Cosmetic changes.
  [ticket/10205] Add some columns to the empty fixture file for mssqlnative.
  [ticket/10205] Delete stray return.
  [ticket/10205] Test failed connection attempts.
  [ticket/10205] Check for function existence in mssql connect method.
  [ticket/10205] Convert mssqlnative driver to the same logic.
  [ticket/10205] Fix a parse error in oracle driver.
  [ticket/10205] Fix remaining db drivers.
  [ticket/10205] Avoid calling mysqli functions when mysqli is missing.
  [ticket/10205] Account for potentially missing extensions in dbal.

Conflicts:
	tests/fixtures/empty.xml
2012-12-08 03:08:21 +01:00
Andreas Fischer
b5f94a14f1 Merge remote-tracking branch 'p/ticket/10205' into develop-olympus
* p/ticket/10205:
  [ticket/10205] Reduce nesting in mysql drivers.
  [ticket/10205] Rewrite _sql_error implementations to have a single return.
  [ticket/10205] Cosmetic changes.
  [ticket/10205] Add some columns to the empty fixture file for mssqlnative.
  [ticket/10205] Delete stray return.
  [ticket/10205] Test failed connection attempts.
  [ticket/10205] Check for function existence in mssql connect method.
  [ticket/10205] Convert mssqlnative driver to the same logic.
  [ticket/10205] Fix a parse error in oracle driver.
  [ticket/10205] Fix remaining db drivers.
  [ticket/10205] Avoid calling mysqli functions when mysqli is missing.
  [ticket/10205] Account for potentially missing extensions in dbal.
2012-12-08 03:04:05 +01:00
Oleg Pudeyev
ebc15a8b6c Merge PR #1127 branch 'igorw/ticket/11256' into develop
* igorw/ticket/11256:
  [ticket/11256] Remove unused controller.provider service
  [ticket/11256] Remove unused service with non-existent class
2012-12-07 20:35:18 -05:00
Igor Wiedler
2973539760 [ticket/11256] Remove unused controller.provider service
PHPBB3-11256
2012-12-07 23:18:38 +01:00
Igor Wiedler
cf956e8f53 [ticket/11256] Remove unused service with non-existent class
PHPBB3-11256
2012-12-07 23:14:07 +01:00
Oleg Pudeyev
5af3d14af3 [ticket/11255] Change search tests to use mock cache.
PHPBB3-11255
2012-12-07 15:32:26 -05:00
Oleg Pudeyev
5b368dd53a [ticket/11255] Fix dbal write sequence test to run standalone.
PHPBB3-11255
2012-12-07 15:32:06 -05:00
Igor Wiedler
108a6c35a6 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11248] Line endings to LF.

Conflicts:
	tests/session/append_sid_test.php
2012-12-07 19:13:42 +01:00
Igor Wiedler
a8deb7f87b Merge remote-tracking branch 'p/ticket/11248' into develop-olympus
* p/ticket/11248:
  [ticket/11248] Line endings to LF.
2012-12-07 19:09:12 +01:00
Oleg Pudeyev
b0948fb347 Merge PR #607 branch 'nickvergessen/ticket/10679' into develop
* nickvergessen/ticket/10679:
  [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
  [ticket/10679] Use module_auth to limit access to the module
  [ticket/10679] Add new permission for changing profile field information
2012-12-07 08:32:13 -05:00
Joas Schilling
c23d2457e9 [ticket/10679] Update module basename, we added the xcp_ prefix in 3.1
PHPBB3-10679
2012-12-07 12:50:21 +01:00
Oleg Pudeyev
ff993ba9d3 [ticket/10972] Drop user deletion.
Users should not be deleted in tests that test user creation.
Tests should use unique user names to avoid collisions.

User deletion should use user_remove anyway.

PHPBB3-10972
2012-12-06 23:49:27 -05:00
Oleg Pudeyev
fb5c4440e5 [ticket/10972] Tweak user addition.
Always add users, do not keep track of which users have been added.
The tests should know whether users they want exist or not.

Use more unique user names in tests for robustness.

Added some more assertions here and there.

PHPBB3-10972
2012-12-06 23:45:17 -05:00
Oleg Pudeyev
1285bdff00 [ticket/10972] Add destroy method to mock cache.
I actually needed the version that destroys tables, therefore
I ended up writing a mock null cache. This code is currently unused
but will probably be handy at some point.

PHPBB3-10972
2012-12-06 23:42:13 -05:00
Oleg Pudeyev
771bb957ab [ticket/10972] Add mock null cache.
The mock cache has instrumentation methods and therefore is non-trivial
to implement. For those times when we don't care that the cache caches,
null cache is a simpler implementation.

PHPBB3-10972
2012-12-06 23:41:02 -05:00
Oleg Pudeyev
ebdd96592a [ticket/10972] Backport get_db from develop.
PHPBB3-10972
2012-12-06 22:45:12 -05:00
Fyorl
d33accb687 [ticket/10972] Added explicit checks for creating duplicate users.
PHPBB3-10972
2012-12-06 22:10:10 -05:00
Fyorl
cafc7feca1 [ticket/10972] Moved tests into appropriate places and added comments
PHPBB3-10972
2012-12-06 22:10:09 -05:00
Fyorl
7005002069 [ticket/10972] Added methods for creating and deleting basic users
Modified the login method to allow logging in of an arbitrary user.
Also added tests for the new functionality.

PHPBB3-10972
2012-12-06 22:10:09 -05:00
Joas Schilling
2f490293e4 [ticket/10679] Use module_auth to limit access to the module
PHPBB3-10679
2012-12-06 16:33:12 +01:00
Joas Schilling
4103c99a86 [ticket/10679] Add new permission for changing profile field information
The setting is copied from "Can use signature"

PHPBB3-10679
2012-12-06 15:10:29 +01:00
Oleg Pudeyev
2364d4b217 Merge PR #1101 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/11219] Only update sequences that are affected by a fixture
  [ticket/11219] Recreate Oracle sequences instead of altering them
  [ticket/11219] Add unit test for inserting into a sequence column
  [ticket/11219] Update sequence values after loading fixtures
2012-12-06 01:18:31 -05:00
Oleg Pudeyev
18bcb9f804 Merge PR #1101 branch 'Noxwizard/ticket/11219' into develop-olympus
* Noxwizard/ticket/11219:
  [ticket/11219] Coding guidelines and naming consistency changes
  [ticket/11219] Only update sequences that are affected by a fixture
  [ticket/11219] Recreate Oracle sequences instead of altering them
  [ticket/11219] Add unit test for inserting into a sequence column
  [ticket/11219] Update sequence values after loading fixtures
2012-12-06 01:16:55 -05:00
Patrick Webster
dbb54b217b [ticket/11219] Coding guidelines and naming consistency changes
PHPBB3-11219
2012-12-05 22:57:06 -06:00
Oleg Pudeyev
dc649ad3cd [ticket/11248] Line endings to LF.
PHPBB3-11248
2012-12-05 20:11:00 -05:00
Oleg Pudeyev
b07ae3fe59 Merge PR #1053 branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP

Conflicts:
	phpBB/includes/ucp/ucp_prefs.php
	phpBB/styles/prosilver/template/ucp_prefs_personal.html
2012-12-05 12:21:25 -05:00
Oleg Pudeyev
0f7cdfe9f4 Merge PR #1053 branch 'p/ticket/10841' into develop-olympus
* p/ticket/10841:
  [ticket/10841] Revert more whitespace changes.
  [ticket/10841] Revert whitespace changes.
  [ticket/10841] adding space after if
  [ticket/10841] removing unnecessary spacing
  [ticket/10841] changing affectedrows check to COUNT in sql
  [ticket/10841] Modifying style and language selectors in UCP
2012-12-05 12:15:27 -05:00
Oleg Pudeyev
a8e74f5292 [ticket/10841] Revert more whitespace changes.
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Oleg Pudeyev
0793f8e2e6 [ticket/10841] Revert whitespace changes.
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
120accb9d4 [ticket/10841] adding space after if
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
f7508c3f04 [ticket/10841] removing unnecessary spacing
PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
dd6983b14b [ticket/10841] changing affectedrows check to COUNT in sql
this sould reduce load and be faster. Also freeresult functions added

PHPBB3-10841
2012-12-05 12:07:37 -05:00
Senky
af064cdaad [ticket/10841] Modifying style and language selectors in UCP
Commit also deletes all unnecessary blank spaces at
the end of the lines in both ucp_prefs_personal.html

PHPBB3-10841
2012-12-05 12:07:37 -05:00
Andreas Fischer
4f947ebb47 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.

Conflicts:
	phpBB/includes/functions_messenger.php
2012-12-05 10:03:29 +01:00
Andreas Fischer
819206a336 Merge remote-tracking branch 'p/ticket/10602' into develop-olympus
* p/ticket/10602:
  [ticket/10602] Avoid a race condition.
  [ticket/10602] Use last_queue_run for its intended purpose.
2012-12-05 09:59:59 +01:00
Andreas Fischer
40343006a9 Merge remote-tracking branch 'p/ticket/11247' into develop
* p/ticket/11247:
  [ticket/11247] Fix wrong property reference in flock class.
2012-12-05 09:34:12 +01:00
Oleg Pudeyev
a8d02ffc27 [ticket/11247] Fix wrong property reference in flock class.
PHPBB3-11247
2012-12-05 01:54:29 -05:00
Oleg Pudeyev
1e50116c54 [ticket/10602] Avoid a race condition.
PHPBB3-10602
2012-12-05 00:57:24 -05:00