aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendika/master'Fabio Comuni2011-07-2933-273/+846
|\
| * api/statusnet/config.xmlFriendika2011-07-282-10/+36
| |
| * one more try - do not link numeric hash tagsFriendika2011-07-281-1/+1
| |
| * make profile-jot-desc track lock state changesFriendika2011-07-282-0/+5
| |
| * auto-friend profiles showing up in directory as community pagesFriendika2011-07-281-1/+1
| |
| * issue with remote mentionsFriendika2011-07-281-1/+1
| |
| * more progress on key conversion functionsFriendika2011-07-281-3/+94
| |
| * Merge branch 'pull'Friendika2011-07-282-7/+17
| |\
| | * Merge pull request #149 from tobiasd/mastertobiasd2011-07-282-7/+17
| | |\ | | | | | | | | wording for StatusNet and Twitter config cleared
| | | * Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-07-281-2/+2
| | | |\ | | | |/ | | |/|
| | | * config page formatation issues fixedTobias Diekershoff2011-07-281-1/+2
| | | |
| | | * clearing the wordenting for the addon configTobias Diekershoff2011-07-282-8/+17
| | | |
| * | | revupFriendika2011-07-283-4/+4
| |/ /
| * / show full size photos for album view even when photo has been used as a ↵Friendika2011-07-281-2/+2
| |/ | | | | | | profile photo
| * installer text changesFriendika2011-07-272-4/+4
| |
| * show lock icon on private eventsFriendika2011-07-273-1/+6
| |
| * privacy issue introduced yesterdayFriendika2011-07-261-1/+1
| |
| * privacy settings on event item not propagated correctlyFriendika2011-07-261-4/+4
| |
| * deal with browser pre-fetch of the ACL img template '{0}'Friendika2011-07-262-1/+7
| |
| * configurable format for date input selectorsFriendika2011-07-253-35/+91
| |
| * ignore any fully numeric hash tagFriendika2011-07-251-1/+1
| |
| * auto focus jot editorFriendika2011-07-251-0/+1
| |
| * helper functions for Diaspora cert manglingFriendika2011-07-252-0/+224
| |
| * event ownership issuesFriendika2011-07-252-3/+3
| |
| * provide ability to use different portFriendika2011-07-251-2/+3
| |
| * Merge branch 'pull'Friendika2011-07-252-10/+17
| |\
| | * Merge pull request #148 from fabrixxm/newaclfabrixxm2011-07-242-10/+17
| | |\ | | | | | | | | Remove "share" greyed text in jot editor when user reshare an item
| | | * Remove "share" greyed text in jot editor when user reshare an itemFabio Comuni2011-07-252-10/+17
| | |/
| * / revupFriendika2011-07-251-1/+1
| |/
| * Merge branch 'pull'Friendika2011-07-244-81/+117
| |\
| | * Merge pull request #147 from tobiasd/mastertobiasd2011-07-241-0/+3
| | |\ | | | | | | | | link the community page in dispy when enabled
| | | * added link to community page to dispy theme menuTobias Diekershoff2011-07-241-0/+3
| | |/
| | * Merge pull request #146 from tobiasd/mastertobiasd2011-07-243-81/+114
| | |\ | | | | | | | | hide the editor and controls if not with focus in dispy theme, resend works
| | | * dispy theme hide editor if without focusTobias Diekershoff2011-07-243-81/+114
| | |/
| * / revupFriendika2011-07-241-1/+1
| |/
| * revupFriendika2011-07-231-1/+1
| |
| * Merge pull request #145 from tobiasd/masterFriendika2011-07-237-37/+123
| |\ | | | | | | dispy ACL and addon license
| | * 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 disabled
| | * | 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 edit
| | * | Use new ACL selector in photo editFabio Comuni2011-07-203-6/+17
| | | |
* | | | allow GET or POST data in statuses/updateFabio Comuni2011-07-291-6/+17
| | | |