aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | Merge branch 'chriscase-master'Friendika2011-02-1613-166/+200
|\| | | | | | | |
| * | | | | | | | fixed encoding, i had been experimenting with different ones and forgot to ch...Chris Case2011-02-164-8/+8
| * | | | | | | | forgot to check this in earlier... splits up text and html into two different...Chris Case2011-02-161-4/+30
| * | | | | | | | changed message sending to use base64 encodingChris Case2011-02-1612-162/+170
* | | | | | | | | small fixesFriendika2011-02-162-3/+4
* | | | | | | | | set contact permissions on photos uploaded to private messagesFriendika2011-02-161-6/+36
* | | | | | | | | Merge branch 'fabrixxm-master'Friendika2011-02-161-15/+24
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| * | | | | | | | Fix #8 \"recycle symbol getting mangled from status.net retweets\"Fabio Comuni2011-02-161-15/+24
| | |_|_|_|_|_|/ | |/| | | | | |
* / | | | | | | provide permalink for posts, include permalinks in feeds and imported from feedsFriendika2011-02-1613-3/+35
|/ / / / / / /
* | | | | | | Merge branch 'fabrixxm-master'Friendika2011-02-155-16/+45
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Fixed parentheses in translable string in statusnet.php. Rebulid util/strings...Fabio Comuni2011-02-153-21/+33
| * | | | | | Updated it languageFabio Comuni2011-02-152-5/+29
| * | | | | | fin un util/stringsFabio Comuni2011-02-151-1/+1
| * | | | | | Small tweaks to string_translatorFabio Comuni2011-02-151-6/+6
| * | | | | | Merge remote-tracking branch 'friendika-master/master'Fabio Comuni2011-02-1528-137/+385
| |\ \ \ \ \ \
| * | | | | | | change \"html\" with \"bb code\" in tinyMce iconsFabio Comuni2011-02-151-0/+0
* | | | | | | | 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
* | | | | | | 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
| |\ \ \ \ \ \ \
| | * | | | | | | 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 pla...Chris Case2011-02-141-2/+2
| |_|/ / / / / / |/| | | | | | |
* | | | | | | | fixed the charset on the html version of the message, overlooked this in the ...Chris Case2011-02-144-4/+4
* | | | | | | | revamped private message templates, added multipart messages with text and ht...Chris Case2011-02-145-40/+178
* | | | | | | | updated private message notification to use HTML, still need the foreign lang...Chris Case2011-02-132-35/+56
|/ / / / / / /
* | | | | | | 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 t...Friendika2011-02-121-3/+3
* | | | | 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
|/ / / /