aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'Michael2012-02-2713-36/+54
|\
| * Merge pull request #49 from CatoTH/masterfriendica2012-02-2610-23/+29
| |\
| | * Avoid some noticesTobias Hößl2012-02-263-11/+12
| | * BugfixTobias Hößl2012-02-261-1/+1
| | * is not always defined; but if defined, then always of type integerTobias Hößl2012-02-261-1/+1
| | * 1 Bugfix (missing $ character) and avoid some noticesTobias Hößl2012-02-261-3/+3
| | * necessare fields not loaded from DBTobias Hößl2012-02-262-3/+6
| | * should probably be a->user['hidewall'] instead of profile['hidewall']Tobias Hößl2012-02-261-3/+5
| | * Wrong variable nameroot2012-02-261-1/+1
| * | Merge branch 'pull'friendica2012-02-262-645/+912
| |\ \
| * | | relative link redirectsfriendica2012-02-263-13/+25
* | | | Mail: New options for actions after importing mails.Michael2012-02-267-41/+84
* | | | Merge remote branch 'upstream/master'Michael2012-02-2648-1659/+3227
|\ \ \ \ | | |/ / | |/| |
| * | | some revision to the German stringsTobias Diekershoff2012-02-262-18/+20
| * | | German stringsTobias Diekershoff2012-02-262-630/+895
| |/ /
| * / show experimental and unsupported theme status on theme admin pagefriendica2012-02-2611-3/+14
| |/
| * jumping divs with no scrollingfriendica2012-02-261-1/+1
| * imrpove contrast on darkzero blockquotesfriendica2012-02-262-0/+8
| * darkzero-NS themefriendica2012-02-267-1/+153
| * Merge pull request #48 from abinoam/thmail-5Simon2012-02-256-13/+101
| |\
| | * Comment notifications by e-mail now are threadedAbinoam P. Marques Jr2012-02-251-6/+50
| | * include/items.php pass 'parent' to notificationAbinoam P. Marques Jr2012-02-251-3/+7
| | * mod/item.php pass 'parent' to notificationAbinoam P. Marques Jr2012-02-251-1/+2
| | * DB_UPDATE_VERSION incrementedAbinoam P. Marques Jr2012-02-251-1/+1
| | * Added notify-threads to update.phpAbinoam P. Marques Jr2012-02-251-2/+15
| | * Added notify-threads to database.sql.Abinoam P. Marques Jr2012-02-251-0/+26
| * | one more attemptfriendica2012-02-251-2/+2
| * | missed a spotfriendica2012-02-251-1/+1
| * | reverse order of linksfriendica2012-02-251-1/+1
| * | do not set notify popup empty anymore (though another solution is needed for ...friendica2012-02-251-2/+2
| |/
| * scale external imagesfriendica2012-02-254-37/+49
| * fixed link for toggling plugin from detail pagefriendica2012-02-253-3/+3
| * notify positioning, themingfriendica2012-02-252-7/+5
| * sysnotify count in wrong location, and wrong numberfriendica2012-02-252-3/+11
| * theme seen,unseen notificationsfriendica2012-02-254-16/+20
| * photos in notificationsfriendica2012-02-251-1/+1
| * theme info (like plugin info)friendica2012-02-254-5/+76
| * notifications to zeros, bug in notify linkfriendica2012-02-243-3/+88
| * string update for 2.38friendica2012-02-243-774/+1324
| * update author name across items if changed.friendica2012-02-244-3/+24
| * waitman gobble fix for escaping code blocks in tinymcefriendica2012-02-241-8/+65
| * attribution issue - don't take author name from contact if available from item.friendica2012-02-244-17/+27
| * more privacy docsfriendica2012-02-242-1/+18
| * theme shakeup commences - themes are now administered in admin panel.friendica2012-02-239-13/+215
| * system notifications to notify module, untranslated string in notifications.tplfriendica2012-02-233-5/+37
| * implement firehose notify in ping, strip links so notify popup displays corre...friendica2012-02-232-140/+115
* | "Vier-Theme" Some more design stuff.Michael2012-02-264-336/+315
* | poller.php: Test for moving to archive, vier-style: notifications fixedMichael2012-02-252-4/+33
* | "vier" popup menu looks nicer now (more like quattro again)Michael2012-02-251-6/+14
* | "vier": The contacts are now working again. Line break before closing bbcodes...Michael2012-02-255-22/+289