aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* parens in english stringFriendika2011-02-152-16/+23
|
* Merge branch 'chriscase-master'Friendika2011-02-151-34/+41
|\
| * fixed error which was causing multiple line breaks, added comments to better ↵Chris Case2011-02-151-34/+41
| | | | | | | | document what is occuring, cleaned up code, removed unnecessary parameters from templating step
* | Merge branch 'tobiasd-master'Friendika2011-02-152-14/+37
|\ \
| * | deleted the translated file of comment_item.tplTobias Diekershoff2011-02-151-22/+0
| | |
| * | masked the / in the config strings to fix problems with the strings.phpTobias Diekershoff2011-02-151-1/+1
| | |
| * | some translations into GermanTobias Diekershoff2011-02-152-13/+58
| | |
* | | add permalink field to item tableFriendika2011-02-153-2/+7
| | |
* | | bug #0000006, local sparkle links visible in "like" items when remote viewingFriendika2011-02-151-1/+1
|/ /
* | bug #0000002, strip HTML from pasted text in prv messagesFriendika2011-02-144-20/+36
| |
* | wrong return url for ajax comments on display and photos pagesFriendika2011-02-144-3/+5
|/
* Merge remote branch 'upstream/master'Chris Case2011-02-148-10/+40
|\
| * Merge branch 'chriscase-master'Friendika2011-02-145-61/+220
| |\
| * \ Merge branch 'ajaxcomms'Friendika2011-02-145-5/+32
| |\ \ | | | | | | | | | | | | | | | | Conflicts: view/comment_item.tpl
| | * | ajax commentsFriendika2011-02-141-0/+3
| | | |
| | * | ajax commentsFriendika2011-02-141-12/+20
| | | |
| | * | more test ajax commentsFriendika2011-02-122-2/+15
| | | |
| | * | preliminary ajax comment setupsFriendika2011-02-124-3/+6
| | | |
| * | | try this againFriendika2011-02-141-4/+4
| | | |
| * | | just in time for valentines day - heart smiley <3Friendika2011-02-132-1/+2
| | | |
| * | | app not definedFriendika2011-02-131-0/+2
| | | |
* | | | fixed a bbcode issue with rich text html messages, fixed some issues with ↵Chris Case2011-02-141-2/+2
| |_|/ |/| | | | | | | | plain text.
* | | fixed the charset on the html version of the message, overlooked this in the ↵Chris Case2011-02-144-4/+4
| | | | | | | | | | | | last commit, now uses utf-8 in the meta tag
* | | revamped private message templates, added multipart messages with text and ↵Chris Case2011-02-145-40/+178
| | | | | | | | | | | | html versions, updated de, en, fr and it. Translated the french version of the private message template.
* | | updated private message notification to use HTML, still need the foreign ↵Chris Case2011-02-132-35/+56
|/ / | | | | | | language message notifications updated
* | receiving comment notifications for conversations we aren't "involved" inFriendika2011-02-121-1/+2
| |
* | fb addon only working from one site - more debug + simplify permission toggleFriendika2011-02-122-19/+4
| |
* | more fb debug msgsFriendika2011-02-121-1/+5
|/
* correct color and indent on wall-wall commentsFriendika2011-02-121-2/+2
|
* trim excessive space around message body (though we still need 20px padding ↵Friendika2011-02-121-3/+3
| | | | to accomodate scrollbars)
* give all comment input form elements id'sFriendika2011-02-121-4/+4
|
* set default size for profile photo to improve render appearance/speedChris Case2011-02-112-0/+8
|
* fixed a typo in the profile photo wrapper div idChris Case2011-02-111-1/+1
|
* set size of contact images to improve renderingChris Case2011-02-112-0/+8
|
* disable network toggles when ACL's are enteredFriendika2011-02-116-11/+18
|
* reinstate send slaps but only at the top level (and followup)Friendika2011-02-111-10/+8
|
* toggles "post to facebook, post to twitter", etc.Friendika2011-02-1111-15/+127
|
* fb connecter - document installationFriendika2011-02-101-5/+25
|
* post to FB is workingFriendika2011-02-102-18/+53
|
* more work on facebook addonFriendika2011-02-103-670/+89
|
* allow plugins to become cmd modulesFriendika2011-02-102-2/+9
|
* typo in schemaFriendika2011-02-101-1/+1
|
* entirely possible media/links were the only thing posted - don't forward ↵Friendika2011-02-102-18/+20
| | | | empty message to twitter/SN
* general purpose callback landing page - e.g. for facebook pluginFriendika2011-02-101-0/+24
|
* log ignored pubsub deliveriesFriendika2011-02-091-1/+3
|
* post permission hooksFriendika2011-02-092-0/+24
|
* preserve newlines inside <pre> tags when importing feedsFriendika2011-02-091-2/+49
|
* Accept pretty much bloody anything inside a [url] tag as a legal URL.Friendika2011-02-091-3/+3
|
* string updateFriendika2011-02-091-12/+32
|
* Merge branch 'tobiasd-master'Friendika2011-02-092-21/+21
|\