Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mike/master' | olivierm | 2011-02-23 | 9 | -45/+26 |
|\ | |||||
| * | add some calendaring functions | Friendika | 2011-02-22 | 2 | -0/+14 |
| | | |||||
| * | pulled strings from one more template | Friendika | 2011-02-22 | 7 | -45/+12 |
| | | |||||
* | | A little more french translation. | olivierm | 2011-02-22 | 5 | -20/+20 |
|/ | |||||
* | clear float after title for items having title | Friendika | 2011-02-21 | 6 | -0/+9 |
| | |||||
* | 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 | 4 | -5/+57 |
| | | | | | 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 | 8 | -121/+206 |
|\ | | | | | | | fabrixxm-themetests | ||||
| * | Updates to theme dupuntozero | Fabio Comuni | 2011-02-17 | 7 | -115/+171 |
| | | |||||
| * | Merge branch 'master' into themetests | Fabio Comuni | 2011-02-17 | 19 | -162/+189 |
| |\ | |||||
| * | | duepuntozero: show desc on image in albums | Fabio Comuni | 2011-02-16 | 2 | -7/+36 |
| | | | |||||
* | | | Merge branch 'chriscase-master' | Friendika | 2011-02-17 | 4 | -53/+0 |
|\ \ \ | | | | | | | | | | | | | | | | | Conflicts: mod/dfrn_notify.php | ||||
| * | | | removed localized multipart email templates, now the multipart settings are ↵ | Chris Case | 2011-02-17 | 4 | -53/+0 |
| | | | | | | | | | | | | | | | | configured directly in the code | ||||
* | | | | ajax reload fixes | Friendika | 2011-02-16 | 1 | -0/+1 |
| |_|/ |/| | | |||||
* | | | broken image + linkify site link in body | Friendika | 2011-02-16 | 4 | -8/+8 |
| | | | |||||
* | | | Merge branch 'chriscase-master' | Friendika | 2011-02-16 | 12 | -162/+170 |
|\| | | |||||
| * | | 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 | ||||
| * | | changed message sending to use base64 encoding | Chris Case | 2011-02-16 | 12 | -162/+170 |
| | | | |||||
* | | | provide permalink for posts, include permalinks in feeds and imported from feeds | Friendika | 2011-02-16 | 7 | -0/+19 |
| |/ |/| | |||||
* | | Fixed parentheses in translable string in statusnet.php. Rebulid ↵ | Fabio Comuni | 2011-02-15 | 1 | -0/+10 |
| | | | | | | | | util/strings.php. Update it/strings | ||||
* | | Updated it language | Fabio Comuni | 2011-02-15 | 2 | -5/+29 |
| | | |||||
* | | deleted the translated file of comment_item.tpl | Tobias Diekershoff | 2011-02-15 | 1 | -22/+0 |
| | | |||||
* | | some translations into German | Tobias Diekershoff | 2011-02-15 | 2 | -13/+58 |
| | | |||||
* | | bug #0000002, strip HTML from pasted text in prv messages | Friendika | 2011-02-14 | 4 | -20/+36 |
|/ | |||||
* | Merge branch 'chriscase-master' | Friendika | 2011-02-14 | 4 | -38/+159 |
|\ | |||||
| * | 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 | 4 | -33/+145 |
| | | | | | | | | 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 | -13/+22 |
| | | | | | | | | language message notifications updated | ||||
* | | Merge branch 'ajaxcomms' | Friendika | 2011-02-14 | 1 | -2/+3 |
|\ \ | | | | | | | | | | | | | Conflicts: view/comment_item.tpl | ||||
| * | | more test ajax comments | Friendika | 2011-02-12 | 1 | -2/+2 |
| | | | |||||
| * | | preliminary ajax comment setups | Friendika | 2011-02-12 | 1 | -0/+1 |
| |/ | |||||
* / | try this again | Friendika | 2011-02-14 | 1 | -4/+4 |
|/ | |||||
* | 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 |
| | |||||
* | 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 | 4 | -9/+16 |
| | |||||
* | toggles "post to facebook, post to twitter", etc. | Friendika | 2011-02-11 | 6 | -6/+42 |
| | |||||
* | images were left behind in theme rename | Friendika | 2011-02-08 | 4 | -3/+3 |
| | |||||
* | close tag on favicon link missing | Friendika | 2011-02-07 | 4 | -4/+4 |
| | |||||
* | theme name cleanup - rename default to loozah, provide sane fallbacks and ↵ | Friendika | 2011-02-06 | 16 | -7/+42 |
| | | | | | | | 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. | ||||
* | german choose existing pic for the avatar | Tobias Diekershoff | 2011-02-06 | 1 | -2/+2 |
| | |||||
* | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-02-06 | 6 | -6/+24 |
|\ | |||||
| * | Merge branch 'fabrixxm-master' | Friendika | 2011-02-05 | 5 | -5/+23 |
| |\ | |||||
| | * | Merge branch 'ph2pr' of https://github.com/fabrixxm/friendika into ↵ | Friendika | 2011-02-05 | 5 | -5/+23 |
| | |\ | | | | | | | | | | | | | fabrixxm-master | ||||
| | | * | Add a link to user photos in Upload Profile Photo page | Fabio Comuni | 2011-02-04 | 6 | -5/+27 |
| | | | | |||||
| * | | | Merge branch 'omigeot-master' | Friendika | 2011-02-05 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: view/fr/strings.php | ||||
| | * | | Merge branch 'master' of https://github.com/omigeot/friendika into ↵ | Friendika | 2011-02-05 | 1 | -0/+1 |
| | |\ \ | | | | | | | | | | | | | | | | omigeot-master | ||||
| | | * | | Fixed some typo (prevented Friendika to load with french locale) | olivierm | 2011-02-05 | 1 | -0/+1 |
| | | | | |