aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0310-34/+183
|\
| * minor editsFriendika2011-06-031-1/+3
| * document newmember link so you can find it later.Friendika2011-06-031-0/+3
| * don't serialize entire itemFriendika2011-06-031-2/+2
| * show new_member page only on our own profileFriendika2011-06-031-1/+1
| * new_member not new_userFriendika2011-06-031-1/+1
| * new member pageFriendika2011-06-033-0/+59
| * facebook queueing on failure, sync update.php with boot.php update version to...Friendika2011-06-036-34/+119
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0311-20/+90
|\|
| * adjust acl_selector max name length to prevent div overflowFriendika2011-06-021-1/+1
| * got it wrong - apparently no need to fix json slashesFriendika2011-06-024-4/+5
| * add queue_deliver plugin hookFriendika2011-06-021-2/+14
| * don't notify failed FB delivery of likes, which have no id.Friendika2011-06-022-3/+4
| * warning message if Facebook post does not succeed. It happens quite a lot.Friendika2011-06-021-10/+14
| * make 'visible to everybody' warning toggle correctly in photos and settingsFriendika2011-06-012-0/+52
| * i before e, except after....Friendika2011-06-012-2/+2
* | Update to the German language filesTobias Diekershoff2011-06-012-2592/+2657
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-011-0/+2
|\|
| * add titles to shared items if availableFriendika2011-06-011-0/+2
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-06-0111-9/+4640
|\|
| * improve colour balance and banner on html email notificationsFriendika2011-05-313-3/+4
| * Brazilian (portugese) translationFriendika2011-05-312-0/+4605
| * show group affiliations in contact editorFriendika2011-05-313-0/+24
| * don't count wall posts in unseen network totalFriendika2011-05-312-4/+3
| * put oembed settings into a .settings-block div for consistencyFriendika2011-05-301-2/+4
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-318-11/+46
|\|
| * show linked url on user's contact pageFriendika2011-05-301-3/+3
| * sort wall items by date order instead of id. bug #61Friendika2011-05-302-4/+5
| * on rare occasions posts do not get a parent. The only thing which could cause...Friendika2011-05-292-2/+15
| * order groups by nameFriendika2011-05-291-1/+1
| * bug #87 alert if email settings don't open mailbox, also display last email c...Friendika2011-05-292-1/+22
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-307-20/+4636
|\|
| * bug #62 - opt-out of importing FB friends/conversations but still allow FB po...Friendika2011-05-291-2/+48
| * Czech (cs) languageFriendika2011-05-292-0/+4575
| * readme updateFriendika2011-05-291-5/+5
| * small fixes to item post to try and sort out segfault issues on php 5.3 (?)Friendika2011-05-293-13/+8
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-2819-45/+203
|\|
| * bug #38 ability to restrict profile, wall, photos from non-friendsFriendika2011-05-282-2/+2
| * bug #38 posts and photos only visible to friends if so configuredFriendika2011-05-283-7/+19
| * begin event moduleFriendika2011-05-271-0/+34
| * correct nickname for display link on comment emailsFriendika2011-05-271-2/+2
| * item/event linkageFriendika2011-05-273-1/+6
| * duplicate likes if we posted it locally and it also comes back from FBFriendika2011-05-272-3/+9
| * email - search from, to, cc, and bccFriendika2011-05-271-9/+16
| * don't reset photo permissions unless photo has owner-only permissionsFriendika2011-05-271-1/+13
| * troublesome feed was a 307 redirect. We didn't recognise 307Friendika2011-05-262-2/+10
| * search from network pageFriendika2011-05-264-6/+39
| * add webfinger diagnostic moduleFriendika2011-05-262-1/+25
| * add attachments to FB posts, fix paren string in statusnet, do not insert att...Friendika2011-05-266-16/+33
* | Merge branch 'master' of git://github.com/friendika/friendikaTobias Diekershoff2011-05-2612-1693/+1793
|\|