| Commit message (Collapse) | Author | Age | Files | Lines |
... | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | |
| | | | | |
Use $phpbb_notifications instead of $notifications everywhere for
consistency and conflict prevention.
PHPBB3-11103
|
| | |/ /
| |/| |
| | | |
| | | | |
PHPBB3-11103
|
|\ \ \ \
| | |/ /
| |/| |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
feature/softdelete-1-permission-rebase
* 'develop' of https://github.com/phpbb/phpbb3: (544 commits)
[feature/events] Fix improperly named event in documentation
[feature/events] Fix alphabetization of events
[feature/events] Put events in alphabetical order
[feature/events] Make EVENTS.md lowercase
[ticket/11285] Use more granularity in dependency checks in compress test
[ticket/10880] The m_approve permisson no longer implies f_noapprove.
[ticket/10803] Show failure message until user dismisses it
[ticket/10954] Add missing semi-colon
[ticket/10954] Make sure to mark subforums unread and add small fixes
[feature/events] Use ` to escape HTML tags in markdown
[feature/events] Remove HTML tags from markdown so they don't get parsed
[ticket/10954] Miscellaneous coding fixes
[feature/events] Remove extraneous space
[feature/events] Add markdown template event documentation file
[feature/events] forumlist_body_last_post_title_after -> _prepend (subsilver2)
[feature/events] Fix overall_footer_end -> overall_footer_after (subsilver2)
[feature/events] Fix typo in event name
[ticket/10763] Use self when calling get_extension() in filespec class
[feature/events] Fix more subsilver2 events
[feature/events] Fix some subsilver2 events
...
Conflicts:
phpBB/install/database_update.php
phpBB/posting.php
|
| |\ \ \
| | |/ /
| |/| /
| | |/
| | | |
* develop-olympus:
[ticket/11227] @return void -> @return null in develop-olympus.
|
| | |
| | |
| | |
| | | |
PHPBB3-11227
|
| | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | |
| | |
| | |
| | | |
PHPBB3-9567
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This also makes sync('topic_visibility') obsolete, but we keep it for now.
Also fix a unit test, because ITEM_DELETED overpowers ITEM_UNAPPROVED
PHPBB3-9567
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
The function can not rely on the first post anymore, as that one could be soft
deleted but the topic still has approved replies which are still visible.
PHPBB3-9567
|
| | |
| | |
| | |
| | |
| | |
| | | |
This also fixes set_post_visibility()
PHPBB3-9567
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
| | |
| | |
| | |
| | | |
PHPBB3-9657
|
|/ /
| |
| |
| |
| |
| | |
So far, I've added no new functionality. The biggest change here is adjusting the DB column names to "visibility" rather than "approved". Some things here are pretty likely to change, for example the name and location of the topic_visibility class. Happy birthday phpBB :)
PHPBB3-9657
|
| |
| |
| |
| | |
PHPBB3-11052
|
| |
| |
| |
| |
| |
| | |
Merge their bodies into phpbb_remove_comments($input).
PHPBB3-10969
|
|\ \
| |/
| |
| |
| |
| | |
* develop-olympus:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
|
| |
| |
| |
| | |
PHPBB3-10937
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
By Andreas Fischer
via Andreas Fischer (1) and Nils Adermann (1)
* develop-olympus:
[ticket/10751] Use sql_lower_text() in view_log(). log_data is a text column.
[ticket/10751] Add sql_lower_text() to database abstraction layer.
Conflicts:
phpBB/includes/db/dbal.php
|
| |
| |
| |
| | |
PHPBB3-10751
|
|\ \
| | |
| | |
| | |
| | | |
* bantu/ticket/10636:
[ticket/10636] Resolve variable name ($sql_ary) conflict in cache_moderators().
|
| | |
| | |
| | |
| | |
| | |
| | | |
Regression from 4c77903129749008cd08c346006d2a57cf6ff544.
PHPBB3-10636
|
|/ /
| |
| |
| |
| |
| | |
Replacing code in includes/functions_admin.php that was missed in ticket 10323
PHPBB3-10637
|
| |
| |
| |
| | |
PHPBB3-9916
|
|\ \
| |/
| |
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/10349] Removed duplicated functions from schema loading in tests
[ticket/10349] Update function comment
[ticket/10349] Use new schema comment function in installer
[ticket/10349] Unit tests: Consolidate schema comment removal functions
[ticket/10349] Unit tests: Remove comments while loading schema files
|
| |\
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* Noxwizard/ticket/10349:
[ticket/10349] Removed duplicated functions from schema loading in tests
[ticket/10349] Update function comment
[ticket/10349] Use new schema comment function in installer
[ticket/10349] Unit tests: Consolidate schema comment removal functions
[ticket/10349] Unit tests: Remove comments while loading schema files
|
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
This is what now runs in the unit tests. The COMMENTS field in the dbms data
is no longer needed, so it has been removed.
PHPBB3-10349
|
|\ \ \
| | | |
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
* nickvergessen/ticket/10484:
[ticket/10484] Use variables for sql_build_query() calls
Conflicts:
phpBB/includes/mcp/mcp_front.php
|
| | | |
| | | |
| | | |
| | | |
| | | |
| | | | |
It's easier for mods/extensions to extend the arrays.
PHPBB3-10484
|
|\ \ \ \
| |/ / /
|/| / /
| |/ /
| | |
| | | |
* develop-olympus:
[ticket/10461] Add a comment explaining the logic here.
[ticket/10461] Correct $log_count check in view_log() so we show logs again.
|
| | |
| | |
| | |
| | | |
PHPBB3-10461
|
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
We pass $log_count as false now when we do not need to know how many log
entries there are. However when $log_count is false, $log_count == 0 will be
true as well and thus we will return early with 0.
PHPBB3-9874
PHPBB3-10461
|
|\ \ \
| |/ /
| | |
| | |
| | |
| | |
| | |
| | |
| | | |
* develop-olympus:
[ticket/10278] Show VERSIONCHECK_FAIL instead of FSOCK_TIMEOUT.
[ticket/10278] Also timeout when receiving data over a slow connection.
[ticket/10278] Decrease default timeout of get_remote_file() to 6 seconds.
[ticket/10278] Return with a timeout error when fread() or fgets() time out.
[ticket/10278] Also set timeout on stream in get_remote_file().
|
| | |
| | |
| | |
| | | |
PHPBB3-10278
|
| | |
| | |
| | |
| | | |
PHPBB3-10278
|
| | |
| | |
| | |
| | | |
PHPBB3-10278
|
| |/
| |
| |
| |
| |
| |
| |
| |
| |
| | |
From the PHP manual for fsockopen():
If you need to set a timeout for reading/writing data over the socket, use
stream_set_timeout(), as the timeout parameter to fsockopen() only applies
while connecting the socket.
http://www.php.net/manual/en/function.fsockopen.php
PHPBB3-10278
|
|\ \
| |/
| |
| |
| | |
* develop-olympus:
[ticket/5506] Do not display an empty last page after deleting logs.
|
| |
| |
| |
| |
| |
| | |
The fix is copied from view_inactive_users().
Also add keywords and sort parameters to url for deleting logs and inactive users.
And finally save some queries if there are no logs/users to display anyway
|
| |
| |
| |
| |
| |
| | |
Topic-Tracking is still missing.
PHPBB3-9684
|
|\ \
| |/
| |
| |
| |
| |
| |
| | |
* develop-olympus:
[ticket/9874] view_log() performs unneeded count query over all log entries.
[ticket/7834] Topic time didn't update when first post was deleted
[ticket/9997] Fixed an inconsistency in the Moderator Control Panel
[ticket/9872] Removed some useless code that broke delete_posts
|
| |
| |
| |
| | |
PHPBB3-9874
|
|/
|
|
|
|
|
|
|
|
|
|
| |
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
|
|
|
|
| |
PHPBB3-9850
|
|\
| |
| |
| |
| |
| |
| |
| |
| | |
* ticket/bantu/9167:
[ticket/9167] Detect and remove any dead left over shadow topics on update.
[ticket/9167] Remove shadow topics from remaining forums when deleting a forum
Conflicts:
phpBB/install/database_update.php
|
| |
| |
| |
| |
| |
| |
| |
| |
| | |
including posts.
The function delete_topic_shadows() had to be reimplemented.
It was there but it was completly broken and hasn't been used at all.
PHPBB3-9167
|
|/
|
|
|
|
|
| |
Split topics takes too long in some cases because of wrong variables or arrays
values types adjustment. Cast values representing topic and forum ids as int.
PHPBB3-9658
|
|
|
|
|
|
| |
This commit fixes the bug mentioned, plus a large number of regressions caused by changing the behavior of make_forum_select() (in svn r10427, dated Jan 18, 2010). It also rolls back the changes from branch "bug/58415", which are no longer needed.
PHPBB3-9510
|