aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into spamfriendica2012-02-019-28/+67
|\
| * add spam flag to item table, DB version not incremented yet, give large sites...friendica2012-02-011-0/+4
| * improvements in d* markdown conversionfriendica2012-02-012-6/+9
| * placeholder - spam tab on network pagefriendica2012-02-011-11/+25
| * add closeness attributefriendica2012-01-314-5/+11
| * transport for email contacts phase IIfriendica2012-01-314-6/+18
* | add uid variable to b8 classesfriendica2012-02-015-26/+1276
* | add spam enginefriendica2012-01-3113-0/+4048
|/
* revupfriendica2012-01-311-1/+1
* allow plugin to abort message posting, fix half-duplex D* relationshipfriendica2012-01-303-0/+22
* Merge branch 'pull'friendica2012-01-303-11/+114
|\
| * Merge pull request #29 from zzottel/masterzzottel2012-01-301-11/+11
| |\
| | * testbubble fix: tools for wall-to-wall items now appear at the bottom where t...zottel2012-01-301-11/+11
| |/
| * quattro: small adjustments to the profile edit styleTobias Diekershoff2012-01-302-0/+6
| * quattro: styling of the edit profile pageTobias Diekershoff2012-01-302-0/+97
* | prune old expired and deleted itemsfriendica2012-01-303-2/+7
* | some zot-id infrastructurefriendica2012-01-293-33/+49
* | store moderated flag if setfriendica2012-01-291-8/+7
* | Merge branch 'pull'friendica2012-01-282-1/+9
|\|
| * moving the pager down below the contact/photo list in quattroTobias Diekershoff2012-01-282-1/+9
* | mime_content_type requires access to the file, not just the namefriendica2012-01-283-9/+9
|/
* logging of manage identitiesfriendica2012-01-272-3/+8
* typo was also in database.sqlfriendica2012-01-271-1/+1
* typo in update - criticalfriendica2012-01-262-4/+7
* for people whose DB's are not updatingfriendica2012-01-261-1/+1
* fix some changes lost from another branchfriendica2012-01-263-8/+10
* restore diaspora test modefriendica2012-01-261-1/+6
* slackr -> wall-to-wall comment form background different than regular commentfriendica2012-01-261-1/+1
* page delegationfriendica2012-01-264-3/+205
* backend for delegating forumsfriendica2012-01-266-27/+103
* D* event formattingfriendica2012-01-251-1/+2
* new event current date off by one, submit button misplacedfriendica2012-01-253-4/+5
* by default allow pseudonymsfriendica2012-01-253-2/+10
* redirect to a useful location after deleting or ignoring a friend request, be...friendica2012-01-243-4/+31
* more robust cache api handling (was throwing errors on occasion)friendica2012-01-241-5/+16
* backtrace errant input to base64url_decodefriendica2012-01-241-0/+5
* bug #254friendica2012-01-242-1/+31
* implement "moderate" flag on itemsfriendica2012-01-2317-36/+41
* shaka, slackr themefriendica2012-01-234-1/+98
* Merge pull request #28 from fabrixxm/masterfabrixxm2012-01-234-4/+5
|\
| * nav: fix "See all notifications"Fabio Comuni2012-01-234-4/+5
|/
* more logging of D* photo transactionsfriendica2012-01-221-1/+8
* Merge branch 'pull'friendica2012-01-224-3/+4
|\
| * Merge pull request #27 from fabrixxm/masterfabrixxm2012-01-224-3/+4
| |\
| | * nav: fix intro notification url, fix "See all notifications" url and make it ...Fabio Comuni2012-01-224-3/+4
| |/
* / revupfriendica2012-01-221-1/+1
|/
* bug #253 use MSQLI_ASSOC, not MYSQL_ASSOCfriendica2012-01-212-2/+2
* revupfriendica2012-01-201-1/+1
* revupfriendica2012-01-191-1/+1
* add remove_user hook (it looks like dreamhost changed all my file permissions...friendica2012-01-181578-1/+7