Commit graph

11270 commits

Author SHA1 Message Date
friendica
17c1ddb77e updated compatibility notes 2014-09-02 04:39:01 -07:00
Paolo T
fee5b6bd15 Merge pull request #2 from friendica/master
Merge from main project
2014-09-02 13:15:59 +02:00
friendica
9dac46ca25 minor nits 2014-09-01 22:59:11 -07:00
friendica
688722de5b fix phantom attachments in feeds 2014-09-01 20:59:53 -07:00
friendica
5aa18a11af pull in some posts when first connecting to feeds 2014-09-01 20:47:01 -07:00
friendica
f64abf3ad8 logic inverted 2014-09-01 20:41:05 -07:00
friendica
148f4e8795 issue #578 - this won't fix old items but should work going forward. The extra time slop shouldn't be needed and will in fact result in possibly undesired redundancy. 2014-09-01 19:55:43 -07:00
RedMatrix
43738da24f Merge pull request #576 from beardy-unixer/master
Allow directories to stop being directories without killing anyone.
2014-09-02 12:28:30 +10:00
Thomas Willingham
6d7897a955 Don't forget the ifs. Now we just need to write some blurb, find some
images, add a link, and decide what to do with non-earned badges...basically
all of it.
2014-09-02 02:37:23 +01:00
Thomas Willingham
ab031664fa Move achievements on, but just a tad. 2014-09-02 02:34:04 +01:00
Thomas Willingham
393b3bb213 If you have a new channel (or a new hub searching for an old channel)
which uses an xchan_url other than channel or profile, chanview will
fail to find $a->poi and fail as there is no way to import the xchan.

Instead of giving up and presenting an error, we'll send you to the
requested URL anyway.  If we send you with a Zid, there's a good
chance you'll authenticate because xchans are like glitter - once you've
got one, they get everywhere, and there's a good chance you'll know
*somebody* at the hub.
.
2014-09-02 01:58:53 +01:00
Thomas Willingham
1c0be39943 Merge remote-tracking branch 'upstream/master' 2014-09-02 01:57:30 +01:00
friendica
d507484cc5 Merge https://github.com/friendica/red into pending_merge 2014-09-01 16:33:19 -07:00
friendica
a2146021f3 use feed icon as default avatar for rss connections 2014-09-01 16:32:35 -07:00
Paolo T
d98bf1d33b Merge pull request #577 from tuscanhobbit/master
Italian strings updated
2014-09-01 16:06:56 +02:00
Paolo Tacconi
a1f85cda3e Italian strings updated 2014-09-01 16:03:30 +02:00
Paolo Tacconi
f2d959e1aa Italian strings updated 2014-09-01 14:47:38 +02:00
friendica
46d96eff14 make fuckin twitter plugin work by selling my soul to the devil for a fuckin api key. Are y'all fuckin happy? 2014-09-01 05:00:31 -07:00
friendica
76a72a997d honour the feed_contacts setting 2014-09-01 04:17:10 -07:00
friendica
2a37d99958 get out the sunnies 2014-08-31 22:15:00 -07:00
friendica
a63de472cf various rss fixes 2014-08-31 20:51:05 -07:00
friendica
89d5c42df1 service class check for feeds. Note limit is account based, not channel based. 2014-08-31 19:30:35 -07:00
friendica
d400514289 Merge https://github.com/friendica/red into pending_merge 2014-08-31 18:50:44 -07:00
friendica
f8e6395ef3 rss feed discovery 2014-08-31 18:50:30 -07:00
Jeroen
e721220340 Finally updated/re-translated the Dutch introduction text 2014-08-31 23:26:17 +00:00
friendica
0517e22e82 Merge https://github.com/friendica/red into pending_merge 2014-08-31 16:24:37 -07:00
friendica
2d0ad0625a sql error in profile_activity 2014-08-31 16:24:05 -07:00
jeroenpraat
888c5dc849 missing ' 2014-08-31 21:25:33 +02:00
Thomas Willingham
473e582d1f Add check_upstream_directory() to check that your directory is still
a directory, and if it isn't, let find_upstream_directory() find you
a new one.
2014-08-31 16:58:17 +01:00
friendica
45c35d97b8 doc change - read it. 2014-08-30 22:53:21 -07:00
friendica
88f2c19ef6 Merge https://github.com/friendica/red into pending_merge 2014-08-30 17:04:13 -07:00
friendica
e9bf742cc7 insecure network filter 2014-08-30 17:03:26 -07:00
Jeroen
3e8f9e8b62 update nl + Friendica>RedMatrix in two text files 2014-08-30 14:07:38 +00:00
friendica
88f8900ac5 various diaspora issues 2014-08-29 17:31:40 -07:00
friendica
345d170236 doc update 2014-08-29 17:31:29 -07:00
friendica
c6b67518d6 more queue tweaks 2014-08-28 22:55:40 -07:00
friendica
00004e1a12 the queue driver is universal now - we don't need to filter it. 2014-08-28 22:42:19 -07:00
friendica
0825ec81c1 except for a typo 2014-08-28 22:27:05 -07:00
friendica
feddf5d7fb fix saving of extended profile attributes 2014-08-28 22:18:11 -07:00
friendica
8a62b824f9 lots of little Diaspora issues 2014-08-28 21:49:13 -07:00
friendica
95def2a247 retro-actively set standalone directory fix, also a fix for directory endless scroll when you hit the end. 2014-08-28 19:05:13 -07:00
friendica
e20fe41f23 remove noisy log statement 2014-08-28 17:26:53 -07:00
friendica
ae3047791c when updating the commented timestamp on the parent post (item_store) don't include any time travelling posts. They can mess up the conversation sort order in a big way until they're actually published. 2014-08-28 17:25:00 -07:00
friendica
b27e21472b Merge https://github.com/friendica/red into pending_merge 2014-08-28 16:57:43 -07:00
friendica
53b5cf7f50 Ability to close comments at a certain date/time - needed for loom.io emulation (and many other uses) 2014-08-28 16:56:13 -07:00
RedMatrix
0b9adbc080 Merge pull request #575 from encyclomundi/master
change the name of the app from Channel Select to Channel Manager
2014-08-29 09:38:59 +10:00
Charles
f53b1ff9bb change the name of the app from Channel Select to Channel Manager 2014-08-28 16:33:23 -07:00
marijus
9945cc7129 minor css fixes and cleanup 2014-08-28 23:05:47 +02:00
friendica
f526a10f07 let's make this "specific" since that's what it is. 2014-08-28 04:14:49 -07:00
friendica
d0af6b501f really really really fix lockview - maybe 2014-08-28 04:04:38 -07:00