Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Merge branch 'master' into themetests | Fabio Comuni | 2011-02-17 | 30 | -197/+318 | |
| |\ | ||||||
| | * | Merge branch 'friendika-master' | fabrixxm | 2011-02-17 | 30 | -197/+318 | |
| | |\ | ||||||
| | * \ | Merge branch 'master' of github.com:fabrixxm/friendika | fabrixxm | 2011-02-17 | 1 | -15/+24 | |
| | |\ \ | ||||||
| | * \ \ | Merge branch 'friendika-master' | fabrixxm | 2011-02-16 | 2 | -2/+2 | |
| | |\ \ \ | ||||||
| | * \ \ \ | Merge branch 'master' of github.com:fabrixxm/friendika | fabrixxm | 2011-02-16 | 31 | -166/+430 | |
| | |\ \ \ \ | ||||||
| | * \ \ \ \ | Merge branch 'friendika-master' | fabrixxm | 2011-02-12 | 50 | -772/+3830 | |
| | |\ \ \ \ \ | ||||||
| | * \ \ \ \ \ | Merge branch 'friendika-master' | fabrixxm | 2011-02-08 | 32 | -227/+397 | |
| | |\ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'friendika-master' | fabrixxm | 2011-02-06 | 14 | -57/+146 | |
| | |\ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | duepuntozero: show desc on image in albums | Fabio Comuni | 2011-02-16 | 3 | -9/+39 | |
| | |_|_|_|_|_|/ / | |/| | | | | | | | ||||||
* | | | | | | | | | convert html entities on conversational emails | Friendika | 2011-02-21 | 1 | -2/+2 | |
* | | | | | | | | | localise tictac | Friendika | 2011-02-20 | 1 | -19/+17 | |
* | | | | | | | | | more punctuation characters added to linkify patterns | Friendika | 2011-02-20 | 2 | -2/+2 | |
* | | | | | | | | | facebook plugin: convert html entities | Friendika | 2011-02-20 | 1 | -0/+1 | |
* | | | | | | | | | support lrdd priority | Friendika | 2011-02-20 | 1 | -28/+131 | |
* | | | | | | | | | add calculator addon app | Friendika | 2011-02-20 | 1 | -0/+356 | |
* | | | | | | | | | link to Facebook enable from plugin settings page | Friendika | 2011-02-20 | 1 | -2/+11 | |
* | | | | | | | | | Merge branch 'chriscase-master' | Friendika | 2011-02-20 | 2 | -34/+72 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | updated private message code to use the new EmailNotification library | Chris Case | 2011-02-19 | 1 | -37/+11 | |
| * | | | | | | | | | added reusable EmailNotification library to facilitate more efficient mainten... | Chris Case | 2011-02-19 | 1 | -0/+61 | |
* | | | | | | | | | | apps menu file | Friendika | 2011-02-19 | 1 | -0/+14 | |
* | | | | | | | | | | app menu - and a demo application 'tictac' | Friendika | 2011-02-19 | 4 | -3/+677 | |
* | | | | | | | | | | Merge branch 'chriscase-master' | Friendika | 2011-02-17 | 5 | -72/+15 | |
|\| | | | | | | | | | ||||||
| * | | | | | | | | | removed localized multipart email templates, now the multipart settings are c... | Chris Case | 2011-02-17 | 5 | -68/+15 | |
* | | | | | | | | | | no delimiter if empty | Friendika | 2011-02-17 | 1 | -1/+1 | |
* | | | | | | | | | | ajax testing continues | Friendika | 2011-02-17 | 2 | -2/+2 | |
* | | | | | | | | | | convert update script arg passing to js - remembering the browser prefetch is... | Friendika | 2011-02-17 | 3 | -30/+19 | |
* | | | | | | | | | | issues found when testing all live network modes | Friendika | 2011-02-16 | 1 | -1/+1 | |
* | | | | | | | | | | error return for update process when invalid group | Friendika | 2011-02-16 | 1 | -0/+4 | |
* | | | | | | | | | | ajax live update for all network pages and subpages | Friendika | 2011-02-16 | 1 | -3/+13 | |
* | | | | | | | | | | ajax reload fixes | Friendika | 2011-02-16 | 7 | -8/+26 | |
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | ||||||
* | | | | | | | | | properly handle error returns in post w/ajax | Friendika | 2011-02-16 | 2 | -4/+13 | |
* | | | | | | | | | broken image + linkify site link in body | Friendika | 2011-02-16 | 5 | -8/+9 | |
* | | | | | | | | | sanitise all incoming url's - also stop them from getting mangled by simplepie | Friendika | 2011-02-16 | 5 | -18/+32 | |
* | | | | | | | | | Merge branch 'chriscase-master' | Friendika | 2011-02-16 | 13 | -166/+200 | |
|\| | | | | | | | | ||||||
| * | | | | | | | | fixed encoding, i had been experimenting with different ones and forgot to ch... | Chris Case | 2011-02-16 | 4 | -8/+8 | |
| * | | | | | | | | forgot to check this in earlier... splits up text and html into two different... | Chris Case | 2011-02-16 | 1 | -4/+30 | |
| * | | | | | | | | changed message sending to use base64 encoding | Chris Case | 2011-02-16 | 12 | -162/+170 | |
* | | | | | | | | | small fixes | Friendika | 2011-02-16 | 2 | -3/+4 | |
* | | | | | | | | | set contact permissions on photos uploaded to private messages | Friendika | 2011-02-16 | 1 | -6/+36 | |
* | | | | | | | | | Merge branch 'fabrixxm-master' | Friendika | 2011-02-16 | 1 | -15/+24 | |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | ||||||
| * | | | | | | | | Fix #8 \"recycle symbol getting mangled from status.net retweets\" | Fabio Comuni | 2011-02-16 | 1 | -15/+24 | |
| | |_|_|_|_|_|/ | |/| | | | | | | ||||||
* / | | | | | | | provide permalink for posts, include permalinks in feeds and imported from feeds | Friendika | 2011-02-16 | 13 | -3/+35 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge branch 'fabrixxm-master' | Friendika | 2011-02-15 | 5 | -16/+45 | |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | ||||||
| * | | | | | | Fixed parentheses in translable string in statusnet.php. Rebulid util/strings... | Fabio Comuni | 2011-02-15 | 3 | -21/+33 | |
| * | | | | | | Updated it language | Fabio Comuni | 2011-02-15 | 2 | -5/+29 | |
| * | | | | | | fin un util/strings | Fabio Comuni | 2011-02-15 | 1 | -1/+1 | |
| * | | | | | | Small tweaks to string_translator | Fabio Comuni | 2011-02-15 | 1 | -6/+6 | |
| * | | | | | | Merge remote-tracking branch 'friendika-master/master' | Fabio Comuni | 2011-02-15 | 28 | -137/+385 | |
| |\ \ \ \ \ \ | ||||||
| * | | | | | | | change \"html\" with \"bb code\" in tinyMce icons | Fabio Comuni | 2011-02-15 | 1 | -0/+0 | |
* | | | | | | | | parens in english string | Friendika | 2011-02-15 | 2 | -16/+23 | |
| |/ / / / / / |/| | | | | | |