aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* fix apps sub-menu on quattro and vierfriendica2012-02-082-1/+1
* Merge branch 'pull'friendica2012-02-0813-1/+4297
|\
| * quattro: added delete button to mail list overviewTobias Diekershoff2012-02-082-34/+13
| * quattro: added delete buttons to groups and contactsTobias Diekershoff2012-02-082-0/+44
| * quattro: group member selection stylingTobias Diekershoff2012-02-082-0/+69
| * Merge branch 'master' of https://github.com/friendica/friendicaTobias Diekershoff2012-02-081-3/+1
| |\
| * | added theme "vier" by Michael VogelTobias Diekershoff2012-02-0811-0/+4204
* | | begin cmin, cmaxfriendica2012-02-082-2/+8
| |/ |/|
* | browser being sent to update_communityfriendica2012-02-081-3/+1
|/
* make individual advanced profile items addressable via script or pluginfriendica2012-02-071-19/+19
* :coffee extended smiliefriendica2012-02-072-1/+2
* beer smiliefriendica2012-02-072-4/+4
* don't link tags enclosed inside Diaspora linksfriendica2012-02-071-0/+26
* more fixes for textmodefriendica2012-02-074-24/+126
* basic support for plaintext editor configuration (disable tinymce), currently...friendica2012-02-062-95/+121
* add toggle to choose sending "friends with" activity even if contact is not h...friendica2012-02-064-47/+54
* beerfriendica2012-02-062-0/+4
* style missing on crepair-namefriendica2012-02-051-0/+2
* Merge branch 'master' into spamfriendica2012-02-052-4/+5
|\
| * roll update 1118 forward, enable update 1119friendica2012-02-052-4/+5
* | Merge branch 'master' into spamfriendica2012-02-042-3/+3
|\|
| * do an optimise after an expungefriendica2012-02-022-3/+3
* | more work on Friendica db driver for b8friendica2012-02-012-46/+39
* | 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