1
0
Fork 0

Merge branch 'master', remote-tracking branch 'remotes/upstream/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:
This commit is contained in:
Simon L'nu 2012-03-16 01:51:25 -04:00
parent be4e4dfb0d
commit f727b44c08

Diff content is not available