* remotes/upstream/master: (24 commits)
Remove tilde files
Tobias outlined a rare situation where a site admin may not have an admin account, and will therefore need to do things in .htconfig.php
.
more wrong name
add renamed package
dash in filename won't work with plugins
smilies_adult install issue after rename, package updates
deleted: adult_smile/adult_smile.php modified: smiley_pack/smiley_pack.php renamed: adult_smile/icons/bong.gif -> smilies-adult/icons/bong.gif renamed: adult_smile/icons/drunk.gif -> smilies-adult/icons/drunk.gif renamed: adult_smile/icons/sperm.gif -> smilies-adult/icons/sperm.gif renamed: adult_smile/icons/tits.gif -> smilies-adult/icons/tits.gif new file: smilies-adult/smilies-adult.php
Brought readme up to date
Brought readme up to date
Brought readme up to date
Brought README up to date.
Changed the README for my variant, and changed "Last" users/likes/posts to Latest users/likes/posts.
Improved nsfw/content filter
Reworded the UI of NSFW to make it more obviously a general purpose content filter
Facebook: Design issues in the export
Migration hint: the form cannot be used as long as the settings are set in .htconfig.php, so tell this to the administrator.
Check if the given AppID/Secret works. Make the polling interval configurable.
wppost: Mechanism for guessing the title added
facebook: If the body is empty then the link is taken.
...
* master:
* remotes/upstream/master:
package update
FEATURE: AppID/Secret can now be entered on the plugin's admin page. BUG: if a connected FB-App is deleted and a new FB-App is connected, the app_access_token of the former App remained in the config and made it impossible to activate Real-Time Updates with the new App. USABILITY: Now the user's connector settings page automatically recognizes if the connection is still valid and acts accordingly. SECURITY: XSRF-Protection.
pass IRC channel through url, allows simpler default choice.
package update
remove frown - no longer needed
Show the pseudo-user Administrator instead of a broken image
fixed a typo
Provide a link to reactivate Real-Time Updated
Another proposal for notifications after FB-Connection-Invalidation
* master:
