]> git.mxchange.org Git - friendica.git/commit
Merge remote-tracking branch 'remotes/upstream/master'
authorSimon L'nu <simon.lnu@gmail.com>
Wed, 24 Oct 2012 09:41:11 +0000 (05:41 -0400)
committerSimon L'nu <simon.lnu@gmail.com>
Wed, 24 Oct 2012 09:41:11 +0000 (05:41 -0400)
commitcf42b6f78d782d2e3775c5b06e91b7afb29a2301
treef988d3864fe29b44940b91e17d13ffaa4428a453
parent6ee4e4a93d76ea33b61448fe7269aedaf217e8e7
parentcc59cb2755c4fe68ea0a3cb3904e72986e51b240
Merge remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master: (23 commits)
  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/css/typography.css  modified:   view/theme/smoothly/style.css  modified:   view/theme/smoothly/theme.php
  Diabook - a bit more cleanup, plus mark as experimental (there's so much heavy lifting, things are bound to break).
  Diabook - first part of clean-up to make the theme maintainable.
  modified:   view/theme/smoothly/css/typography.css  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/profile_vcard.tpl  modified:   view/theme/smoothly/style.css  modified:   view/theme/smoothly/theme.php  new file:   view/theme/smoothly/vcard-widget.tpl
  rev update
  modified:   view/theme/smoothly/css/typography.css  modified:   view/theme/smoothly/style.css
  modified:   view/theme/smoothly/default.php  modified:   view/theme/smoothly/nav.tpl  modified:   view/theme/smoothly/style.css  new file:   view/theme/smoothly/tobottom.png
  modified:   view/theme/smoothly/style.css  modified:   view/theme/smoothly/theme.php
  IT: update to the strings
  DE: update to the strings
  new file:   view/theme/smoothly/css/typography.css  modified:   view/theme/smoothly/style.css  modified:   view/theme/smoothly/theme.php
  DarkZero - no changes, just move things around to sort by where on a page they apply to in order to (hopefully) make a bit more sense to anyone maintaining it who isn't me.
  Friendicaland
  undefined fn: init_groups_visitor in mod_profile, rev update
  Diabook - remove redundant TPL to bring back all admin settings
  CS: update to the strings
  ES: update to the strings
  FR: update to the strings
  ...