aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* improve the appearance of the ACL selector in a hackish way on the short term -friendica2014-04-092-4/+4
| | | | it really needs to be re-worked for bootstrap but in any event the words "show" and "don't show" make a mess of it. We should probably just use icons (with a bit of padding) that people can select with a touchscreen and reformat the box accordingly.
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-0925-83/+70
|\
| * Merge pull request #399 from git-marijus/masterRedMatrix2014-04-1025-83/+70
| |\ | | | | | | change the way jot tools are displayed/hidden
| | * use $showacl to show/hide acl in jot.tpl - remove $pvisit and repair ↵marijus2014-04-098-8/+5
| | | | | | | | | | | | editblock and editlayout which still depended on it.
| | * replace lock icon with icon-{lock, unlock}marijus2014-04-0911-37/+19
| | |
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2014-04-092-1/+2
| | |\
| | * | whitespace cleanupmarijus2014-04-081-6/+6
| | | |
| | * | change the way jot tools are displayed/hiddenmarijus2014-04-0815-36/+44
| | | |
* | | | issue #400 - lock not showing up for previews of private mentions (or ↵friendica2014-04-092-9/+10
|/ / / | | | | | | | | | | | | | | | 'new/search' item view) also reformat the new/search template to pick up recent changes to conv_item.tpl
* | | whitespace - nothing elsefriendica2014-04-091-154/+154
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2014-04-094-15/+33
|\ \ \
| * \ \ Merge pull request #401 from sasiflo/masterRedMatrix2014-04-104-15/+33
| |\ \ \ | | |_|/ | |/| | Extended theme redbasic: Allow to center the content (aside + converse)
| | * | Correction for #401: Theme redbasic extended.sasiflo2014-04-101-1/+1
| | | | | | | | | | | | | | | | Use max-width instead of width to allow mobile devices to reflow the content.
| | * | Extended theme redbasic: Allow to center the content (aside + converse)sasiflo2014-04-094-15/+33
| |/ / | | | | | | | | | | | | | | | | | | | | | | | | 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.
* / / 'anybody in this network' permissions were not being allowed for ↵friendica2014-04-092-7/+23
|/ / | | | | | | non-connected channels.
* / strip affinity tool labels on ultra-small screens; otherwise they just smush ↵friendica2014-04-082-1/+2
|/ | | | together
* some fixes to #395friendica2014-04-073-3/+3
|
* possible fix for issue #398friendica2014-04-071-3/+11
|
* pass the original element title through the element stack so that it we ↵friendica2014-04-072-0/+8
| | | | don't lose it in the ajaxuploader.
* convert /network saved search to bootstrap buttonsfriendica2014-04-072-3/+3
|
* this should be better - "xchan deleted" state on remote sites only follows ↵friendica2014-04-072-14/+12
| | | | 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.
* undo one of yesterday's changes - if a channel was deleted we want to mark ↵friendica2014-04-071-6/+6
| | | | 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.
* prevent follows of and notifications to deceased channelsfriendica2014-04-075-5/+23
|
* subdue archived connections in mod/connectionsfriendica2014-04-063-2/+6
|
* better alignment of channels with long names on mod/connectionsfriendica2014-04-061-1/+2
|
* more work on #395friendica2014-04-064-5/+17
|
* check_webbie (webbie validator) returning bad webbiesfriendica2014-04-061-2/+4
|
* missing pagination on viewconnections pagefriendica2014-04-061-0/+9
|
* a bit more work towards issue #395 - cleaning up some cases which were going ↵friendica2014-04-063-11/+5
| | | | 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.
* Merge https://github.com/friendica/red into pending_mergefriendica2014-04-064-13/+4
|\
| * jot and location style fixesmarijus2014-04-064-13/+4
| |
* | mod/item - get rid of some failed experiments, duplicated code and unused code.friendica2014-04-061-89/+10
|/
* Merge pull request #397 from sasiflo/masterRedMatrix2014-04-065-63/+50
|\ | | | | Try to repair of channel administration
| * Merge remote-tracking branch 'upstream/master'sasiflo2014-04-066-13/+21
| |\
| * \ Merge remote-tracking branch 'upstream/master'sasiflo2014-04-061-1/+1
| |\ \
| * | | Hope I have repaired the channel admin page.sasiflo2014-04-065-63/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | issue #395, item 2friendica2014-04-066-9/+26
| |_|/ |/| |
* | | use parent_mid in the parent query for enotify instead of of the parent id. ↵friendica2014-04-066-13/+21
| |/ |/| | | | | 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.
* | Typo in externals SQL.Thomas Willingham2014-04-051-1/+1
|/
* this makes rpost to another channel work somewhat - but there are issues, ↵friendica2014-04-051-1/+8
| | | | 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.
* provide the ability for rpost to post as another of your channels. This does ↵friendica2014-04-057-19/+68
| | | | not yet work, so the functionality has not been enabled.
* finish "ifpending" connectionsfriendica2014-04-042-2/+5
|
* introduce a connection type called 'ifpending' for number 6 of issue #395 - ↵friendica2014-04-042-1/+21
| | | | so that we can still have an unconditional 'pending' link. Needs testing before integrating with the nav menu
* Merge pull request #396 from solstag/masterRedMatrix2014-04-052-4/+46
|\ | | | | Update documentation on connecting to channels and on documentation.
| * Update documentation on connecting to channels and on documentation.Alexandre Hannud Abdo2014-04-042-4/+46
| |
* | doc updates, plus back-end work for rpost to let you post to a different ↵friendica2014-04-0459-723/+1386
|/ | | | 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.
* some work on jot, remove some deprecated js and some random style fixesmarijus2014-04-038-198/+98
|
* Merge pull request #393 from jeroenpraat/patch-1Thomas Willingham2014-04-031-5/+29
|\ | | | | Update and fix dark scheme
| * No empty stringsjeroenpraat2014-04-031-2/+0
| |
| * Update and fix dark schemejeroenpraat2014-04-031-5/+31
|/ | | 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.