Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'newacl' into newui | Fabio Comuni | 2011-07-25 | 10 | -190/+327 |
|\ | |||||
| * | Remove "share" greyed text in jot editor when user reshare an item | Fabio Comuni | 2011-07-25 | 2 | -10/+17 |
| | | |||||
| * | Merge branch 'pull' | Friendika | 2011-07-24 | 4 | -81/+117 |
| |\ | |||||
| | * | Merge pull request #147 from tobiasd/master | tobiasd | 2011-07-24 | 1 | -0/+3 |
| | |\ | | | | | | | | | link the community page in dispy when enabled | ||||
| | | * | added link to community page to dispy theme menu | Tobias Diekershoff | 2011-07-24 | 1 | -0/+3 |
| | |/ | |||||
| | * | Merge pull request #146 from tobiasd/master | tobiasd | 2011-07-24 | 3 | -81/+114 |
| | |\ | | | | | | | | | hide the editor and controls if not with focus in dispy theme, resend works | ||||
| | | * | dispy theme hide editor if without focus | Tobias Diekershoff | 2011-07-24 | 3 | -81/+114 |
| | |/ | |||||
| * / | revup | Friendika | 2011-07-24 | 1 | -1/+1 |
| |/ | |||||
| * | revup | Friendika | 2011-07-23 | 1 | -1/+1 |
| | | |||||
| * | Merge pull request #145 from tobiasd/master | Friendika | 2011-07-23 | 7 | -37/+123 |
| |\ | | | | | | | dispy ACL and addon license | ||||
| | * | Merge branch 'master' of git://github.com/friendika/friendika | Tobias Diekershoff | 2011-07-23 | 1 | -71/+79 |
| | |\ | | |/ | |/| | |||||
| * | | Merge pull request #144 from fabrixxm/newacl | Friendika | 2011-07-22 | 1 | -71/+79 |
| |\ \ | | | | | | | | | fix "resend" function when editor is disabled | ||||
| | * | | 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 |
| | | | | |||||
| | | * | Merge github.com:tobiasd/friendika | Tobias Diekershoff | 2011-07-22 | 4 | -6/+6 |
| | |/| | |/| | | |||||
| | | * | removed the "same as friendika" note from the license line | Tobias Diekershoff | 2011-07-21 | 4 | -6/+6 |
| | | | | |||||
* | | | | Initial work on new UI | Fabio Comuni | 2011-07-22 | 12 | -12/+761 |
|/ / / | |||||
* | | | typo | Friendika | 2011-07-21 | 1 | -1/+1 |
| | | | |||||
* | | | better fix for bug #107, last one was flawed | Friendika | 2011-07-21 | 4 | -3/+4 |
| | | | |||||
* | | | provide fake first arg to ajax updater | Friendika | 2011-07-21 | 2 | -7/+6 |
| | | | |||||
* | | | revup | Friendika | 2011-07-21 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #143 from fabrixxm/newacl | Friendika | 2011-07-21 | 3 | -6/+17 |
|\| | | | | | | | | Use new ACL selector in photo edit | ||||
| * | | Use new ACL selector in photo edit | Fabio Comuni | 2011-07-20 | 3 | -6/+17 |
| | | | |||||
* | | | wrong path for salmon verify | Friendika | 2011-07-20 | 4 | -4/+3 |
| |/ |/| | |||||
* | | ajax pause - any key to resume | Friendika | 2011-07-20 | 2 | -1/+9 |
| | | |||||
* | | Merge pull request #142 from fabrixxm/newacl | Friendika | 2011-07-20 | 35 | -112/+1814 |
|\| | | | | | More on ACL and editor | ||||
| * | Use popup ACL selector in photo upload. js_upload use new acl selector. | Fabio Comuni | 2011-07-20 | 4 | -15/+35 |
| | | |||||
| * | Load tinyMCE on post editor only if needed. | Fabio Comuni | 2011-07-20 | 5 | -67/+98 |
| | | |||||
| * | Recursive string replacement in template | Fabio Comuni | 2011-07-20 | 1 | -4/+9 |
| | | |||||
| * | Merge remote-tracking branch 'friendika/master' into newacl | Fabio Comuni | 2011-07-20 | 38 | -154/+859 |
| |\ | |/ |/| | |||||
* | | register hook | Friendika | 2011-07-19 | 1 | -0/+2 |
| | | |||||
* | | diaspora encryption xml template | Friendika | 2011-07-19 | 1 | -0/+8 |
| | | |||||
* | | diaspora salmon endpoint (decryption not yet provided) | Friendika | 2011-07-19 | 1 | -0/+215 |
| | | |||||
* | | Merge branch 'pull' | Friendika | 2011-07-19 | 17 | -120/+561 |
|\ \ | |||||
| * \ | Merge pull request #141 from fabrixxm/newacl | Friendika | 2011-07-19 | 17 | -120/+561 |
| |\ \ | | | | | | | | | New jot ACL selector | ||||
* | | | | revup | Friendika | 2011-07-19 | 1 | -1/+1 |
|/ / / | |||||
* | | | lack of guarantee is not a license term, but a disclaimer | Friendika | 2011-07-19 | 1 | -1/+3 |
| | | | |||||
* | | | resize editor | Friendika | 2011-07-18 | 2 | -2/+2 |
| | | | |||||
* | | | created license with which to renounce the license | Friendika | 2011-07-18 | 2 | -2/+23 |
| | | | |||||
* | | | improved code blocks | Friendika | 2011-07-18 | 2 | -2/+16 |
| | | | |||||
* | | | basic diaspora discovery | Friendika | 2011-07-18 | 7 | -4/+60 |
| | | | |||||
* | | | green icons for greenzero | Friendika | 2011-07-18 | 3 | -1/+8 |
| | | | |||||
* | | | bug #104 | Friendika | 2011-07-17 | 2 | -20/+24 |
| | | | |||||
* | | | invite system | Friendika | 2011-07-17 | 5 | -5/+55 |
| | | | |||||
* | | | begin invites, fb setup changes | Friendika | 2011-07-17 | 7 | -8/+62 |
| | | | |||||
* | | | change license | Friendika | 2011-07-17 | 2 | -43/+0 |
| | | | |||||
* | | | header fix post_url | Friendika | 2011-07-16 | 1 | -3/+3 |
| | | | |||||
* | | | Merge branch 'pull' | Friendika | 2011-07-15 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge pull request #140 from tobiasd/master | Friendika | 2011-07-15 | 1 | -1/+1 |
| |\ \ \ | | | | | | | | | | | we found a little problem with the SN connector and fixed it | ||||
| | * | | | fix for login problems with StatusNet | Tobias Diekershoff | 2011-07-15 | 1 | -1/+1 |
| | | | | |