aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2 from friendica/masterPaolo T2014-09-02221-10101/+12522
|\
| * minor nitsfriendica2014-09-011-4/+8
| * fix phantom attachments in feedsfriendica2014-09-012-2/+2
| * pull in some posts when first connecting to feedsfriendica2014-09-011-2/+1
| * logic invertedfriendica2014-09-011-1/+1
| * issue #578 - this won't fix old items but should work going forward. The extr...friendica2014-09-012-2/+2
| * Merge pull request #576 from beardy-unixer/masterRedMatrix2014-09-025-15/+54
| |\
| | * Don't forget the ifs. Now we just need to write some blurb, find someThomas Willingham2014-09-021-4/+4
| | * Move achievements on, but just a tad.Thomas Willingham2014-09-022-10/+22
| | * If you have a new channel (or a new hub searching for an old channel)Thomas Willingham2014-09-021-5/+9
| | * Merge remote-tracking branch 'upstream/master'Thomas Willingham2014-09-0217-1411/+1673
| | |\ | | |/ | |/|
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-012-1337/+1389
| |\ \
| | * \ Merge pull request #577 from tuscanhobbit/masterPaolo T2014-09-012-1337/+1389
| | |\ \ | |_|/ / |/| | |
* | | | Italian strings updatedPaolo Tacconi2014-09-012-3/+3
* | | | Italian strings updatedPaolo Tacconi2014-09-012-1335/+1387
| * | | use feed icon as default avatar for rss connectionsfriendica2014-09-013-3/+6
| |/ /
| * | make fuckin twitter plugin work by selling my soul to the devil for a fuckin ...friendica2014-09-011-1/+1
| * | honour the feed_contacts settingfriendica2014-09-012-1/+6
| * | get out the sunniesfriendica2014-08-315-8/+33
| * | various rss fixesfriendica2014-08-312-11/+25
| * | service class check for feeds. Note limit is account based, not channel based.friendica2014-08-311-21/+33
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-311-4/+4
| |\ \
| | * | Finally updated/re-translated the Dutch introduction textJeroen2014-08-311-4/+4
| * | | rss feed discoveryfriendica2014-08-312-25/+178
| |/ /
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-08-311-1/+1
| |\ \
| | * | missing 'jeroenpraat2014-08-311-1/+1
| * | | sql error in profile_activityfriendica2014-08-313-6/+4
| |/ /
| | * Add check_upstream_directory() to check that your directory is stillThomas Willingham2014-08-312-0/+23
| |/
| * doc change - read it.friendica2014-08-301-0/+3
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-08-304-910/+973
| |\
| | * update nl + Friendica>RedMatrix in two text filesJeroen2014-08-304-910/+973
| * | insecure network filterfriendica2014-08-302-2/+41
| |/
| * various diaspora issuesfriendica2014-08-295-22/+82
| * doc updatefriendica2014-08-2946-990/+1157
| * more queue tweaksfriendica2014-08-282-2/+2
| * the queue driver is universal now - we don't need to filter it.friendica2014-08-281-1/+1
| * except for a typofriendica2014-08-281-3/+1
| * fix saving of extended profile attributesfriendica2014-08-281-0/+38
| * lots of little Diaspora issuesfriendica2014-08-284-10/+46
| * retro-actively set standalone directory fix, also a fix for directory endless...friendica2014-08-282-1/+12
| * remove noisy log statementfriendica2014-08-281-2/+0
| * when updating the commented timestamp on the parent post (item_store) don't i...friendica2014-08-282-2/+5
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-08-282-11/+3
| |\
| | * Merge pull request #575 from encyclomundi/masterRedMatrix2014-08-291-1/+1
| | |\
| | | * change the name of the app from Channel Select to Channel ManagerCharles2014-08-281-1/+1
| | |/
| | * minor css fixes and cleanupmarijus2014-08-281-10/+2
| * | Ability to close comments at a certain date/time - needed for loom.io emulati...friendica2014-08-286-58/+106
| |/
| * let's make this "specific" since that's what it is.friendica2014-08-282-1/+3
| * really really really fix lockview - maybefriendica2014-08-281-2/+3
| * consistency: the diaspora post plugin uses "diaspora_enable". The protocol dr...friendica2014-08-282-4/+4