aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'chriscase-master'Friendika2011-02-175-72/+15
|\ | | | | | | | | Conflicts: mod/dfrn_notify.php
| * removed localized multipart email templates, now the multipart settings are ↵Chris Case2011-02-175-68/+15
| | | | | | | | configured directly in the code
* | no delimiter if emptyFriendika2011-02-171-1/+1
| |
* | ajax testing continuesFriendika2011-02-172-2/+2
| |
* | convert update script arg passing to js - remembering the browser prefetch ↵Friendika2011-02-173-30/+19
| | | | | | | | issues
* | issues found when testing all live network modesFriendika2011-02-161-1/+1
| |
* | error return for update process when invalid groupFriendika2011-02-161-0/+4
| |
* | ajax live update for all network pages and subpagesFriendika2011-02-161-3/+13
| |
* | ajax reload fixesFriendika2011-02-167-8/+26
| |
* | properly handle error returns in post w/ajaxFriendika2011-02-162-4/+13
| |
* | broken image + linkify site link in bodyFriendika2011-02-165-8/+9
| |
* | sanitise all incoming url's - also stop them from getting mangled by simplepieFriendika2011-02-165-18/+32
| |
* | Merge branch 'chriscase-master'Friendika2011-02-1613-166/+200
|\|
| * fixed encoding, i had been experimenting with different ones and forgot to ↵Chris Case2011-02-164-8/+8
| | | | | | | | change it back, now UTF-8
| * forgot to check this in earlier... splits up text and html into two ↵Chris Case2011-02-161-4/+30
| | | | | | | | different templates and base64 encodes them
| * 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
|\ \ | | | | | | | | | | | | | | | Conflicts: addon/statusnet/statusnet.php util/strings.php
| * | Fixed parentheses in translable string in statusnet.php. Rebulid ↵Fabio Comuni2011-02-153-21/+33
| | | | | | | | | | | | util/strings.php. Update it/strings
| * | 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
| | | | | | | | | | | | 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.