Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'friendika/master' into newui | fabrixxm | 2011-08-17 | 25 | -1098/+2242 |
|\ | |||||
| * | cleanup | Friendika | 2011-08-16 | 1 | -1/+2 |
| | | |||||
| * | hopefully fix statusnet bug by altering our feed format slightly | Friendika | 2011-08-12 | 2 | -2/+30 |
| | | |||||
| * | pt-br strings.php update from messages.po change | Friendika | 2011-08-09 | 1 | -1/+1 |
| | | |||||
| * | small typo - pt-br localization | Abinoam P. Marques Jr. | 2011-08-09 | 1 | -1/+1 |
| | | |||||
| * | fixed some typos | Tobias Diekershoff | 2011-08-09 | 2 | -4/+4 |
| | | |||||
| * | update of the German localization | Tobias Diekershoff | 2011-08-09 | 2 | -1027/+2097 |
| | | |||||
| * | use separate hcard from profile url | Friendika | 2011-08-07 | 1 | -1/+1 |
| | | |||||
| * | fix statusnet_html timelines on api | Friendika | 2011-08-05 | 2 | -1/+2 |
| | | |||||
| * | move public profile warning to top of page | Friendika | 2011-08-05 | 2 | -4/+4 |
| | | |||||
| * | more api tweaks | Friendika | 2011-08-05 | 1 | -3/+3 |
| | | |||||
| * | salmon protocol changes magicsig draft-experimental, fixes to hostxrd | Friendika | 2011-08-04 | 1 | -1/+1 |
| | | |||||
| * | diaspora structures | Friendika | 2011-08-03 | 7 | -0/+76 |
| | | |||||
| * | api compatibility fixes | Friendika | 2011-08-02 | 1 | -1/+1 |
| | | |||||
| * | some more zot changes migrating back to f9a mainline | Friendika | 2011-08-01 | 1 | -1/+1 |
| | | |||||
| * | merge diaspora/friendika vcard formats - not yet complete | Friendika | 2011-08-01 | 1 | -0/+2 |
| | | |||||
| * | some api enhancements | Friendika | 2011-07-31 | 1 | -41/+6 |
| | | |||||
| * | api/statusnet/config.xml | Friendika | 2011-07-28 | 1 | -10/+9 |
| | | |||||
| * | make profile-jot-desc track lock state changes | Friendika | 2011-07-28 | 1 | -0/+1 |
| | | |||||
| * | revup | Friendika | 2011-07-28 | 1 | -1/+1 |
| | | |||||
| * | auto focus jot editor | Friendika | 2011-07-25 | 1 | -0/+1 |
| | | |||||
* | | add missing link to navbar | Fabio Comuni | 2011-07-29 | 3 | -5/+39 |
| | | |||||
* | | style update | Fabio Comuni | 2011-07-29 | 2 | -24/+93 |
| | | |||||
* | | Fix nav template and add missing strings | Fabio Comuni | 2011-07-29 | 1 | -9/+14 |
| | | |||||
* | | change to some nav ids, notice in empty notifications popup | Fabio Comuni | 2011-07-25 | 3 | -8/+20 |
| | | |||||
* | | update style | Fabio Comuni | 2011-07-25 | 2 | -140/+213 |
| | | |||||
* | | move <header> and <nav> tag into nav.tpl. add notification popup items template | Fabio Comuni | 2011-07-25 | 2 | -26/+30 |
| | | |||||
* | | Merge branch 'newacl' into newui | Fabio Comuni | 2011-07-25 | 5 | -183/+320 |
|\| | |||||
| * | Remove "share" greyed text in jot editor when user reshare an item | Fabio Comuni | 2011-07-25 | 2 | -10/+17 |
| | | |||||
| * | added link to community page to dispy theme menu | Tobias Diekershoff | 2011-07-24 | 1 | -0/+3 |
| | | |||||
| * | dispy theme hide editor if without focus | Tobias Diekershoff | 2011-07-24 | 3 | -81/+114 |
| | | |||||
| * | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-07-23 | 1 | -71/+79 |
| |\ | |||||
| | * | fix "resend" function when editor is disabled | Fabio Comuni | 2011-07-22 | 1 | -71/+79 |
| | | | |||||
| * | | dispy ACL into the fancybox | Tobias Diekershoff | 2011-07-23 | 3 | -31/+117 |
| |/ | |||||
* / | Initial work on new UI | Fabio Comuni | 2011-07-22 | 8 | -12/+758 |
|/ | |||||
* | Use new ACL selector in photo edit | Fabio Comuni | 2011-07-20 | 3 | -6/+17 |
| | |||||
* | Use popup ACL selector in photo upload. js_upload use new acl selector. | Fabio Comuni | 2011-07-20 | 3 | -6/+16 |
| | |||||
* | Load tinyMCE on post editor only if needed. | Fabio Comuni | 2011-07-20 | 4 | -64/+93 |
| | |||||
* | Merge remote-tracking branch 'friendika/master' into newacl | Fabio Comuni | 2011-07-20 | 13 | -27/+131 |
|\ | |||||
| * | diaspora encryption xml template | Friendika | 2011-07-19 | 1 | -0/+8 |
| | | |||||
| * | Merge pull request #141 from fabrixxm/newacl | Friendika | 2011-07-19 | 5 | -114/+203 |
| |\ | | | | | | | New jot ACL selector | ||||
| * | | resize editor | Friendika | 2011-07-18 | 1 | -1/+1 |
| | | | |||||
| * | | improved code blocks | Friendika | 2011-07-18 | 1 | -2/+2 |
| | | | |||||
| * | | basic diaspora discovery | Friendika | 2011-07-18 | 2 | -0/+4 |
| | | | |||||
| * | | green icons for greenzero | Friendika | 2011-07-18 | 2 | -0/+7 |
| | | | |||||
| * | | invite system | Friendika | 2011-07-17 | 1 | -0/+11 |
| | | | |||||
| * | | Merge pull request #139 from fabrixxm/update | Friendika | 2011-07-15 | 3 | -4/+136 |
| |\ \ | | | | | | | | | Experiment with on-line update | ||||
| * | | | template for statusnet api config.xml | Friendika | 2011-07-14 | 1 | -0/+67 |
| | | | | |||||
| * | | | link tips on nav bar | Friendika | 2011-07-14 | 1 | -17/+17 |
| | | | | |||||
| * | | | openid settings appearing when disabled, don't tag numbers, install admin ↵ | Friendika | 2011-07-12 | 2 | -2/+3 |
| | | | | | | | | | | | | | | | | not getting set |