makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-27 05:38:52 +00:00
Code Issues Projects Releases Packages Wiki Activity
16091 commits 18 branches 192 tags 207 MiB
Commit graph

16091 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tabitha Backoff
9e5cde7f66 Ticket# 11477 - Allow customisation of "Board index" 2013-03-28 02:34:36 -04:00
Andreas Fischer
b583f6d8d9 Merge remote-tracking branch 'nickvergessen/ticket/11476' into develop 
* nickvergessen/ticket/11476:
  [ticket/11476] Remove pass-by-reference from sql_mutli_insert
 2013-03-27 17:55:42 +01:00
Joas Schilling
c629b2c7b3 [ticket/11476] Remove pass-by-reference from sql_mutli_insert 
The method never writes to the array passed by reference. So it can be
passed by value instead to avoid certain problems.

PHPBB3-11476
 2013-03-27 15:01:36 +01:00
Nils Adermann
b7778f7fde Merge remote-tracking branch 'github-bantu/ticket/11460' into develop 
* github-bantu/ticket/11460:
  [ticket/11460] Add default behaviour tests for notification and email types.
  [ticket/11460] Configure functional test board email using dummy SMTP data.
  [ticket/11460] Add test for whether post_email and topic_email are checked.
  [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case.
  [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix.
 2013-03-27 06:31:53 +01:00
Nils Adermann
c9aa39be5d Merge pull request #1318 from imkingdavid/ticket/11448 
[ticket/11448] Use of $user_id parameter to mark a user's notifications read
 2013-03-26 15:19:28 -07:00
Nils Adermann
59e0196846 Merge pull request #1319 from imkingdavid/ticket/11466 
[ticket/11466] Remove old database driver files from PHPUnit exclude
 2013-03-26 15:16:43 -07:00
David King
6ab9ef54a2 [ticket/11466] Remove old database driver files from PHPUnit exclude 
As per the ticket comments, these can simply be removed, rather than having to
be renamed to the new file locations.

PHPBB3-11466
 2013-03-26 17:21:35 -04:00
David King
6dddc22ec7 [ticket/11448] Use of $user_id parameter to mark a user's notifications read 
Currently, the $user_id is a parameter but is not used. This patch fixes that.

PHPBB3-11448
 2013-03-26 17:07:20 -04:00
Andreas Fischer
d3decaeedf [ticket/11460] Add default behaviour tests for notification and email types. 
PHPBB3-11460
 2013-03-24 23:42:13 +01:00
Andreas Fischer
02817158fc [ticket/11460] Configure functional test board email using dummy SMTP data. 
PHPBB3-11460
 2013-03-22 22:42:05 +01:00
Andreas Fischer
69df6b49db [ticket/11460] Add test for whether post_email and topic_email are checked. 
PHPBB3-11460
 2013-03-22 22:16:24 +01:00
Andreas Fischer
15aec0bbb2 [ticket/11460] Add methods for checkbox handling to phpbb_functional_test_case. 
PHPBB3-11460
 2013-03-21 03:07:50 +01:00
Oleg Pudeyev
8b464e87f0 Merge PR #1298 branch 'nickvergessen/ticket/11438' into develop 
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11438:
  [ticket/11438] Add spaces after # comment start and before \ line breaks
  [ticket/11438] Add helpful comments from sample config to ACP output
  [ticket/11438] Add empty sql_query_pre to delta-source
  [ticket/11438] Move backslash to concatenate the query strings correctly
  [ticket/11438] Update sphinx.sample.conf to one provided by config_generate()
 2013-03-20 11:43:14 -04:00
Andreas Fischer
1ac94699e4 [ticket/11460] Drop incorrect phpbb_notification_{type,method}_ prefix. 
PHPBB3-11460
 2013-03-19 19:25:34 +01:00
Joas Schilling
b51a66b60b Merge remote-tracking branch 'bantu/ticket/11457' into develop 
* bantu/ticket/11457:
  [ticket/11457] Remove check and include for set_var function. It's not used.
 2013-03-18 13:51:30 +01:00
Joas Schilling
99d0c7e62b Merge remote-tracking branch 'bantu/ticket/11455' into develop 
* bantu/ticket/11455:
  [ticket/11455] Restore alphabetic order (underscore first) in config/tables.yml
 2013-03-18 10:42:51 +01:00
Andreas Fischer
3c99a33e87 [ticket/11457] Remove check and include for set_var function. It's not used. 
PHPBB3-11457
 2013-03-17 18:58:43 +01:00
Andreas Fischer
76262f186f [ticket/11455] Restore alphabetic order (underscore first) in config/tables.yml 
PHPBB3-11455
 2013-03-17 18:31:49 +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
c50af28077 [ticket/11438] Add spaces after # comment start and before \ line breaks 
PHPBB3-11438
 2013-03-16 01:18:15 +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
Joas Schilling
2b2bbf787c [ticket/11438] Add helpful comments from sample config to ACP output 
PHPBB3-11438
 2013-03-15 08:23:39 +01:00
Joas Schilling
ef63c2db8b [ticket/11438] Add empty sql_query_pre to delta-source 
PHPBB3-11438
 2013-03-15 08:19:50 +01:00
Joas Schilling
8fe776dff7 [ticket/11438] Move backslash to concatenate the query strings correctly 
Was broken in 03d2c6413c

PHPBB3-11438
 2013-03-15 08:16:37 +01:00
Joas Schilling
dc7afd05eb [ticket/11438] Update sphinx.sample.conf to one provided by config_generate() 
PHPBB3-11438
 2013-03-15 08:06:45 +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