Friendica Communications Platform
Find a file
Simon L'nu 36d173ca98 Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: (29 commits)
  spam db
  fix tag icon size
  typo in css
  tagging missing from wallwall and a couple of themes, star missing from dispy
  Mail: New options for actions after importing mails.
  relative link redirects
  Avoid some notices
  Bugfix
  is not always defined; but if defined, then always of type integer
  1 Bugfix (missing $ character) and avoid some notices
  necessare fields not loaded from DB
  should probably be a->user['hidewall'] instead of profile['hidewall']
  "Vier-Theme" Some more design stuff.
  some revision to the German strings
  German strings
  Wrong variable name
  show experimental and unsupported theme status on theme admin page
  jumping divs with no scrolling
  imrpove contrast on darkzero blockquotes
  darkzero-NS theme
  ...

* master:
2012-02-27 00:56:41 -05:00
doc attribution issue - don't take author name from contact if available from item. 2012-02-24 20:03:13 -08:00
images friendica.svg - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
include tagging missing from wallwall and a couple of themes, star missing from dispy 2012-02-26 16:29:06 -08:00
js one more attempt 2012-02-25 17:07:38 -08:00
library waitman gobble fix for escaping code blocks in tinymce 2012-02-24 20:07:57 -08:00
mod tagging missing from wallwall and a couple of themes, star missing from dispy 2012-02-26 16:29:06 -08:00
util theme info (like plugin info) 2012-02-25 00:30:14 -08:00
view fix tag icon size 2012-02-26 16:40:21 -08:00
.gitignore add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
.htaccess add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
boot.php spam db 2012-02-26 18:53:48 -08:00
database.sql spam db 2012-02-26 18:53:48 -08:00
htconfig.php theme shakeup commences - themes are now administered in admin panel. 2012-02-23 20:29:09 -08:00
index.php add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
INSTALL.txt INSTALL.txt - Friendika -> Friendica 2012-02-20 19:38:42 -03:00
LICENSE add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
README README file shortened because this was for my branch only. 2012-02-23 07:55:56 +01:00
testargs.php add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00
update.php spam db 2012-02-26 18:53:48 -08:00
zot.txt add remove_user hook (it looks like dreamhost changed all my file permissions, this will make a nasty commit) 2012-01-18 16:21:30 -08:00