Paolo Tacconi
4f793069bf
Merge branch 'master' of https://github.com/friendica/red
2014-09-15 10:01:25 +02:00
marijus
58aad83e5c
this is probably better in most cases
2014-09-15 09:56:30 +02:00
friendica
8fc0be9bb3
Merge https://github.com/friendica/red into pending_merge
2014-09-14 22:46:23 -07:00
friendica
ea8a01791e
allow the site to designate an admin channel that's visible to the outside world (via siteinfo/json). Otherwise we'll use the default channel of any accounts that have the account admin role.
2014-09-14 22:43:56 -07:00
friendica
0dc33900b6
provide a way to sync locations and get rid of bogus hublocs, now implemented
2014-09-14 22:19:19 -07:00
Thomas Willingham
e3b967f475
Very, very cautiously let a developer switch to the sys chan if
...
they're also an administrator.
2014-09-15 03:59:04 +01:00
Thomas Willingham
b6612693b6
Bugger, revert - not only a dodgy cut and paste between terminals, but
...
also pushed to the wrong repo
2014-09-15 03:55:49 +01:00
Thomas Willingham
e3783dfdd4
Very, very cautiously, let a developer switch to the sys chan, if
...
they're also an admin.
2014-09-15 03:51:41 +01:00
friendica
f2b0311f9d
that won't work...
2014-09-14 19:20:16 -07:00
friendica
b2fe2b067a
bb2diaspora_itemwallwall not finding author elements - inserting empty bbcode
2014-09-14 19:17:05 -07:00
friendica
5042847334
fix diaspora_retraction
2014-09-14 19:04:36 -07:00
friendica
bcc9057d8c
pull the plug on the old location sync section of import_xchan - this has now been split off into its own function. Cross fingers because this is core functionality which was tried and true, well tested; and now it's a bit different.
...
Please revert this if the matrix breaks in the next few hours.
2014-09-14 18:09:16 -07:00
Thomas Willingham
b019cbb88a
Merge branch 'master' of https://github.com/friendica/red
2014-09-15 01:41:04 +01:00
Thomas Willingham
6416a61c41
A bit of mod/home refactoring. This is a transient state, so it's still
...
messy, but it'll be much nicer after the move is finished.
2014-09-15 01:38:55 +01:00
friendica
0a5f0fe10b
Merge https://github.com/friendica/red into pending_merge
2014-09-14 17:11:50 -07:00
friendica
6be6b41a42
privacy issue - restrictive stream permission setting with a non-targetted post cannot be enforced on remote networks. Restrict these posts to zot network.
2014-09-14 17:07:39 -07:00
Thomas Willingham
b5241c610f
Deprecate site channel. The sys channel should be doing this. Will fix
...
shortly.
2014-09-15 00:06:51 +01:00
marijus
72bce40a9f
tryout - some more adjustments
2014-09-14 22:37:03 +02:00
Jeroen
9b80667326
Thanks to Thomas other people see now your posts on your channel page also linked to source. If enabled.
2014-09-14 13:59:27 +00:00
Jeroen
254dc0ec98
Made link post titles to source optional in display settings. Hopefully I did a right.
2014-09-14 12:39:11 +00:00
marijus
2728f5a104
tryout - fetch larger thumbnail if image gets streched over its size
2014-09-14 11:57:01 +02:00
friendica
c27b60d981
more heavy lifting on the hubloc management and revocation infrastructure; don't rush me. This is going to become a fundamental part of zot. It deserves careful consideration.
2014-09-14 01:48:54 -07:00
friendica
5f4bcc4ef2
Merge https://github.com/friendica/red into pending_merge
2014-09-13 16:09:07 -07:00
friendica
0350b76d85
some backend work for the remaining missing bits of mod_hubman - this is still a fair ways from being complete and is not ready for prime time. Basically we'll let a channel send out a public message saying "these are my currently approved locations" and anything that isn't in the list will be marked deleted. We'll send out this message when locations change somehow - either through direct personal involvement (hub revoke, change primary, channel import) or during a system rename or "find bad/obsolete hublocs" activity. This way we won't have clones sending back location info we just got rid of and re-importing the bad entries.
2014-09-13 16:00:09 -07:00
Thomas Willingham
969f2530cc
Doco - kill dupe
2014-09-13 19:56:30 +01:00
Thomas Willingham
d84eb8c79a
Bring DB doco up to date
2014-09-13 19:27:24 +01:00
Thomas Willingham
f85aba3a1e
Doco - some links that got stripped at some point
2014-09-13 18:51:51 +01:00
marijus
e8901b2ffe
remove this hub from fallback servers
2014-09-13 19:45:26 +02:00
marijus
5819c442ab
Merge branch 'master' of https://github.com/friendica/red
2014-09-13 16:34:07 +02:00
marijus
dfc8430c8a
cleanup after recent changes in mod photos
2014-09-13 16:33:20 +02:00
Thomas Willingham
a5a501c90f
Here, have a semi-colon
2014-09-13 15:25:05 +01:00
Thomas Willingham
c8508a310f
Only use one install file
2014-09-13 15:23:40 +01:00
RedMatrix
415be29261
Merge pull request #592 from jeroenpraat/master
...
Issue #590 : Linked conversation titles to source.
2014-09-13 19:24:01 +10:00
friendica
b1809f5f0c
log why this doesn't get executed
2014-09-12 15:10:53 -07:00
friendica
7fc1a66121
Merge https://github.com/friendica/red into pending_merge
2014-09-12 14:24:45 -07:00
friendica
5fd0d6f7d5
make the xchan diagnostic tool useful
2014-09-12 14:23:42 -07:00
marijus
61ce524a33
define justifiedGalleryActive in head.tpl to not break other pages autoload
2014-09-12 21:32:53 +02:00
jeroenpraat
d4e7a71d1e
Issue #590 : Linked conversation titles to source.
...
If a theme wants to have it different, it can always copy this .tpl file to ../theme/tpl/. I didn't commit this directly, because it's a little bit controversial. But I like it!
2014-09-12 21:21:16 +02:00
marijus
72c30ea444
Merge branch 'master' of https://github.com/friendica/red
2014-09-12 21:07:28 +02:00
marijus
12900129bb
reset testing values back to default
2014-09-12 21:06:37 +02:00
marijus
bd2139d16a
do not load next page if justifiedGallery() is not ready yet
2014-09-12 21:04:43 +02:00
Jeroen
11d3ef6176
This is even better. Adapts better to Red user settings.
2014-09-12 18:55:53 +00:00
Jeroen
59c537b06d
H1-H6 simplified (less font sizes), rem
2014-09-12 18:41:35 +00:00
Jeroen
e1cb4b2833
expert_mode > expert
2014-09-12 18:18:46 +00:00
Jeroen
e004744696
Fixed. Thanks to Thomas.
2014-09-12 14:31:02 +00:00
Paolo T
ed7f3001c1
Merge pull request #2 from friendica/master
...
IT localization updated
2014-09-12 15:15:06 +02:00
Paolo T
c576689897
Merge pull request #591 from tuscanhobbit/dev
...
IT localization updated
2014-09-12 15:06:37 +02:00
tuscanhobbit
2e8feaa919
IT localization updated
2014-09-12 14:26:05 +02:00
Jeroen
c3f74b5609
Addon count on addon settings page (featured) doesnt work (always 0). Commented out.
2014-09-12 12:09:32 +00:00
friendica
701ae2981d
doc updates
2014-09-12 01:59:31 -07:00