aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\
| | * 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 profi...Friendika2011-07-281-2/+2
|/
* 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 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
| |\
| | * 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
| |\
| | * 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
|\
| * 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
| |\ | |/ |/|