1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-26 04:52:36 +01:00

11046 Commits

Author SHA1 Message Date
Oleg Pudeyev
c177ba7a4e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9915] "Length of ban:" is not displayed in ACP
2011-03-02 20:47:06 -05:00
Oleg Pudeyev
57ab0816e2 Merge branch 'ticket/nickvergessen/9915' into develop-olympus
* ticket/nickvergessen/9915:
  [ticket/9915] "Length of ban:" is not displayed in ACP
2011-03-02 20:46:28 -05:00
Joas Schilling
5c2243360d Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10072] Added the POST_NUMBER template var
2011-03-03 00:26:32 +01:00
Joas Schilling
1b97506ec5 Merge branch 'ticket/samt/10072' into develop-olympus
* ticket/samt/10072:
  [ticket/10072] Added the POST_NUMBER template var
2011-03-03 00:14:24 +01:00
Sam Thompson
4c565774bf [ticket/10072] Added the POST_NUMBER template var
PHPBB3-10072
2011-03-02 23:41:11 +01:00
Oleg Pudeyev
e552287128 [ticket/9824] Accept commit messages with less than perfect headings.
Some commit messages exist only temporarily, because they are given
on commits that are intended to be squashed. Accept such commit
messages with a warning.

PHPBB3-9824
2011-03-01 20:59:04 -05:00
Oleg Pudeyev
d7a38fd7ef [ticket/9824] Allow empty lines after ticket reference.
PHPBB3-9824
2011-03-01 20:59:04 -05:00
Oleg Pudeyev
b90e01392c [ticket/9824] Use printf instead of echo to render \n.
On FreeBSD `echo "\n"` prints \n verbatim. Use printf instead.

PHPBB3-9824
2011-03-01 20:59:04 -05:00
Oleg Pudeyev
c489b189df [ticket/9824] Handle empty commit messages in commit-msg hook.
Git already handles the case of commit message being empty by
aborting the commit and displaying a reasonably helpful message.
If there is no commit message, the hook will exit with success
exit code to let git do its thing.

PHPBB3-9824
2011-03-01 20:59:04 -05:00
Oleg Pudeyev
36e96bbc6a [ticket/10059] Fix two misspellings of consistent.
PHPBB3-10059
2011-03-01 19:53:12 -05:00
Andreas Fischer
9bed2b119c [ticket/9824] Add space after [ticket/12345] in prepared commit message.
PHPBB3-9824
2011-03-02 00:24:34 +01:00
Andreas Fischer
16a46e6a24 [ticket/9824] Remove space after PHPBB3-12345 in prepared commit message.
PHPBB3-9824
2011-03-02 00:04:45 +01:00
Oleg Pudeyev
5debf22ba5 Merge branch 'ticket/bantu/9766' into develop
* ticket/bantu/9766:
  [ticket/9766] Delete delete_code() from CAPTCHA classes as it's never called.
2011-03-01 18:02:38 -05:00
Andreas Fischer
1bb8dad941 Merge branch 'ticket/p/10070' into develop
* ticket/p/10070:
  [ticket/10070] Fixed line endings after ticket/9549.
2011-03-01 23:54:43 +01:00
Oleg Pudeyev
7554469b6b [ticket/10070] Fixed line endings after ticket/9549.
PHPBB3-10070
2011-03-01 17:47:42 -05:00
Andreas Fischer
f0facd4c9d [ticket/9766] Delete delete_code() from CAPTCHA classes as it's never called.
Delete phpbb_default_captcha:delete_code() and phpbb_captcha_qa::delete_code()
methods. We never call it and it has a bogus body.

PHPBB3-9766
2011-03-01 23:28:14 +01:00
Oleg Pudeyev
448df1cdf5 Merge branch 'ticket/9549' into develop
* ticket/9549:
  [ticket/9549] Display users in their primary group instead of their first group
  [ticket/9549] Change default value of "sort legend by group name" to false.
  [ticket/9549] Fix displaying empty groups
  [ticket/9549] Fix language strings.
  [ticket/9549] Only add group to legend/teampage when the checkbox is checked.
  [ticket/9549] New method move() to move a group more than 1 up/down.
  [ticket/9549] Fix some minor issues with descriptions and coding-guidelines.
  [ticket/9549] Throw an error when the given field-name is invalid.
  [ticket/9549] Make the class non static and extend delete_group function.
  [ticket/9549] Add template changes for subsilver2.
  [ticket/9549] Enhance teampage and legend functionality
  [ticket/9549] Add the module and files for the ACP.
  [ticket/9549] Update database with the new config values and columns
  [ticket/9549] Enhance teampage functionality with a new class, group_positions.

Conflicts:
	phpBB/install/database_update.php
2011-03-01 16:57:00 -05:00
Andreas Fischer
6c49f95b01 Merge branch 'feature/igorw/request-class' into develop
* feature/igorw/request-class:
  [feature/request-class] Fix the error message when accessing superglobal
2011-03-01 22:26:08 +01:00
Joas Schilling
51b985399d [ticket/9911] Correctly open "Minimum posts" on editing a rank in IE.
IE handles onchange after the next click on the page, instead of directly like Firefox, Opera and Safari do. Changing it to onclick works.

PHPBB3-9911
2011-03-01 17:03:06 +01:00
Joas Schilling
25c738ccdb [ticket/9915] "Length of ban:" is not displayed in ACP
Regression from PHPBB3-9695, innerHTML does not work on input-fields, so we
need to go back to "value", which we had before.

PHPBB3-9915
2011-03-01 16:48:04 +01:00
Oleg Pudeyev
79caaa455e Merge branch 'ticket/nickvergessen/7938' into develop
* ticket/nickvergessen/7938:
  [ticket/7938] Display information about unread and new PMs in the header.
2011-02-28 19:55:58 -05:00
Joas Schilling
8fee84a68a [ticket/7938] Display information about unread and new PMs in the header.
PHPBB3-7938
2011-03-01 01:11:53 +01:00
Igor Wiedler
597311ba6b [feature/request-class] Fix the error message when accessing superglobal
Adjust the misleading "This error message was generated" text.

PHPBB3-9716
2011-02-28 08:04:40 +01:00
Igor Wiedler
80a063ac34 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10024] Populate unread information to template for styling issues.
2011-02-28 01:03:55 +01:00
Igor Wiedler
bda64edae8 Merge branch 'ticket/nickvergessen/10024' into develop-olympus
* ticket/nickvergessen/10024:
  [ticket/10024] Populate unread information to template for styling issues.
2011-02-28 01:03:44 +01:00
Igor Wiedler
ab3f45c0e9 Merge branch 'ticket/hanakin/10001' into develop
* ticket/hanakin/10001:
  [ticket/10001]  Created the new styles within colours.css to handle the displaying of the forum & topic images
  [ticket/10001]  Created new Template variable to house class names based on $folder_img value, Modified prosilver template files to utilize class for forum & topic images through out template via the newly created Template variable, Created the new styles within colours.css to handle the displaying of the forum & topic images
2011-02-28 00:07:59 +01:00
Philippe Chevrier
ffe691db10 [ticket/10024] Populate unread information to template for styling issues.
PHPBB3-10024
2011-02-28 00:00:56 +01:00
Igor Wiedler
f49b8a0e3e Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
2011-02-27 23:18:33 +01:00
Igor Wiedler
23475abab3 Merge branch 'ticket/raimon/9980' into develop-olympus
* ticket/raimon/9980:
  [ticket/9980] URLs to javascript should be T_SUPER_TEMPLATE_PATH instead of T_TEMPLATE_PATH
2011-02-27 23:18:10 +01:00
Nils Adermann
ea82c6d22c Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9984] Add a phing target that does not create packages.
2011-02-27 23:06:01 +01:00
Nils Adermann
dc112092e0 Merge branch 'ticket/naderman/9984' into develop-olympus
* ticket/naderman/9984:
  [ticket/9984] Add a phing target that does not create packages.
2011-02-27 23:04:54 +01:00
Nils Adermann
dd1c12c758 [ticket/9984] Add a phing target that does not create packages.
PHPBB3-9984
2011-02-27 23:01:14 +01:00
Igor Wiedler
5913aef58f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [task/session-tests] Make result check independent of returned row order.
  [task/session-tests] By default the cache check now skips over db server info
  [task/session-tests] Correctly display message on session continue test failure
  [task/session-tests] Make the session id replacement of dataset values clearer

Conflicts:
	tests/mock/cache.php
2011-02-27 22:52:56 +01:00
Igor Wiedler
80a335f538 Merge branch 'task/session-tests' into develop-olympus
* task/session-tests:
  [task/session-tests] Make result check independent of returned row order.
  [task/session-tests] By default the cache check now skips over db server info
  [task/session-tests] Correctly display message on session continue test failure
  [task/session-tests] Make the session id replacement of dataset values clearer
2011-02-27 22:48:22 +01:00
Igor Wiedler
05a2976097 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10009] Entries are always posts, update fields accordingly.
  [ticket/10009] Always show 'published' data in feed item statistics.
  [ticket/10009] Make atom:update output unconditional and before atom:published
  [ticket/10009] Send atom:updated whenever possible
  [ticket/10009] Differentiate published from updated in Atom feed
2011-02-27 22:27:32 +01:00
Igor Wiedler
2163059632 Merge branch 'ticket/bantu/10009' into develop-olympus
* ticket/bantu/10009:
  [ticket/10009] Entries are always posts, update fields accordingly.
  [ticket/10009] Always show 'published' data in feed item statistics.
  [ticket/10009] Make atom:update output unconditional and before atom:published
  [ticket/10009] Send atom:updated whenever possible
  [ticket/10009] Differentiate published from updated in Atom feed
2011-02-27 22:27:21 +01:00
Nils Adermann
921603b09e [task/session-tests] Make result check independent of returned row order.
PHPBB3-9732
2011-02-27 22:20:36 +01:00
Nils Adermann
7255ef4f6d [task/session-tests] By default the cache check now skips over db server info
PHPBB3-9732
2011-02-27 22:17:03 +01:00
Nils Adermann
bbf3864cb4 [task/session-tests] Correctly display message on session continue test failure
PHPBB3-9732
2011-02-27 22:16:39 +01:00
Nils Adermann
3d65c3c104 [task/session-tests] Make the session id replacement of dataset values clearer
PHPBB3-9732
2011-02-27 22:06:01 +01:00
Andreas Fischer
da2628330b Merge branch 'ticket/p/8641' into develop
* ticket/p/8641:
  [ticket/8641] Added/removed several commas for consistency in acp_board.php.
2011-02-26 18:17:57 +01:00
Andreas Fischer
cee6014ccf Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10036] Use image from configuration file for displaying online-status.
2011-02-26 18:17:50 +01:00
Andreas Fischer
b1d6c0a7a1 Merge branch 'ticket/nickvergessen/10036' into develop-olympus
* ticket/nickvergessen/10036:
  [ticket/10036] Use image from configuration file for displaying online-status.
2011-02-26 18:17:39 +01:00
mtrs
1d122f56bb [ticket/8641] Added/removed several commas for consistency in acp_board.php.
PHPBB3-8641
2011-02-26 08:37:01 -05:00
Oleg Pudeyev
bbc531061f Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
2011-02-26 08:05:55 -05:00
Oleg Pudeyev
14fc25b252 Merge branch 'ticket/bantu/9912' into develop-olympus
* ticket/bantu/9912:
  [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
2011-02-26 08:05:43 -05:00
Andreas Fischer
3b15fe0a5b [ticket/9912] Fix error in logic. Do not strip SID when user is not a bot.
This also moves the code up to the point where we know that the user is a bot.

Regression from d07e152ea7e820c5a0e47aeb8004fa0b5621a314

PHPBB3-9912
2011-02-25 22:24:34 -05:00
Andreas Fischer
cacead09a5 Merge branch 'develop-olympus' into develop
* develop-olympus:
  [ticket/10060] Fix test suite under MySQL
2011-02-25 16:59:12 +01:00
Andreas Fischer
0c23d6c069 Merge branch 'ticket/igorw/10060' into develop-olympus
* ticket/igorw/10060:
  [ticket/10060] Fix test suite under MySQL
2011-02-25 16:58:58 +01:00
Igor Wiedler
c8ad006b71 [ticket/10060] Fix test suite under MySQL
Regression from PHPBB3-10043, a typo caused the database tests to fail
under MySQL.

PHPBB3-10060
2011-02-25 16:37:20 +01:00