Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | resolve file inclusion conflicts w/ multiple plugins, improve the typo checker | Friendika | 2011-02-21 | 2 | -1/+5 |
| | |||||
* | default publish to directory, but offer registration privacy setting. | Friendika | 2011-02-21 | 1 | -3/+25 |
| | | | | | 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 | 1 | -2/+3 |
|\ | | | | | | | fabrixxm-themetests | ||||
| * | Merge branch 'master' into themetests | Fabio Comuni | 2011-02-17 | 7 | -31/+110 |
| |\ | |||||
| * | | duepuntozero: show desc on image in albums | Fabio Comuni | 2011-02-16 | 1 | -2/+3 |
| | | | |||||
* | | | convert html entities on conversational emails | Friendika | 2011-02-21 | 1 | -2/+2 |
| | | | |||||
* | | | Merge branch 'chriscase-master' | Friendika | 2011-02-20 | 1 | -34/+11 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: mod/dfrn_notify.php | ||||
| * | | | updated private message code to use the new EmailNotification library | Chris Case | 2011-02-19 | 1 | -37/+11 |
| | | | | |||||
* | | | | apps menu file | Friendika | 2011-02-19 | 1 | -0/+14 |
| | | | | |||||
* | | | | Merge branch 'chriscase-master' | Friendika | 2011-02-17 | 1 | -19/+15 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: mod/dfrn_notify.php | ||||
| * | | | removed localized multipart email templates, now the multipart settings are ↵ | Chris Case | 2011-02-17 | 1 | -15/+15 |
| | | | | | | | | | | | | | | | | configured directly in the code | ||||
* | | | | 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 | 2 | -29/+15 |
| | | | | | | | | | | | | | | | | 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 | 5 | -8/+21 |
| |_|/ |/| | | |||||
* | | | 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 | 1 | -0/+1 |
| | | | |||||
* | | | sanitise all incoming url's - also stop them from getting mangled by simplepie | Friendika | 2011-02-16 | 1 | -15/+23 |
| | | | |||||
* | | | Merge branch 'chriscase-master' | Friendika | 2011-02-16 | 1 | -4/+30 |
|\| | | |||||
| * | | 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 | ||||
* | | | 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 |
| | | | |||||
* | | | provide permalink for posts, include permalinks in feeds and imported from feeds | Friendika | 2011-02-16 | 4 | -1/+5 |
| |/ |/| | |||||
* | | Merge branch 'chriscase-master' | Friendika | 2011-02-15 | 1 | -34/+41 |
|\| | |||||
| * | fixed error which was causing multiple line breaks, added comments to better ↵ | Chris Case | 2011-02-15 | 1 | -34/+41 |
| | | | | | | | | document what is occuring, cleaned up code, removed unnecessary parameters from templating step | ||||
* | | wrong return url for ajax comments on display and photos pages | Friendika | 2011-02-14 | 2 | -2/+2 |
|/ | |||||
* | Merge remote branch 'upstream/master' | Chris Case | 2011-02-14 | 3 | -3/+8 |
|\ | |||||
| * | Merge branch 'chriscase-master' | Friendika | 2011-02-14 | 1 | -23/+61 |
| |\ | |||||
| * \ | Merge branch 'ajaxcomms' | Friendika | 2011-02-14 | 3 | -3/+8 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: view/comment_item.tpl | ||||
| | * | | ajax comments | Friendika | 2011-02-14 | 1 | -0/+3 |
| | | | | |||||
| | * | | preliminary ajax comment setups | Friendika | 2011-02-12 | 3 | -3/+5 |
| | | | | |||||
* | | | | fixed a bbcode issue with rich text html messages, fixed some issues with ↵ | Chris Case | 2011-02-14 | 1 | -2/+2 |
| |_|/ |/| | | | | | | | | plain text. | ||||
* | | | revamped private message templates, added multipart messages with text and ↵ | Chris Case | 2011-02-14 | 1 | -7/+33 |
| | | | | | | | | | | | | html versions, updated de, en, fr and it. Translated the french version of the private message template. | ||||
* | | | updated private message notification to use HTML, still need the foreign ↵ | Chris Case | 2011-02-13 | 1 | -22/+34 |
|/ / | | | | | | | language message notifications updated | ||||
* / | receiving comment notifications for conversations we aren't "involved" in | Friendika | 2011-02-12 | 1 | -1/+2 |
|/ | |||||
* | toggles "post to facebook, post to twitter", etc. | Friendika | 2011-02-11 | 2 | -2/+9 |
| | |||||
* | general purpose callback landing page - e.g. for facebook plugin | Friendika | 2011-02-10 | 1 | -0/+24 |
| | |||||
* | log ignored pubsub deliveries | Friendika | 2011-02-09 | 1 | -1/+3 |
| | |||||
* | post permission hooks | Friendika | 2011-02-09 | 1 | -0/+2 |
| | |||||
* | more graceful handling of some statusnet followups | Friendika | 2011-02-08 | 3 | -9/+32 |
| | |||||
* | modify tag handling and replies to stnet | Friendika | 2011-02-08 | 1 | -1/+21 |
| | |||||
* | tweaks to reworked remote deletion, which also fixes some comment box oddities | Friendika | 2011-02-08 | 1 | -1/+1 |
| | |||||
* | rework remote deletion | Friendika | 2011-02-08 | 1 | -59/+66 |
| | |||||
* | don't change photo visibility if only album name was changed | Friendika | 2011-02-07 | 1 | -0/+8 |
| | |||||
* | feed cleanup | Friendika | 2011-02-07 | 1 | -1/+1 |
| | |||||
* | theme name cleanup - rename default to loozah, provide sane fallbacks and ↵ | Friendika | 2011-02-06 | 1 | -3/+8 |
| | | | | | | | change system primary theme. Provide indication on contact edit page of last update success/failure - can be extended later to show actual timestamp of last successful update. | ||||
* | ensure that jot_plugins inherit '$visitor' correctly | Friendika | 2011-02-06 | 2 | -9/+11 |
| | |||||
* | Merge branch 'fabrixxm-master' | Friendika | 2011-02-05 | 2 | -37/+92 |
|\ |