aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'friendika/master' into newuifabrixxm2011-08-2637-777/+3738
|\
| * don't allow fullscreen for youtube iframe - this makes it hard to visit the ↵Friendika2011-08-263-8/+30
| | | | | | | | network page when they throw an error
| * more logging diaspora pubdeliverFriendika2011-08-251-2/+9
| |
| * one more little tweak to linkificatorFriendika2011-08-251-1/+1
| |
| * tweak to bbcode linkificatorFriendika2011-08-251-1/+1
| |
| * some minor work on contact edit pageFriendika2011-08-256-6/+38
| |
| * diaspora2bb, salmon fix argument errorFriendika2011-08-254-56/+25
| |
| * third attempt to get rid of this stupid warningFriendika2011-08-251-1/+1
| |
| * theme settings for contact photo menuFriendika2011-08-255-4/+71
| |
| * contact photo menuFriendika2011-08-243-22/+11
| |
| * contact menu beginningsFriendika2011-08-244-1/+95
| |
| * missing salmon key? report it.Friendika2011-08-244-5/+16
| |
| * Merge branch 'pull'Friendika2011-08-242-490/+2755
| |\
| | * Merge pull request #162 from omigeot/mastertobiasd2011-08-242-490/+2755
| | |\ | | | | | | | | French translation
| | | * French translation up to date.Olivier Migeot2011-08-242-490/+2755
| | |/
| * / revupFriendika2011-08-241-1/+1
| |/
| * change the way public feeds work just to fix statusnet's bug, because they won'tFriendika2011-08-241-3/+20
| |
| * cleaned up the conditions on when to and when not to relay.Friendika2011-08-243-9/+43
| |
| * turn off notifier - runawayFriendika2011-08-241-2/+2
| |
| * don't accept pubsub from diasporaFriendika2011-08-241-0/+6
| |
| * Merge branch 'pull'Friendika2011-08-241-2/+2
| |\
| | * Merge pull request #161 from tobiasd/mastertobiasd2011-08-231-2/+2
| | |\ | | | | | | | | fix for DE strings.php
| | | * Merge github.com:tobiasd/friendikaTobias Diekershoff2011-08-241-2/+2
| | |/|
| | | * fixed a missing string in DETobias Diekershoff2011-08-231-2/+2
| | | |
| * | | D* queueFriendika2011-08-244-72/+94
| |/ /
| * | author and owner sign exactly the same string - apparentlyFriendika2011-08-231-2/+4
| | |
| * | that was ugly - let's do betterFriendika2011-08-231-8/+9
| | |
| * | fix for public posts to D*Friendika2011-08-231-1/+1
| | |
| * | correct time in photo msgFriendika2011-08-231-2/+2
| | |
| * | photo fixesFriendika2011-08-232-4/+4
| | |
| * | fix it againFriendika2011-08-231-1/+1
| | |
| * | fix group public membersFriendika2011-08-231-1/+1
| | |
| * | diaspora photos ?Friendika2011-08-2310-12/+175
| | |
| * | retractions - precedence issueFriendika2011-08-231-2/+2
| | |
| * | testing retractionsFriendika2011-08-231-3/+3
| | |
| * | typoFriendika2011-08-231-2/+2
| | |
| * | don't process diaspora communications if no pubkeyFriendika2011-08-231-0/+6
| | |
| * | include bb2diaspora at top levelFriendika2011-08-231-1/+1
| | |
| * | more testing with imagesFriendika2011-08-231-1/+1
| | |
| * | second tryFriendika2011-08-231-0/+1
| | |
| * | forget about the image link we have it in the wrapperFriendika2011-08-231-1/+1
| | |
| * | photos a bit messed up on d*Friendika2011-08-231-2/+1
| | |
| * | updates bb2mdFriendika2011-08-231-3/+8
| | |
| * | convert bbcode to markdown for diaspora (first try, will need tweaking)Friendika2011-08-232-5/+159
| | |
| * | bad param in like functionFriendika2011-08-221-1/+1
| | |
| * | public posts ~f to D*Friendika2011-08-221-23/+56
| |/
| * d* retractionsFriendika2011-08-222-17/+67
| |
| * invoke notifierFriendika2011-08-221-47/+41
| |
| * diaspora admin toggle, update install guideFriendika2011-08-227-18/+36
| |
* | don't add notification details on new postsfabrixxm2011-08-231-4/+4
| |