aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* dispy theme hide editor if without focusTobias Diekershoff2011-07-243-81/+114
* revupFriendika2011-07-231-1/+1
* Merge pull request #145 from tobiasd/masterFriendika2011-07-237-37/+123
|\
| * Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-07-231-71/+79
| |\ | |/ |/|
* | Merge pull request #144 from fabrixxm/newaclFriendika2011-07-221-71/+79
|\ \
| * | fix "resend" function when editor is disabledFabio Comuni2011-07-221-71/+79
| | * dispy ACL into the fancyboxTobias Diekershoff2011-07-233-31/+117
| | * Merge github.com:tobiasd/friendikaTobias Diekershoff2011-07-224-6/+6
| |/| |/| |
| | * removed the "same as friendika" note from the license lineTobias Diekershoff2011-07-214-6/+6
* | | typoFriendika2011-07-211-1/+1
* | | better fix for bug #107, last one was flawedFriendika2011-07-214-3/+4
* | | provide fake first arg to ajax updaterFriendika2011-07-212-7/+6
* | | revupFriendika2011-07-211-1/+1
* | | Merge pull request #143 from fabrixxm/newaclFriendika2011-07-213-6/+17
|\| |
| * | Use new ACL selector in photo editFabio Comuni2011-07-203-6/+17
* | | wrong path for salmon verifyFriendika2011-07-204-4/+3
| |/ |/|
* | ajax pause - any key to resumeFriendika2011-07-202-1/+9
* | Merge pull request #142 from fabrixxm/newaclFriendika2011-07-2035-112/+1814
|\|
| * Use popup ACL selector in photo upload. js_upload use new acl selector.Fabio Comuni2011-07-204-15/+35
| * Load tinyMCE on post editor only if needed.Fabio Comuni2011-07-205-67/+98
| * Recursive string replacement in templateFabio Comuni2011-07-201-4/+9
| * Merge remote-tracking branch 'friendika/master' into newaclFabio Comuni2011-07-2038-154/+859
| |\ | |/ |/|
* | register hookFriendika2011-07-191-0/+2
* | diaspora encryption xml templateFriendika2011-07-191-0/+8
* | diaspora salmon endpoint (decryption not yet provided)Friendika2011-07-191-0/+215
* | Merge branch 'pull'Friendika2011-07-1917-120/+561
|\ \
| * \ Merge pull request #141 from fabrixxm/newaclFriendika2011-07-1917-120/+561
| |\ \
* | | | revupFriendika2011-07-191-1/+1
|/ / /
* | | lack of guarantee is not a license term, but a disclaimerFriendika2011-07-191-1/+3
* | | resize editorFriendika2011-07-182-2/+2
* | | created license with which to renounce the licenseFriendika2011-07-182-2/+23
* | | improved code blocksFriendika2011-07-182-2/+16
* | | basic diaspora discoveryFriendika2011-07-187-4/+60
* | | green icons for greenzeroFriendika2011-07-183-1/+8
* | | bug #104Friendika2011-07-172-20/+24
* | | invite systemFriendika2011-07-175-5/+55
* | | begin invites, fb setup changesFriendika2011-07-177-8/+62
* | | change licenseFriendika2011-07-172-43/+0
* | | header fix post_urlFriendika2011-07-161-3/+3
* | | Merge branch 'pull'Friendika2011-07-151-1/+1
|\ \ \
| * \ \ Merge pull request #140 from tobiasd/masterFriendika2011-07-151-1/+1
| |\ \ \
| | * | | fix for login problems with StatusNetTobias Diekershoff2011-07-151-1/+1
* | | | | revupFriendika2011-07-151-1/+1
* | | | | Merge branch 'pull'Friendika2011-07-156-8/+616
|\| | | |
| * | | | Merge pull request #139 from fabrixxm/updateFriendika2011-07-156-8/+616
| |\ \ \ \ | | |/ / / | |/| | |
* / | | | zot stuffFriendika2011-07-153-2/+201
|/ / / /
* | | | make lighttpd patch specific to lighttpd, intros don't work on apacheFriendika2011-07-141-6/+8
* | | | template for statusnet api config.xmlFriendika2011-07-141-0/+67
* | | | my -> yourFriendika2011-07-141-2/+2
* | | | link tips on nav barFriendika2011-07-144-39/+39