Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolve file inclusion conflicts w/ multiple plugins, improve the typo checker | Friendika | 2011-02-21 | 17 | -1845/+60 |
| | |||||
* | remove note about accounts being hidden in register email | Friendika | 2011-02-21 | 4 | -16/+1 |
| | |||||
* | default publish to directory, but offer registration privacy setting. | Friendika | 2011-02-21 | 6 | -34/+130 |
| | | | | | generalise publish option template - so once translated we can merge them all. Update strings. | ||||
* | Merge branch 'themetests' of https://github.com/fabrixxm/friendika into ↵ | Friendika | 2011-02-21 | 9 | -123/+209 |
|\ | | | | | | | fabrixxm-themetests | ||||
| * | Updates to theme dupuntozero | Fabio Comuni | 2011-02-17 | 7 | -115/+171 |
| | | |||||
| * | 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 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/dfrn_notify.php | ||||
| * | | | | | | | | | 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 ↵ | Chris Case | 2011-02-19 | 1 | -0/+61 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maintenance of email related code | ||||
* | | | | | | | | | | 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 |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: mod/dfrn_notify.php | ||||
| * | | | | | | | | | removed localized multipart email templates, now the multipart settings are ↵ | Chris Case | 2011-02-17 | 5 | -68/+15 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | configured directly in the code | ||||
* | | | | | | | | | | 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 ↵ | Friendika | 2011-02-17 | 3 | -30/+19 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | issues | ||||
* | | | | | | | | | | 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 ↵ | Chris Case | 2011-02-16 | 4 | -8/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | change it back, now UTF-8 | ||||
| * | | | | | | | | forgot to check this in earlier... splits up text and html into two ↵ | Chris Case | 2011-02-16 | 1 | -4/+30 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | different templates and base64 encodes them | ||||
| * | | | | | | | | 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 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: addon/statusnet/statusnet.php util/strings.php | ||||
| * | | | | | | Fixed parentheses in translable string in statusnet.php. Rebulid ↵ | Fabio Comuni | 2011-02-15 | 3 | -21/+33 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | util/strings.php. Update it/strings | ||||
| * | | | | | | Updated it language | Fabio Comuni | 2011-02-15 | 2 | -5/+29 |
| | | | | | | |