aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge pull request #369 from rdc/masterfriendica2012-07-013-10/+127
| |\
| | * Added more profile data and CSS styling to the /directory pageZvi ben Yaakov (a.k.a rdc)2012-07-013-10/+127
| * | Merge pull request #370 from mschmitt/masterfriendica2012-07-013-1555/+2127
| |\ \
| | * | Esperanto -> 100%Martin Schmitt2012-07-013-1555/+2127
| |/ /
| * / rev updatefriendica2012-06-302-60/+68
| |/
| * bug #437friendica2012-06-301-0/+8
| * restore 'shareable' to feeds after recent feed privacy re-factoringfriendica2012-06-301-1/+1
| * advanced profile themingfriendica2012-06-301-1/+6
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-2913-45/+638
| |\
| | * Merge pull request #368 from fabrixxm/masterfriendica2012-06-2913-45/+638
| | |\
| | | * quattro: fix Forum widget, hide edit profile linkFabrixxm2012-06-293-3/+11
| | | * quattro: some updatesFabrixxm2012-06-2912-45/+629
| | | * nav: pass $baseurl to templateFabrixxm2012-06-291-0/+1
| | |/
| * / convert ent_quotes for jquery calendar title/summaryfriendica2012-06-293-69/+69
| |/
| * maintain page position when hovering on pop-outsfriendica2012-06-281-0/+7
| * more pager limitsfriendica2012-06-281-0/+2
| * wrong column name (- vs _)friendica2012-06-281-1/+1
| * undefined fnfriendica2012-06-281-2/+2
| * remote_self feeds are not privatefriendica2012-06-281-1/+5
| * create third privacy state - public post but not searchable or publicly visiblefriendica2012-06-289-20/+21
| * css smiley classfriendica2012-06-281-35/+35
| * Merge https://github.com/friendica/friendica into pullfriendica2012-06-287-19/+19
| |\
| | * Merge pull request #367 from simonlnu/masterSimon2012-06-284-12/+12
| | |\
| | | * fix item-delete-selected* cssSimon L'nu2012-06-284-12/+12
| | | * Merge remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-282-6/+6
| | | |\ | | | |/ | | |/|
| | * | Merge pull request #366 from fermionic/fix-big-monster-list-logicfermionic2012-06-272-6/+6
| | |\ \
| | | * | fix logic for nested lists--should be OR, not ANDZach Prezkuta2012-06-272-6/+6
| | |/ /
| | | * Merge remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-274-64/+119
| | | |\ | | | |/ | | |/|
| | * | Friendicaland - couple of new 'countries'Thomas Willingham2012-06-271-1/+1
| | | * Merge remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-2622-439/+741
| | | |\
| | | * \ Merge remote-tracking branch 'remotes/upstream/master'Simon L'nu2012-06-250-0/+0
| | | |\ \
| * | | | | remove titles in ostatus even when edited date differs from created datefriendica2012-06-283-143/+147
| |/ / / /
| * | | | Merge pull request #365 from ridcully/masterfriendica2012-06-271-63/+108
| |\ \ \ \
| | * | | | moved api direct message formating to own function.Sebastian Egbers2012-06-261-54/+54
| | * | | | Merge branch 'master' of https://github.com/friendica/friendicaSebastian Egbers2012-06-2627-435/+709
| | |\ \ \ \
| | * | | | | fixed direct message reply in api call.Sebastian Egbers2012-06-251-2/+2
| | * | | | | modified api message reply to set title to conversion title, when replying.Sebastian Egbers2012-06-251-8/+12
| | * | | | | Merge branch 'master' of https://github.com/friendica/friendicaSebastian Egbers2012-06-2530-227/+544
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge remote-tracking branch 'sebastian/master'Max Weller2012-06-231-15/+30
| | |\ \ \ \ \ \
| | | * | | | | | added replyto and subject to direct messages.Sebastian Egbers2012-06-221-7/+18
| | | * | | | | | modified conversion to use x function for parameter checking.Sebastian Egbers2012-06-221-8/+12
| | * | | | | | | add reliable way to get server versionMax Weller2012-06-231-1/+7
| | * | | | | | | make it selectableMax Weller2012-06-231-1/+3
| | * | | | | | | I want HTML code!Max Weller2012-06-231-1/+1
| | * | | | | | | new param getUserObjects to avoid retransmitting the whole user info objectsMax Weller2012-06-231-0/+3
| | * | | | | | | bugfixMax Weller2012-06-231-4/+5
| | * | | | | | | changes on api_direct_messages_box to allow to retrieve conversations and all...Max Weller2012-06-231-13/+5
| | * | | | | | | modified direct_messagesMax Weller2012-06-231-7/+29
| * | | | | | | | insidious little parsing bugfriendica2012-06-262-2/+8
| * | | | | | | | have no idea why the if/endif macro block was getting printed and not processed.friendica2012-06-261-6/+4