Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix #8 \"recycle symbol getting mangled from status.net retweets\" | Fabio Comuni | 2011-02-16 | 1 | -15/+24 |
| | |||||
* | 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 |
| | | |||||
| * | 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 |
| |/ |/| | |||||
* | | 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 | ||||
* | | | Merge branch 'tobiasd-master' | Friendika | 2011-02-15 | 2 | -14/+37 |
|\ \ \ | |||||
| * | | | deleted the translated file of comment_item.tpl | Tobias Diekershoff | 2011-02-15 | 1 | -22/+0 |
| | | | | |||||
| * | | | masked the / in the config strings to fix problems with the strings.php | Tobias Diekershoff | 2011-02-15 | 1 | -1/+1 |
| | | | | |||||
| * | | | some translations into German | Tobias Diekershoff | 2011-02-15 | 2 | -13/+58 |
| | | | | |||||
* | | | | add permalink field to item table | Friendika | 2011-02-15 | 3 | -2/+7 |
| | | | | |||||
* | | | | bug #0000006, local sparkle links visible in "like" items when remote viewing | Friendika | 2011-02-15 | 1 | -1/+1 |
|/ / / | |||||
* | | | bug #0000002, strip HTML from pasted text in prv messages | Friendika | 2011-02-14 | 4 | -20/+36 |
| | | | |||||
* | | | wrong return url for ajax comments on display and photos pages | Friendika | 2011-02-14 | 4 | -3/+5 |
|/ / | |||||
* | | Merge remote branch 'upstream/master' | Chris Case | 2011-02-14 | 8 | -10/+40 |
|\ \ | |||||
| * \ | Merge branch 'chriscase-master' | Friendika | 2011-02-14 | 5 | -61/+220 |
| |\ \ | |||||
| * \ \ | Merge branch 'ajaxcomms' | Friendika | 2011-02-14 | 5 | -5/+32 |
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: view/comment_item.tpl | ||||
| | * | | | ajax comments | Friendika | 2011-02-14 | 1 | -0/+3 |
| | | | | | |||||
| | * | | | ajax comments | Friendika | 2011-02-14 | 1 | -12/+20 |
| | | | | | |||||
| | * | | | more test ajax comments | Friendika | 2011-02-12 | 2 | -2/+15 |
| | | | | | |||||
| | * | | | preliminary ajax comment setups | Friendika | 2011-02-12 | 4 | -3/+6 |
| | | | | | |||||
| * | | | | try this again | Friendika | 2011-02-14 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | just in time for valentines day - heart smiley <3 | Friendika | 2011-02-13 | 2 | -1/+2 |
| | | | | | |||||
| * | | | | app not defined | Friendika | 2011-02-13 | 1 | -0/+2 |
| | | | | | |||||
* | | | | | fixed a bbcode issue with rich text html messages, fixed some issues with ↵ | Chris Case | 2011-02-14 | 1 | -2/+2 |
| |_|/ / |/| | | | | | | | | | | | plain text. | ||||
* | | | | fixed the charset on the html version of the message, overlooked this in the ↵ | Chris Case | 2011-02-14 | 4 | -4/+4 |
| | | | | | | | | | | | | | | | | last commit, now uses utf-8 in the meta tag | ||||
* | | | | revamped private message templates, added multipart messages with text and ↵ | Chris Case | 2011-02-14 | 5 | -40/+178 |
| | | | | | | | | | | | | | | | | 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 | 2 | -35/+56 |
|/ / / | | | | | | | | | | language message notifications updated | ||||
* | | | receiving comment notifications for conversations we aren't "involved" in | Friendika | 2011-02-12 | 1 | -1/+2 |
| | | | |||||
* | | | fb addon only working from one site - more debug + simplify permission toggle | Friendika | 2011-02-12 | 2 | -19/+4 |
| | | | |||||
* | | | more fb debug msgs | Friendika | 2011-02-12 | 1 | -1/+5 |
|/ / | |||||
* | | correct color and indent on wall-wall comments | Friendika | 2011-02-12 | 1 | -2/+2 |
| | | |||||
* | | trim excessive space around message body (though we still need 20px padding ↵ | Friendika | 2011-02-12 | 1 | -3/+3 |
| | | | | | | | | to accomodate scrollbars) | ||||
* | | give all comment input form elements id's | Friendika | 2011-02-12 | 1 | -4/+4 |
| | | |||||
* | | set default size for profile photo to improve render appearance/speed | Chris Case | 2011-02-11 | 2 | -0/+8 |
| | | |||||
* | | fixed a typo in the profile photo wrapper div id | Chris Case | 2011-02-11 | 1 | -1/+1 |
| | | |||||
* | | set size of contact images to improve rendering | Chris Case | 2011-02-11 | 2 | -0/+8 |
|/ | |||||
* | disable network toggles when ACL's are entered | Friendika | 2011-02-11 | 6 | -11/+18 |
| | |||||
* | reinstate send slaps but only at the top level (and followup) | Friendika | 2011-02-11 | 1 | -10/+8 |
| | |||||
* | toggles "post to facebook, post to twitter", etc. | Friendika | 2011-02-11 | 11 | -15/+127 |
| | |||||
* | fb connecter - document installation | Friendika | 2011-02-10 | 1 | -5/+25 |
| | |||||
* | post to FB is working | Friendika | 2011-02-10 | 2 | -18/+53 |
| | |||||
* | more work on facebook addon | Friendika | 2011-02-10 | 3 | -670/+89 |
| | |||||
* | allow plugins to become cmd modules | Friendika | 2011-02-10 | 2 | -2/+9 |
| | |||||
* | typo in schema | Friendika | 2011-02-10 | 1 | -1/+1 |
| |