mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity
16,254 Commits 17 Branches 190 Tags
Commit Graph

16254 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
c9e7247ab4 [ticket/11445] Add abstract class phpbb_notification_method_messenger_base. 
PHPBB3-11445
 2013-03-16 21:50:30 +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
erangamapa
21a9462553 [ticket/11106] Added missing line breaks. 
Added two missing line breaks into 'edited by' message.

PHPBB3-11106
 2013-03-16 00:05:12 +05:30
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
David King
aaee4c69d9 Merge pull request #7 from nickvergessen/ticket/imkingdavid/11334-2 
[ticket/11334] Allow parameters to be specified in the route
 2013-03-15 09:49:26 -07:00
Joas Schilling
3b0cdc5362 [ticket/11334] Allow parameters to be specified in the route 
PHPBB3-11334
 2013-03-15 15:21:15 +01:00
Joas Schilling
9157095cda [ticket/11334] Fix copyright year in test file 
PHPBB3-11334
 2013-03-15 09:18:15 -04:00
Joas Schilling
076711d9a9 [ticket/11334] Use mocks instead of making parameters optional 
PHPBB3-11334
 2013-03-15 09:18:14 -04:00
Joas Schilling
9259e635ca [ticket/11334] Move unit tests for helper->url() into own file 
PHPBB3-11334
 2013-03-15 09:18:13 -04:00
Joas Schilling
ff9a0e4ef4 [ticket/11334] Expand functionality of helper->url() 
Expanded the functionality of helper->url() to support all parameters of
append_sid() itself.

PHPBB3-11334
 2013-03-15 09:18:12 -04:00
Joas Schilling
cd697e6812 [ticket/11334] Include functions.php and fix class name in tests 
PHPBB3-11334
 2013-03-15 09:18:11 -04:00
David King
5850a2cbf6 [ticket/11334] Remove extraneous period 
PHPBB3-11334
 2013-03-15 09:18:10 -04:00
David King
48aefb13b0 [ticket/11334] Make $phpbb_dispatcher global, as done in append_sid test 
PHPBB3-11334
 2013-03-15 09:18:09 -04:00
David King
5e89ce1898 [ticket/11334] Make url helper method public 
PHPBB3-11334
 2013-03-15 09:18:08 -04:00
David King
d3e2fae66d [ticket/11334] Add a test for the controller helper URL method 
PHPBB3-11334
 2013-03-15 09:18:07 -04:00
David King
8c512b0d2d [ticket/11334] Properly generate controller URL until paths issue gets fixed 
PHPBB3-11334
 2013-03-15 09:18:06 -04: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 03d2c6413c25b1faf7f37ff20625ce986b19eb88

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
Andreas Fischer
1694dc6e28 [ticket/11440] Cast values of the $user_ids array to integer before sql_in_set. 
PHPBB3-11440
 2013-03-15 01:22:00 +01:00
Andreas Fischer
b17c0aa098 [ticket/11440] Remove useless/incorrect comment. 
PHPBB3-11440
 2013-03-15 01:21:12 +01:00
Joas Schilling
1fd5be859e [ticket/11362] Add unit test for ../ in directory paths 
PHPBB3-11362
 2013-03-12 22:45:44 +01:00
Joas Schilling
567eefb2bd [ticket/11362] Correctly sanitise the directory path 
We need to correctly remove ../ form the path if possible by removing the
previous folder aswell. Otherwise the finder is unable to locate /adm/style
directories in extensions as he is looking for /adm/../adm/style instead.

PHPBB3-11362
 2013-03-12 22:35:31 +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
erangamapa
df98de971c [ticket/11106] Undefined index EDITED_TIME_TOTAL notice. 
When viewing a private message, when message edit count is 1
Undefined index EDITED_TIME_TOTAL php notice appears. Changed
the message formatting method to what is used in viewtopic.php.

PHPBB3-11106
 2013-03-12 10:19:29 +05:30
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
6704a82bbe [ticket/11422] Increment assets when database_update is complete 
PHPBB3-11422
 2013-03-10 13:02:31 -05: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