| Commit message (Collapse) | Author | Age | Files | Lines |
|\
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
# 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-11162
|
| |
| |
| |
| | |
PHPBB3-11162
|
| |
| |
| |
| | |
PHPBB3-11162
|
| |
| |
| |
| | |
PHPBB3-11162
|
| |
| |
| |
| | |
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
|
|
|
|
| |
PHPBB3-8636
|
|
|
|
| |
PHPBB3-10365
|
|
|
|
|
|
|
| |
The m_report permission is not not being checked when displaying the link to
mcp_reports.
PHPBB3-10365
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7928 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
| |
Also removed the useless login box from the ACP.
git-svn-id: file:///svn/phpbb/trunk@7919 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
imageset editor.
A little spelling.
Introduces new language variable(s).
#11925
#11675
git-svn-id: file:///svn/phpbb/trunk@7750 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7739 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
queue, reports, post details, mcp topic view... fixing other tiny things along the line.
git-svn-id: file:///svn/phpbb/trunk@7642 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
| |
- correctly close span tags within code=php
git-svn-id: file:///svn/phpbb/trunk@7619 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7506 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7490 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7473 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
#9831, #9830, #9815, #9665, #9624
prosilver adjustments for important announcements in ucp - #9995
MCP fixes for user notes/warnings - #9981
Preserving imageset values on save/edit
find a member link for Mass PM's - #9925
syndicate window.onload events where necessary - #9878
Duplicate topics in forums with announcements - #9840
Email template for forced re-activation - #9808
Topic pagination adjustment - #9763
Changed compose message layout in UCP - #9706, #9702
Fixed inline attachment font size (hopefully)
git-svn-id: file:///svn/phpbb/trunk@7384 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7246 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7056 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
| |
git-svn-id: file:///svn/phpbb/trunk@7054 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
the MCP it will not update the "read" status of a post/topic/forum [includes Bug #6796]
git-svn-id: file:///svn/phpbb/trunk@6936 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
| |
variable passed to validate_data([...]array('username', [...])) and updating group listings while doing relevant group actions. Oh, and PM icons are working now. :o
git-svn-id: file:///svn/phpbb/trunk@6894 89ea8834-ac86-4346-8a33-228a782c2dd0
|
|
|
|
|
|
|
| |
- most important change is the consolidation of the display attachment functions; merging them together to have one function we need to call.
git-svn-id: file:///svn/phpbb/trunk@6803 89ea8834-ac86-4346-8a33-228a782c2dd0
|