1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-02 12:34:59 +02:00

16069 Commits

Author SHA1 Message Date
Andreas Fischer
58d7acbf5a [ticket/11452] Now notification_method_email checks whether user has address.
Make sure the user has an email address set before offering email
notifications. The address could be missing for whatever reason, e.g. external
authentication. This is also consistent with XMPP/Jabber now.

PHPBB3-11452
2013-03-17 19:54:32 +01:00
Andreas Fischer
51c1ba12c1 Merge remote-tracking branch 'nickvergessen/ticket/11443' into develop
* nickvergessen/ticket/11443:
  [ticket/11443] Fix Migrator Modules Tool by creating a phpbb_log object
  [ticket/11443] Add _test suffix to migration test filenames
2013-03-16 01:44:36 +01:00
Joas Schilling
4168cfd7e6 [ticket/11443] Fix Migrator Modules Tool by creating a phpbb_log object
PHPBB3-11443
2013-03-16 01:24:50 +01:00
Joas Schilling
afd3681208 Merge remote-tracking branch 'bantu/ticket/11441' into develop
* bantu/ticket/11441:
  [ticket/11441] Split user loader tests into multiple test methods.
  [ticket/11441] Use setUp() in phpbb_user_loader_test.
  [ticket/11441] Update/correct copyright year of user loader test.
  [ticket/11441] Correct/fix class name of user loader test.
  [ticket/11441] Add _test prefix to user loader test filename.
2013-03-15 19:06:54 +01:00
Joas Schilling
02fd181198 Merge remote-tracking branch 'bantu/ticket/11439' into develop
* bantu/ticket/11439:
  [ticket/11439] Add _test suffix to notification test filename.
2013-03-15 10:31:59 +01:00
Joas Schilling
2cd1c62403 [ticket/11443] Add _test suffix to migration test filenames
PHPBB3-11443
2013-03-15 10:23:14 +01:00
Andreas Fischer
15cade3dc5 [ticket/11439] Add _test suffix to notification test filename.
PHPBB3-11439
2013-03-15 10:21:09 +01:00
Andreas Fischer
ba460d98f1 [ticket/11441] Split user loader tests into multiple test methods.
PHPBB3-11441
2013-03-15 01:36:05 +01:00
Andreas Fischer
ef1caf6933 [ticket/11441] Use setUp() in phpbb_user_loader_test.
PHPBB3-11441
2013-03-15 01:32:33 +01:00
Andreas Fischer
e1e9138c3b [ticket/11441] Update/correct copyright year of user loader test.
PHPBB3-11441
2013-03-15 01:28:27 +01:00
Andreas Fischer
3c09612d36 [ticket/11441] Correct/fix class name of user loader test.
PHPBB3-11441
2013-03-15 01:26:26 +01:00
Andreas Fischer
eabcbb9baf [ticket/11441] Add _test prefix to user loader test filename.
PHPBB3-11441
2013-03-15 01:25:10 +01:00
Nathan Guse
d4ee7718b9 Merge remote-tracking branch 'remotes/Marc/ticket/11404' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11404:
  [ticket/11404] Remove version ID from manager_test.php file header
  [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
  [ticket/11404] Convert manager_test to UNIX line endings
  [ticket/11404] Use a default data row if $row is empty in clean_row()
  [ticket/11404] Return empty array of avatar data if $row is empty
2013-03-12 14:48:07 -05:00
Nathan Guse
739dbd9e31 Merge remote-tracking branch 'remotes/Marc/ticket/11433' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11433:
  [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
2013-03-12 14:41:54 -05:00
Nathan Guse
04aceaecb6 Merge remote-tracking branch 'remotes/nickv/ticket/11310' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11310:
  [ticket/11310] Add hashes to action links to prevent CSRF attacks
2013-03-12 11:41:21 -05:00
Joas Schilling
5eef287646 [ticket/11310] Add hashes to action links to prevent CSRF attacks
PHPBB3-11310
2013-03-12 17:19:30 +01:00
Marc Alexander
d378f5ac32 [ticket/11433] Rename CSS class "jalert" to "phpbb_alert"
This missing change caused the loading info to appear during ajax
requests. With this patch it will be properly hidden as it should.

PHPBB3-11433
2013-03-12 15:15:21 +01:00
Marc Alexander
4ad8fcbd58 [ticket/11404] Remove version ID from manager_test.php file header
PHPBB3-11404
2013-03-11 10:35:18 +01:00
Marc Alexander
fb1984dadb [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
PHPBB3-11404
2013-03-11 10:34:25 +01:00
Marc Alexander
2ec0dc5b34 [ticket/11404] Convert manager_test to UNIX line endings
PHPBB3-11404
2013-03-11 10:34:12 +01:00
Nathaniel Guse
d6930df7a2 Merge remote-tracking branch 'remotes/dhruv/ticket/11303' into develop
# By Dhruv
# Via Dhruv
* remotes/dhruv/ticket/11303:
  [ticket/11303] rename attribute to timezone-preselect
  [ticket/11303] remove additional brackets
  [ticket/11303] use S_TZ_PRESELECT in subsilver
  [ticket/11303] add S_TZ_PRESELECT template var
2013-03-09 19:08:51 -06:00
Nathaniel Guse
3f5d938a95 Merge remote-tracking branch 'remotes/marc/ticket/11323' into develop
# By Marc Alexander
# Via Marc Alexander
* remotes/marc/ticket/11323:
  [ticket/11323] Reduce additional code and revert regex to previous one
  [ticket/11323] Enable tests for inclusion of defined variables
  [ticket/11323] Correctly treat variables in template defines
2013-03-09 19:02:44 -06:00
Nathaniel Guse
48bad80f4a Merge remote-tracking branch 'remotes/Blitze/ticket/11383' into develop
# By OpenShift guest
# Via OpenShift guest
* remotes/Blitze/ticket/11383:
  [ticket/11383] Correctly revert modules added/removed by migrator
2013-03-09 18:33:19 -06:00
David King
606e392d40 Merge remote-tracking branch 'EXreaction/ticket/11423' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11423:
  [ticket/11423] Send unformatted usernames to the email template
2013-03-09 18:38:05 -05:00
Nathaniel Guse
36de18e174 [ticket/11423] Send unformatted usernames to the email template
PHPBB3-11423
2013-03-09 09:12:46 -06:00
Nathan Guse
7bb32d27ac Merge remote-tracking branch 'remotes/nickv/ticket/11421' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11421:
  [ticket/11421] Correctly display submit button when needed
2013-03-07 11:33:33 -06:00
Nathan Guse
683e17c403 Merge remote-tracking branch 'remotes/nickv/ticket/11417' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11417:
  [ticket/11417] FIx submit button description on notifications options page
2013-03-07 11:33:02 -06:00
Nathan Guse
e826edb6fe Merge remote-tracking branch 'remotes/nickv/ticket/11390' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11390:
  [ticket/11390] Correctly separate list of notifications from header
  [ticket/11390] Hide pagination when there are no notifications
2013-03-07 11:32:17 -06:00
Nathan Guse
0c8c8484d0 Merge remote-tracking branch 'remotes/nickv/ticket/11407' into develop
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/11407:
  [ticket/11407] Fix <dfn> description of "notification" option.
2013-03-07 11:31:29 -06:00
Marc Alexander
bb58462724 [ticket/11404] Use a default data row if $row is empty in clean_row()
A statically defined $default_row will be used inside the
phpbb_avatar_manager::clean_row() method if the $row passed to it is
empty.

PHPBB3-11404
2013-03-07 13:03:27 +01:00
Joas Schilling
d219eafa16 [ticket/11407] Fix <dfn> description of "notification" option.
PHPBB3-11407
2013-03-07 12:18:53 +01:00
Joas Schilling
7ac945358e [ticket/11390] Correctly separate list of notifications from header
PHPBB3-11390
2013-03-07 11:39:55 +01:00
Joas Schilling
899d857929 [ticket/11390] Hide pagination when there are no notifications
PHPBB3-11390
2013-03-07 11:39:33 +01:00
Joas Schilling
2caf7fbf12 [ticket/11417] FIx submit button description on notifications options page
PHPBB3-11417
2013-03-07 11:30:02 +01:00
Joas Schilling
300a42f5b8 [ticket/11421] Correctly display submit button when needed
PHPBB3-11421
2013-03-07 11:14:01 +01:00
David King
d658d6640b Merge remote-tracking branch 'EXreaction/ticket/11408' into develop
# By Nathaniel Guse
# Via Nathaniel Guse
* EXreaction/ticket/11408:
  [ticket/11408] user_jabber instead of jabber
2013-03-06 17:01:30 -05:00
Nathan Guse
9ca15267fa Merge remote-tracking branch 'remotes/bantu/ticket/10202' into develop
# By Andreas Fischer
# Via Andreas Fischer
* remotes/bantu/ticket/10202:
  [ticket/10202] Rename method names _all() to _array().
  [ticket/10202] Add migration file for config_db_text.
  [ticket/10202] Upgrade TEXT to the bigger MTEXT.
  [ticket/10202] Improve method documentation.
  [ticket/10202] SQL escape the table name.
  [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
  [ticket/10202] Define phpbb_config_db_text as a service.
  [ticket/10202] Add tests for phpbb_config_db_text.
  [ticket/10202] Adjust method names to guidelines.
  [ticket/10202] Add database schema for phpbb_config_db_text.
  [ticket/10202] Implementation of config options with arbitrary length values.
2013-03-06 15:36:15 -06:00
David King
02758cabbc Merge remote-tracking branch 'nickvergessen/ticket/11166' into develop
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11166:
  [ticket/11166] Add ajaxify support to normal ACP confirm_box()
  [ticket/11166] Fix several custom confirm templates in prosilver
  [ticket/11166] Add caption to AJAX confirm box default template
  [ticket/11166] Fix typo in comment
  [ticket/11166] Use provided custom templates on AJAX confirm box
2013-03-06 12:07:46 -05:00
Nathaniel Guse
3aab72d79b [ticket/11408] user_jabber instead of jabber
PHPBB3-11408
2013-03-06 09:53:41 -06:00
Marc Alexander
5963905825 [ticket/11404] Return empty array of avatar data if $row is empty
While creating a group in the acp, the group data ($group_row) is empty.
Due to that array_combine in phpbb_avatar_manager::clean_row() will cause
PHP Warnings. In addition to that the required indexes 'avatar',
'avatar_width', 'avatar_height', and 'avatar_type' won't be defined. This
patch will solve that issue.

PHPBB3-11404
2013-03-06 11:32:23 +01:00
Joas Schilling
0bbde4c122 Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166
* 'develop' of https://github.com/phpbb/phpbb3: (799 commits)
  [ticket/11402] Fix undefined index in post/topic_in_queue
  [ticket/11400] If email is disabled, disable it for notifications
  [ticket/11398] Correctly call permission_set method in permission tool
  [ticket/11394] Relax Migration Tools
  [ticket/11386] Fix missing ;
  [ticket/10714] Get log from container in install, update and download/file
  [feature/avatars] Update module_auth of ucp module and fix small issues
  [ticket/11396] Rename insert_migration to set_migration_state
  [ticket/11395] Prevent acp_modules::get_modules_info from reincluding files
  [ticket/11393] Give more information on database updater
  [ticket/11386] Send list of migrations instead of using load_migrations
  [feature/avatars] Add migrations data file for avatars
  [feature/avatars] Reduce module auth of ucp avatar settings
  [ticket/10714] Use $phpbb_adm_relative_path instead of hardcoded adm/
  [ticket/10714] Logs are disabled for this page call only
  [ticket/6723] Show info that message has been deleted before delivery
  [ticket/11385] Fix issue with migration module tool not getting extension module info
  [ticket/11386] Fix failing tests from constructor changes
  [ticket/11386] Fix circular reference error & serialize error
  [ticket/11386] Remove tests that check if finder cache is working
  ...

Conflicts:
	phpBB/assets/javascript/core.js
2013-03-06 07:35:47 +01:00
Andreas Fischer
32ff2348f1 [ticket/10202] Rename method names _all() to _array().
PHPBB3-10202
2013-03-05 23:15:46 +01:00
Andreas Fischer
3a4b34ca32 [ticket/10202] Add migration file for config_db_text.
PHPBB3-10202
2013-03-05 22:59:58 +01:00
Andreas Fischer
5158224845 [ticket/10202] Upgrade TEXT to the bigger MTEXT.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
0071ad3bfd [ticket/10202] Improve method documentation.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
af02681960 [ticket/10202] SQL escape the table name.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
95764c4f0e [ticket/10202] Add $this->db->sql_freeresult($result) to SELECT queries.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
722092fe54 [ticket/10202] Define phpbb_config_db_text as a service.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
828c6c01bb [ticket/10202] Add tests for phpbb_config_db_text.
PHPBB3-10202
2013-03-05 22:59:57 +01:00
Andreas Fischer
a73b76cb24 [ticket/10202] Adjust method names to guidelines.
PHPBB3-10202
2013-03-05 22:59:57 +01:00