friendica
8d8d739242
Merge https://github.com/friendica/red into pending_merge
2014-04-09 21:13:40 -07:00
friendica
795d741713
issue #400 - lock not showing up for previews of private mentions (or 'new/search' item view)
...
also reformat the new/search template to pick up recent changes to conv_item.tpl
2014-04-09 21:11:49 -07:00
RedMatrix
5d5ff22b1d
Merge pull request #399 from git-marijus/master
...
change the way jot tools are displayed/hidden
2014-04-10 13:54:34 +10:00
friendica
46ed2570b8
whitespace - nothing else
2014-04-09 20:11:52 -07:00
friendica
a87d54344f
Merge https://github.com/friendica/red into pending_merge
2014-04-09 16:31:07 -07:00
friendica
bf41ccbf35
'anybody in this network' permissions were not being allowed for non-connected channels.
2014-04-09 16:30:03 -07:00
RedMatrix
d25e902761
Merge pull request #401 from sasiflo/master
...
Extended theme redbasic: Allow to center the content (aside + converse)
2014-04-10 08:59:54 +10:00
sasiflo
9cb48204eb
Correction for #401 : Theme redbasic extended.
...
Use max-width instead of width to allow mobile devices to reflow the content.
2014-04-10 00:22:52 +02:00
sasiflo
036d907a4b
Extended theme redbasic: Allow to center the content (aside + converse)
...
Added an option to settings of redbasic theme. You are now able to
activate centering the left aside and the conversion regions in the
middle of the screen. This respects configuration of conversion region
width and works without special actions for mobile devices.
TODO: Find a way to handle conversion width given in percent.
2014-04-09 23:13:25 +02:00
marijus
b88a7fc23a
use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair editblock and editlayout which still depended on it.
2014-04-09 18:29:22 +02:00
marijus
74bd772a5b
replace lock icon with icon-{lock, unlock}
2014-04-09 17:10:07 +02:00
marijus
c4233232b7
Merge branch 'master' of https://github.com/friendica/red
2014-04-09 10:08:12 +02:00
friendica
c7080edb16
strip affinity tool labels on ultra-small screens; otherwise they just smush together
2014-04-08 21:19:55 -07:00
marijus
b52ccaa9e1
whitespace cleanup
2014-04-08 22:37:58 +02:00
marijus
9f621dac85
change the way jot tools are displayed/hidden
2014-04-08 22:07:06 +02:00
friendica
95751dddff
some fixes to #395
2014-04-07 20:20:28 -07:00
friendica
d820fa155b
possible fix for issue #398
2014-04-07 18:32:22 -07:00
friendica
28228f5862
pass the original element title through the element stack so that it we don't lose it in the ajaxuploader.
2014-04-07 17:34:53 -07:00
friendica
03753f463e
convert /network saved search to bootstrap buttons
2014-04-07 16:25:35 -07:00
friendica
74029a9ee9
this should be better - "xchan deleted" state on remote sites only follows the xchan_flags and not the channel_pageflags; XCHAN_FLAGS_DELETED should only be set if the channel is to be removed from the entire network. As mentioned in a previous commit, channel_pageflags could be set to PAGE_REMOVED but still leave living clones on other sites.
2014-04-07 16:10:43 -07:00
friendica
7e160a7b04
undo one of yesterday's changes - if a channel was deleted we want to mark the hubloc deleted - but not the xchan. The channel might be alive at another hubloc. We should only mark the xchan deleted when removing a channel from the entire network - e.g. there are no hubs left to service it.
2014-04-07 13:13:00 -07:00
friendica
10167fdf51
prevent follows of and notifications to deceased channels
2014-04-07 02:55:00 -07:00
friendica
7d429b2894
subdue archived connections in mod/connections
2014-04-06 22:21:51 -07:00
friendica
68296bb857
better alignment of channels with long names on mod/connections
2014-04-06 21:52:47 -07:00
friendica
75b6aa235e
more work on #395
2014-04-06 21:40:23 -07:00
friendica
28b7eedc45
check_webbie (webbie validator) returning bad webbies
2014-04-06 19:59:00 -07:00
friendica
81ce5f14d2
missing pagination on viewconnections page
2014-04-06 18:57:04 -07:00
friendica
6f555c50e1
a bit more work towards issue #395 - cleaning up some cases which were going to the url directly and which weren't going through chanview. Also worth noting - mentions in posts do not go through chanview. Perhaps it is time to kill chanview (except we then cannot implemented a "connected" or "connect" button since we don't have any control over the landing page). For the time being I'm just trying to trap as many of the "visit URL" links as possible and sending them to a common place. Then we can figure out how that common place should behave.
2014-04-06 18:40:37 -07:00
friendica
b880982b61
Merge https://github.com/friendica/red into pending_merge
2014-04-06 16:18:57 -07:00
friendica
50c608482a
mod/item - get rid of some failed experiments, duplicated code and unused code.
2014-04-06 16:17:21 -07:00
marijus
f7cb4e0ef0
jot and location style fixes
2014-04-06 21:14:24 +02:00
RedMatrix
2a13a9b20a
Merge pull request #397 from sasiflo/master
...
Try to repair of channel administration
2014-04-06 20:54:37 +10:00
friendica
64dfe3ab64
issue #395 , item 2
2014-04-06 03:47:53 -07:00
sasiflo
6d170b2e07
Merge remote-tracking branch 'upstream/master'
2014-04-06 12:21:24 +02:00
friendica
ad60e2c566
use parent_mid in the parent query for enotify instead of of the parent id. This should fix the issue with encrypted content in the notification messages (for locally posted replies). The fix was a bit harder than anticipated because we store the parent id as an int in the notify table so this had to be modified to char storage as well.
2014-04-06 02:57:33 -07:00
sasiflo
d084d5575c
Merge remote-tracking branch 'upstream/master'
2014-04-06 00:35:30 +02:00
sasiflo
9f54a8f96b
Hope I have repaired the channel admin page.
...
Channel blocking and deleting was copied from user actions. This was not
done to an end. Hope what I do is enough to enable channel blocking and
deleting the correct way.
On deletion all entities that belong to the channel are deleted. But the
channel itself is just marked as deleted. Do not really understand why
it is done this way.
2014-04-06 00:34:52 +02:00
Thomas Willingham
a2b949f339
Typo in externals SQL.
2014-04-05 22:55:38 +01:00
friendica
8b0721cf35
this makes rpost to another channel work somewhat - but there are issues, since the ACL will belong to the wrong channel. Leaving disabled for now. I don't know that we can solve all the issues without a different design so this may end up in a plugin for those who are willing to put up with the shortcomings.
2014-04-05 03:53:04 -07:00
friendica
4901ef8faf
provide the ability for rpost to post as another of your channels. This does not yet work, so the functionality has not been enabled.
2014-04-05 02:32:07 -07:00
friendica
32e71cf06b
finish "ifpending" connections
2014-04-04 17:43:44 -07:00
friendica
97f0424b18
introduce a connection type called 'ifpending' for number 6 of issue #395 - so that we can still have an unconditional 'pending' link. Needs testing before integrating with the nav menu
2014-04-04 16:56:49 -07:00
RedMatrix
22cdfef216
Merge pull request #396 from solstag/master
...
Update documentation on connecting to channels and on documentation.
2014-04-05 09:41:06 +11:00
Alexandre Hannud Abdo
022473bf6f
Update documentation on connecting to channels and on documentation.
2014-04-04 19:31:48 -03:00
friendica
f832e59585
doc updates, plus back-end work for rpost to let you post to a different channel than your current logged-in channel. Need the same for rbmark back-end. Then we "just" need a selector widget on the editor forms.
2014-04-04 15:25:18 -07:00
marijus
3f1a78fa69
some work on jot, remove some deprecated js and some random style fixes
2014-04-03 17:03:32 +02:00
Thomas Willingham
98788308e1
Merge pull request #393 from jeroenpraat/patch-1
...
Update and fix dark scheme
2014-04-03 12:48:52 +01:00
jeroenpraat
39a02d29eb
No empty strings
2014-04-03 13:37:41 +02:00
jeroenpraat
a65bf5beee
Update and fix dark scheme
...
Updated the dark scheme as far as possible. Some items do not have a string, so they can't be themed. A dark derived theme would probably better.
2014-04-03 13:32:39 +02:00
friendica
d1271ca340
clarify location - issue #392
2014-04-02 19:25:57 -07:00
