aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* clear float after title for items having titleFriendika2011-02-216-0/+9
* resolve file inclusion conflicts w/ multiple plugins, improve the typo checkerFriendika2011-02-2117-1845/+60
* remove note about accounts being hidden in register emailFriendika2011-02-214-16/+1
* default publish to directory, but offer registration privacy setting.Friendika2011-02-216-34/+130
* Merge branch 'themetests' of https://github.com/fabrixxm/friendika into fabri...Friendika2011-02-219-123/+209
|\
| * Updates to theme dupuntozeroFabio Comuni2011-02-177-115/+171
| * Merge branch 'master' into themetestsFabio Comuni2011-02-1730-197/+318
| |\
| | * Merge branch 'friendika-master'fabrixxm2011-02-1730-197/+318
| | |\
| | * \ Merge branch 'master' of github.com:fabrixxm/friendikafabrixxm2011-02-171-15/+24
| | |\ \
| | * \ \ Merge branch 'friendika-master'fabrixxm2011-02-162-2/+2
| | |\ \ \
| | * \ \ \ Merge branch 'master' of github.com:fabrixxm/friendikafabrixxm2011-02-1631-166/+430
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'friendika-master'fabrixxm2011-02-1250-772/+3830
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'friendika-master'fabrixxm2011-02-0832-227/+397
| | |\ \ \ \ \ \
| | * \ \ \ \ \ \ Merge branch 'friendika-master'fabrixxm2011-02-0614-57/+146
| | |\ \ \ \ \ \ \
| * | | | | | | | | duepuntozero: show desc on image in albumsFabio Comuni2011-02-163-9/+39
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | convert html entities on conversational emailsFriendika2011-02-211-2/+2
* | | | | | | | | localise tictacFriendika2011-02-201-19/+17
* | | | | | | | | more punctuation characters added to linkify patternsFriendika2011-02-202-2/+2
* | | | | | | | | facebook plugin: convert html entitiesFriendika2011-02-201-0/+1
* | | | | | | | | support lrdd priorityFriendika2011-02-201-28/+131
* | | | | | | | | add calculator addon appFriendika2011-02-201-0/+356
* | | | | | | | | link to Facebook enable from plugin settings pageFriendika2011-02-201-2/+11
* | | | | | | | | Merge branch 'chriscase-master'Friendika2011-02-202-34/+72
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | updated private message code to use the new EmailNotification libraryChris Case2011-02-191-37/+11
| * | | | | | | | | added reusable EmailNotification library to facilitate more efficient mainten...Chris Case2011-02-191-0/+61
* | | | | | | | | | apps menu fileFriendika2011-02-191-0/+14
* | | | | | | | | | app menu - and a demo application 'tictac'Friendika2011-02-194-3/+677
* | | | | | | | | | Merge branch 'chriscase-master'Friendika2011-02-175-72/+15
|\| | | | | | | | |
| * | | | | | | | | removed localized multipart email templates, now the multipart settings are c...Chris Case2011-02-175-68/+15
* | | | | | | | | | 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 is...Friendika2011-02-173-30/+19
* | | | | | | | | | 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 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