1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 12:03:21 +01:00

10190 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
Oleg Pudeyev
904bcb86a0 Merge branch 'ticket/callumacrae/7834' into develop-olympus
* ticket/callumacrae/7834:
  [ticket/7834] Topic time didn't update when first post was deleted
2011-02-24 20:56:42 -05:00
Oleg Pudeyev
e6ed55a9c1 Merge branch 'ticket/callumacrae/9872' into develop-olympus
* ticket/callumacrae/9872:
  [ticket/9872] Removed some useless code that broke delete_posts
2011-02-24 20:48:17 -05:00
Oleg Pudeyev
47dc492839 Merge branch 'ticket/callumacrae/9997' into develop-olympus
* ticket/callumacrae/9997:
  [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
2011-02-24 20:43:11 -05:00
Oleg Pudeyev
441755bf17 Merge branch 'ticket/nickvergessen/9874' into develop-olympus
* ticket/nickvergessen/9874:
  [ticket/9874] view_log() performs unneeded count query over all log entries.
2011-02-24 20:30:52 -05:00
Joas Schilling
a25238e0c1 [ticket/9874] view_log() performs unneeded count query over all log entries.
PHPBB3-9874
2011-02-25 00:04:48 +01:00
Igor Wiedler
5a5560d200 Merge branch 'ticket/p/10058' into develop-olympus
* ticket/p/10058:
  [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
2011-02-24 23:44:58 +01:00
Callum Macrae
9399c7c46b [ticket/7834] Topic time didn't update when first post was deleted
When the first post of a topic was deleted, the topic time didn't
update - it should have changed to the time of the next post.

This commit simply applies lefty74's patch posted in the ticket. It gets
the post time of the next post from the database, and updates the thread
accordingly.

This patch is not my work at all and all credits go to lefty74, I just
transferred it onto GitHub

PHPBB3-7834
2011-02-24 22:36:35 +00:00
Oleg Pudeyev
c4b3d3a089 [ticket/10058] Initialize $phpbb_root_path in mysql_upgrader.php.
Since knowledge base instructions tell users to place this script
in the root of the forum, use './' as phpbb root path. Actual
initialization code copied from check_flash_bbcodes.php.

PHPBB3-10058
2011-02-24 17:31:44 -05:00
Callum Macrae
e4497f4a15 [ticket/9997] Fixed an inconsistency in the Moderator Control Panel
The order of the Approve / Disapprove buttons was inconsistent in the
Moderator Control Panel - while on the main page and the moderation
queue itself the Approve button was to the right of the Disapprove
button, in the post details the Approve button was to the left of the
Disapprove button.

This very simple edit simply switches the position of these two buttons
in the post details page in the mcp.

PHPBB3-9995
2011-02-24 20:06:34 +00:00
Callum Macrae
e6219c83c7 [ticket/9872] Removed some useless code that broke delete_posts
When in the ACP, there is the option to delete a user and all their
posts. This would then call the user_delete function and define $mode as
'remove'.

On lines 485-521 was some code that would delete their topics, then
after that there would be a call to delete_posts - which would also
delete their topics. It would not update the board statistics, and the
thread count would remain the same, even though several had been
deleted. It stopped delete_topics functioning correctly, so
delete_topics would not update the board statistics either.

My solution to this is to delete lines 485-521 and allow delete_posts
to call delete_topics, thus updating the thread count in the statistics.

PHPBB3-9872
2011-02-24 14:53:44 +00:00
Joas Schilling
a875075cc8 [ticket/10036] Use image from configuration file for displaying online-status.
PHPBB3-10036
2011-02-24 12:57:28 +01:00
Andreas Fischer
5e2bbdb22b Merge branch 'ticket/p/10041' into develop-olympus
* ticket/p/10041:
  [ticket/10041] Use send_status_line more in download/file.php
2011-02-24 10:35:27 +01:00
Andreas Fischer
b10654e9a5 Merge branch 'ticket/p/10056' into develop-olympus
* ticket/p/10056:
  [ticket/10056] Corrected a typo in Firebird name.
2011-02-24 10:35:09 +01:00
Oleg Pudeyev
df92b7bdf2 Merge branch 'ticket/erikfrerejean/7778' into develop-olympus
* ticket/erikfrerejean/7778:
  [ticket/7778] Update all the schema files
  [ticket/7778] Add the column change to `mysql_upgrader.php`
  [ticket/7778] BBCode single limit
2011-02-23 22:02:39 -05:00
Erik Frèrejean
5dee60e54e [ticket/7778] Update all the schema files
Correct all the schema files to contain the new field type

PHPBB3-7778
2011-02-23 21:15:40 -05:00
Erik Frèrejean
1b88f5a316 [ticket/7778] Add the column change to mysql_upgrader.php
PHPBB3-7778
2011-02-23 21:15:40 -05:00
Erik Frèrejean
a7bc76d246 [ticket/7778] BBCode single limit
There are currently two hard limits for the number of BBCodes
allowed. One is enforced by the type of the `bbcode_id` column,
the other by an hard limit in `acp/acp_bbcode.php`. However this
limit can never be reached due to the size of the database column.

Suggested fix involves adding a new constant to define the max.
number of BBCodes (as with smilies) and chaning the database
column from a tinyint to a smallint to actually allow 1511 BBCodes

PHPBB3-7778
2011-02-23 21:15:40 -05:00
Oleg Pudeyev
a0f6e185ca [ticket/10056] Corrected a typo in Firebird name.
PHPBB3-10056
2011-02-23 20:16:23 -05:00
Oleg Pudeyev
786078d423 [ticket/10041] Use send_status_line more in download/file.php
PHPBB3-10041
2011-02-23 20:16:16 -05:00
Nils Adermann
510248da28 Merge branch 'ticket/naderman/10052' into develop-olympus
* ticket/naderman/10052:
  [ticket/10052] Add comments to the session testable factory.
  [ticket/10052] Correct session tests, and separate session factory from tests
2011-02-23 22:41:42 +01:00
Nils Adermann
cb56ab2dbd [ticket/10052] Add comments to the session testable factory.
PHPBB3-10052
2011-02-23 22:17:12 +01:00
Nils Adermann
11262afa93 [ticket/10052] Correct session tests, and separate session factory from tests
PHPBB3-10052
2011-02-23 18:33:20 +01:00
Oleg Pudeyev
15a5d2c4bf Merge branch 'ticket/nickvergessen/9675' into develop-olympus
* ticket/nickvergessen/9675:
  [ticket/9675] Correctly check whether the style/component is still in use.
  [ticket/9675] Put the code into methods to avoid code duplication.
  [ticket/9675] Adjust the language-string to reflect the changes.
  [ticket/9675] Add option to delete template/theme/imageset when deleting style.
2011-02-21 20:47:31 -05:00