zzottel
f2335448f4
Merge pull request #632 from zzottel/master
...
more updates to German strings plus email templates
2014-10-10 14:57:25 +02:00
zottel
8fe0fbf6fe
more updates to German strings plus email templates
2014-10-10 14:54:41 +02:00
zzottel
113eb25cc7
Merge pull request #631 from zzottel/master
...
remove unused email template files
2014-10-10 11:45:51 +02:00
zottel
2790d9f146
remove unused email template files
2014-10-10 11:42:46 +02:00
zzottel
2b02bf9aa4
Merge pull request #630 from zzottel/master
...
update to German strings
2014-10-10 09:42:24 +02:00
zottel
3a90d037f9
update to German strings
2014-10-10 09:41:14 +02:00
friendica
cde244ef74
improvement in source route checking when handling complex *upstream* delivery chains, which were not adequately accounted for in the earlier checkin.
2014-10-10 00:13:46 -07:00
friendica
8e7e488ffe
doc updates
2014-10-10 00:13:00 -07:00
friendica
4634049549
allow (our own) ajax urls to pass through bbcode intact.
2014-10-09 20:59:33 -07:00
friendica
c782272927
Merge https://github.com/friendica/red into pending_merge
2014-10-09 18:39:07 -07:00
friendica
effc8960c3
OK this is important. So read it carefully.
...
This checkin implements route matching of comments so that they are only accepted from the same route as the top-level post they are attached to. This way there should be no mis-match of permissions between any posts in the thread. It may not be completely compatible with comments posted in the past (though I've tried to be, there may be some minor issues). In addition it seems that relaying was invoked more often than necessary - especially when a duplicate post arrived which was not processed because the edited time hadn't changed - it still invoked relaying. This fix should improve site performance considerably for comments cross-posted to forums; which got bounced around a bit and delivered redundantly for no reason.
Roll this back *only* if it causes a meltdown or comment loss is "serious" (as in OMG people are dying, make it stop!). If we can get past 24 hours without serious issue we need to get everybody onto this code. There may be some minor comment loss (mostly affecting new comments to older posts or likes of older comments) until the majority of sites have moved to the new code.
It may be difficult or impossible to deliver comments to posts that pre-date the addition of source routes (April 1, 2014) to anybody but the top-level post author at his/her primary hub. We may wish to close comments on these posts, but let's see how we go before doing that.
2014-10-09 18:12:53 -07:00
friendica
9a7d1aa488
add site apps directory to .gitignore
2014-10-09 15:25:08 -07:00
friendica
1adb7a2eef
allow a site to over-ride the system app list without causing git issues
2014-10-09 15:22:21 -07:00
Jeroen
77fc267f73
Added the display setting for generic (other) content wrapper. Also did set the default a bit lighter. See if that's ok.
2014-10-09 20:55:44 +00:00
Jeroen
e06c3e5a91
Added and changed on some places div class generic-content-wrapper. And added to redbasic. Other thems can now also theme backgrounds of a lot of pages. I'm not completely done, but till now - this is it.
2014-10-09 14:54:04 +00:00
friendica
6b48672343
Merge https://github.com/friendica/red into pending_merge
2014-10-09 03:37:53 -07:00
friendica
6806888fa4
return of the missing diaspora wall-to-wall attribution
2014-10-09 03:36:50 -07:00
marijus
d16d026e56
remove some cruft - revert if you find any regressions
2014-10-09 12:28:54 +02:00
marijus
156c317a0a
fix css for [code]
2014-10-09 12:05:22 +02:00
marijus
f9200027d0
fix userinfo icon size
2014-10-09 11:31:48 +02:00
marijus
a8df8165ea
more css fixes
2014-10-09 11:21:13 +02:00
marijus
cd188cb70d
css fixes
2014-10-09 10:53:30 +02:00
friendica
fc0576acf8
try to track down intermittent wall-to-wall attribution on Diaspora exported posts
2014-10-09 01:02:54 -07:00
friendica
9ac12d6f32
oembed issues
2014-10-08 20:37:46 -07:00
friendica
6d0fbba7b4
change parent constructor per discussion
2014-10-08 17:12:10 -07:00
friendica
ddcc0ad567
dav issue
2014-10-08 16:47:30 -07:00
friendica
15a17280d9
Merge https://github.com/friendica/red into pending_merge
2014-10-08 15:59:04 -07:00
friendica
bca4d540e0
disable email notifications when bulk importing content.
2014-10-08 15:15:20 -07:00
RedMatrix
5fa1753108
Merge pull request #622 from solstag/master
...
update pt-br translation
2014-10-09 08:53:58 +11:00
RedMatrix
6f2bf5162c
Merge pull request #627 from tuscanhobbit/dev
...
The simplest way to hide hubs in statistics
2014-10-09 08:53:47 +11:00
friendica
202039d389
don't double-encode hashtags
2014-10-08 14:47:24 -07:00
tuscanhobbit
9edaa2843b
it's probably better to return an int type in json
2014-10-08 19:03:07 +02:00
tuscanhobbit
c7c76cf221
The simplest way to hide hubs in statistics
2014-10-08 18:56:42 +02:00
Jeroen
29faf955f6
Small fix so search field and search buttons fit well.
2014-10-08 13:17:56 +00:00
marijus
9a1c3f10b2
Merge branch 'master' of https://github.com/friendica/red
2014-10-08 15:09:54 +02:00
marijus
0dcbebba77
css fix
2014-10-08 15:09:31 +02:00
friendica
1fc3138c37
soundcloud using a slightly different oembed mechanism - react accordingly
2014-10-08 06:09:15 -07:00
RedMatrix
98af2de9b4
Merge pull request #626 from habeascodice/master
...
regex missing terminator char
2014-10-08 23:30:24 +11:00
marijus
096fbdb31c
make nav-pills a bit smaller in height
2014-10-08 13:18:17 +02:00
marijus
289f57f79e
template for searchbox and some more work on saved searches
2014-10-08 12:36:26 +02:00
marijus
634c2ef8ce
nav pills for apps aside
2014-10-08 10:07:19 +02:00
marijus
38e37d8d68
Merge branch 'master' of https://github.com/friendica/red
2014-10-08 09:49:21 +02:00
marijus
e05c0a8bc4
make author link bold again
2014-10-08 09:24:34 +02:00
RedMatrix
b52d575e95
Merge pull request #625 from letterbomber/master
...
put back local file check so body is fetched from z_ functions
2014-10-08 18:14:27 +11:00
nostupidzone
9d5129de34
put back local file check so body is fetched from z_ functions
2014-10-07 23:59:26 -07:00
marijus
e5d346cdc6
css fixes
2014-10-08 08:45:59 +02:00
friendica
ee6c53c2e5
add imagick version check when guessing mimetype. It probably isn't important here, but let's make sure we have the right driver installed if we do something else with photos afterward.
2014-10-07 21:16:30 -07:00
friendica
2975c6dd43
stylish_select wants to attach itself to the root html element. Since it still has some serious issues, don't let it attach itself to anything.
2014-10-07 21:06:23 -07:00
friendica
b595f9d3ee
log the recursive reshare from hell at logger_debug until we get through this mess.
2014-10-07 20:42:57 -07:00
friendica
fa75d43b81
add "stacked pills" to saved search term list (the delete icon is still a bit funky)
2014-10-07 20:31:15 -07:00
zzottel
friendica
Jeroen
marijus
tuscanhobbit
nostupidzone