* remotes/upstream/master:
convert boolean or int settings to strings to work around issues with template processing
add "send pm" link to photo dropdown for Diaspora contacts
* master:
* remotes/upstream/master:
Bugfix of old IEs
Forgot to remove a debug line
Use tabindex to enable easy navigation in the dialog to write private mails; Recipient -> Subject -> Text field (tabindex has to be set to the IFRAME element after TinyMCE started) -> Send button
* master:
* remotes/upstream/master: (21 commits)
turn indexes back off (this is from an errant checkin a year or more ago)
undo git stuffup
added icons to profile_side, fixes in css
track whether contact is a community page or not
html2bbcode: Disabled size conversion
Mail: Subject are now with working "Re:"
Removing test exports
Missing field in database.sql
Removed changes
Added config options for the item cache and the ostatus priority
Item cache now is one day.
Corrected some git problems
Cache: item cache now has an autodelete of old files. The pages plugin now sets a link via redirection. So posting works.
Pages: Show every community page - even from foreign servers (with caching)
New plugin that shows community pages in the sidebar
Caching improved.
Enabled Caching for items. Changed color of tags in diabook.
New config options if ostatus polling should use the priority in the contacts
Mail: Removing signatures, gpg, unnecessary line breaks
diabook: Moving the location between the icons
...
* master:
* remotes/upstream/master:
more recycle fixes for plaintext
fix recycle symbol when using plaintext editor
add links to wall, photos, events, etc to aside on networkpage, fixes in css
* master:
* remotes/upstream/master:
don't allow multiple friends with http/https same person, don't show mail2 coming soon unless person is allowed to have email contacts
roll protocol version due to ssl_policy settings
force login to ssl on SSL_POLICY_SELFSIGN
basic ssl_policy for important modules
ssl_policy stuff
revup
splitted tests into several files
removed done TODO
get_tags tests corrected. They test for the right things now.
addon settings form error
more work on filer, comment level and file tag removal
added slack-NS, non-scrolly, slackr-based theme.
get tags test improved
splitted test cases.
changed a test string
added some tests
added library and include to .htaccess
excludes reports from git
better tests
added test blueprints, fixed? encoding issues
* master:
