| Commit message (Collapse) | Author | Age | Files | Lines |
| |\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/8610] Update comment
[ticket/8610] Do not use requests to submit posts except in posting_test.php
[ticket/8610] Move posting helpers to separate file
[ticket/8610] Create helper functions to create topic/post in functional tests
[ticket/8610] Use phpbb_update_rows_avoiding_duplicates
[ticket/8610] Revert some funky merging I did from rebase
[ticket/8610] Add some comments
[ticket/8610] Update Bookmarks and Subscriptions when splitting topics
[ticket/8610] Update Bookmarks when merging posts into another topic
[ticket/8610] Update Bookmarks when forking topics
[ticket/8610] Update Bookmarks when merging topics
|
| | |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
# By Oleg Pudeyev (29) and others
# Via Andreas Fischer (3) and others
* 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits)
[ticket/11262] Add .lock in cache directory to .gitignore
[ticket/11265] Add assertions for board installation success.
[ticket/11162] Reformat.
[ticket/10491] Make recreate_database static.
[ticket/11162] Rename tricky updates to database helper.
[ticket/10491] Install board once per test run.
[ticket/10972] Drop user deletion.
[ticket/10972] Tweak user addition.
[ticket/10972] Add destroy method to mock cache.
[ticket/10972] Add mock null cache.
[ticket/10972] Backport get_db from develop.
[ticket/10972] Added explicit checks for creating duplicate users.
[ticket/10972] Moved tests into appropriate places and added comments
[ticket/10972] Added methods for creating and deleting basic users
[ticket/11162] Use empty($queries).
[ticket/11162] Review comments fixed.
[ticket/11162] Reformat.
[ticket/11162] Newlines to LF.
[ticket/11162] Use correct functions.
[ticket/11162] Account for notify_status.
...
Conflicts:
phpBB/includes/mcp/mcp_topic.php
|
| | | |
| | |
| | |
| | | |
PHPBB3-8610
|
| | | |
| | |
| | |
| | | |
PHPBB3-8610
|
| | | |
| | |
| | |
| | | |
PHPBB3-8610
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Update bookmarks and subscriptions to add bookmarks/subscriptions to the
new topic when using the split_topic function
PHPBB3-8610
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Update bookmarks to the new topic when merging posts into another topic
using the merge_posts function.
PHPBB3-8610
|
| |\ \ \
| | |/
| |/|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus: (22 commits)
[ticket/11162] Reformat.
[ticket/11162] Rename tricky updates to database helper.
[ticket/11162] Use empty($queries).
[ticket/11162] Review comments fixed.
[ticket/11162] Reformat.
[ticket/11162] Newlines to LF.
[ticket/11162] Use correct functions.
[ticket/11162] Account for notify_status.
[ticket/11162] This test really only works for bookmarks.
[ticket/11162] The test is not at all trivial.
[ticket/11162] Add includes.
[ticket/11162] Move to a separate file to avoid blowing out functions.php.
[ticket/11162] No whitespace changes in olympus.
[ticket/11162] Fix inaccurately copy pasted comment.
[ticket/11162] Use phpbb_update_rows_avoiding_duplicates in mcp.
[ticket/11162] Clarify that only the two tables actually work.
[ticket/11162] Uncomment transactions.
[ticket/11162] An implementation that actually works.
[ticket/11162] Make count function upper case.
[ticket/11162] Rename count variable name to remaining_rows.
...
|
| | | |
| | |
| | |
| | | |
PHPBB3-11162
|
| | | |
| | |
| | |
| | | |
PHPBB3-11162
|
| | | |
| | |
| | |
| | | |
PHPBB3-11162
|
| | |/
| |
| |
| | |
PHPBB3-11162
|
| |\ \
| | |
| | |
| | |
| | |
| | | |
* Senky/ticket/9918:
[ticket/9918] default values in request_var changed to one string
[ticket/9918] $redirect variable used from now
|
| | | |
| | |
| | |
| | |
| | |
| | | |
As per marc1706's note, all request_var functions now have only one string in default value
PHPBB3-9918
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
According to comment marc1706 added to tracker
http://tracker.phpbb.com/browse/PHPBB3-9918?focusedCommentId=35120&page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel#comment-35120
I changed files to fit his second advice - redirect is kept in hidden_fields and other code changed.
PHPBB3-9918
|
| | | |
| | |
| | |
| | | |
PHPBB3-11023
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Add a new parameter to hold the name of the start variable. This
fulfills ticket PHPBB3-8535.
PHPBB3-10968
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Re-remove deprecated functions, change on_page to phpbb_on_page,
add null returns, remove globals and pass as params.
PHPBB3-10968
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | | |
Returned and marked deprecated topic_generate_pagination. Rename
new function in line with coding guidelines.
PHPBB3-10968
|
| | | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.
PHPBB3-10968
|
| |/ /
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.
Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.
PHPBB3-10968
|
| |\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/8636] Add resync option to topic_view moderation page
|
| | |
| |
| |
| | |
PHPBB3-8636
|
| | |
| |
| |
| | |
PHPBB3-9916
|
| | |
| |
| |
| | |
PHPBB3-10345
|
| |\ \
| |/
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/10365] Fix up S_POST_UNAPPROVED check, make it easier to read
[ticket/10365] Require m_report permission to see reports in mcp_post
[ticket/10365] Make sure moderators only get mcp_reports link when allowed
|
| | |
| |
| |
| | |
PHPBB3-10365
|
| | |
| |
| |
| |
| |
| |
| | |
The m_report permission is not not being checked when displaying the link to
mcp_reports.
PHPBB3-10365
|
| |/
|
|
|
|
|
|
|
|
|
|
| |
Closing tags converted using Oleg's script.
remove-php-end-tags.py -a .
Trailing newlines added using the following where $ext is file extension.
find . -type f -name "*.$ext" -print | xargs printf "e %s\nw\n" | ed -s;
Extensions: php, css, html, js, xml.
PHPBB3-9556
|
| |
|
|
|
|
|
|
| |
Changed the wrong word "new" to "unread" as that is, what we show with the
red-icons, not whether the post is new or not. Language variables were
kept for backwards compatibility.
PHPBB3-7720
|
| |
|
|
|
|
|
| |
Authorised by: bantu
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10428 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
handling this later.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10201 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
selection (Bug #51675)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10180 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10114 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
|
|
| |
topcis", "merge topics" and "merge posts"
Authorised by: AcydBurn
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10079 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
please do not try such fixes at home - the correct solution would be to create a second config table with integer columns. ;)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9398 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9030 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
| |
than the number of posts. #30525
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9023 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8999 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8941 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8925 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8702 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@8520 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@8168 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@8132 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
|
|
|
|
|
|
| |
#i91
#i92
#i93
#i94
#i95
#i96
git-svn-id: file:///svn/phpbb/trunk@8120 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
|
|
| |
-Refactor the confirm table cleanup
-Add confirm table cleanup to session garbage collection. Might require own pseudo-cron.
git-svn-id: file:///svn/phpbb/trunk@8089 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@8082 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
|
|
|
|
|
| |
bbcode_nl2br(), smiley_text(), parse_attachments()
- using \r on custom bbcodes to allow line breaks [Bug #10758]
git-svn-id: file:///svn/phpbb/trunk@8050 89ea8834-ac86-4346-8a33-228a782c2dd0
|
| |
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7961 89ea8834-ac86-4346-8a33-228a782c2dd0
|