tony baldwin
ebd33b185d
Merge remote-tracking branch 'upstream/master'
...
Conflicts:
view/theme/redbasic/css/style.css
whatever
2014-04-12 08:37:56 -04:00
friendica
2d9ab91e9f
Merge branch 'master' into prvtag
2014-04-12 03:45:46 -07:00
friendica
d0834c7e13
Merge https://github.com/friendica/red into pending_merge
2014-04-12 03:32:58 -07:00
friendica
c93353c0a3
we seem to have lost any install text mentioning that subdirs and alternate ports aren't supported
2014-04-12 03:31:55 -07:00
friendica
567b5d053d
handle new tag declarations
2014-04-12 03:31:24 -07:00
friendica
71929c6caa
add forum mode to tag handling
2014-04-12 00:56:04 -07:00
friendica
aa5054d5ba
this is looking better, call the forum version of a tag "foobar network", besides altering the icon
2014-04-12 00:41:36 -07:00
friendica
2212ddb913
use icons for identification
2014-04-11 23:54:11 -07:00
friendica
47096df97e
not quite right but I need to check it in so I can switch branches
2014-04-11 20:35:25 -07:00
friendica
2b3697c27a
the auto-complete part
2014-04-11 20:12:40 -07:00
friendica
f93b56de55
no this is the way to do it
2014-04-11 20:00:34 -07:00
friendica
c7d6179a0f
Use @+ to tag a forum and also restrict the post to the forum, this leaves @! tags private - period.
2014-04-11 16:31:48 -07:00
Thomas Willingham
163c83a9e5
Ooops, replaced too many
2014-04-12 00:11:43 +01:00
Thomas Willingham
a82b1fe590
Revert to prepare_text, use bbcode only for with
2014-04-12 00:08:50 +01:00
friendica
8b39b5ae4e
via Mario: default channel permissions not working on channel page
2014-04-11 15:51:25 -07:00
friendica
7e6804b599
make sure we can find that function
2014-04-11 15:14:01 -07:00
friendica
202582cbd6
we also need a loop breaker
2014-04-11 15:08:40 -07:00
RedMatrix
df7c2afc68
Merge pull request #405 from beardy-unixer/master
...
A few little fixes
2014-04-12 07:20:44 +10:00
RedMatrix
aa1f5ce753
Merge pull request #404 from git-marijus/master
...
bootstrapify aclselector
2014-04-12 07:20:24 +10:00
friendica
0a871c3f14
Merge https://github.com/friendica/red into pending_merge
2014-04-11 14:02:45 -07:00
friendica
e10509e2bd
soft revert 9bb7811 until we can look at it more closely.
2014-04-11 14:01:33 -07:00
friendica
2677ee0b49
doc update
2014-04-11 14:01:22 -07:00
Thomas Willingham
2fdcd0c27e
Never set background or color unless you set both. If this is needed
...
in future, it should probably be reimplmented with the class anyway.
2014-04-11 20:02:52 +01:00
Thomas Willingham
81b06754a4
Don't count deleted channels when figuring out where to send a user on login.
2014-04-11 15:11:22 +01:00
marijus
3197ccbf5e
bootstrapify aclselector
2014-04-11 16:06:39 +02:00
Thomas Willingham
4582b8dd64
Bring BBCode to profiles
2014-04-11 14:54:07 +01:00
Thomas Willingham
742e2686ca
Don't explicitly deny our strongest features existence.
2014-04-11 14:53:18 +01:00
Paolo T
93a56db391
Merge pull request #403 from tuscanhobbit/master
...
IT: strings updated
2014-04-11 14:23:52 +02:00
Paolo Tacconi
a36d1d5e92
IT: strings updated
2014-04-11 14:22:27 +02:00
friendica
e64ec31a9d
add the message-id to delivery reports. This _could_ allow an enterprising developer to collect the delivery reports for a given post and store them in a DB table so that the sender could track and verify where a message had been sent on a web page and verify the success or failure of those attempts without requiring admin access. (To be fair this would also need an extra flag which hasn't yet been implemented to indicate that a channel created a second delivery chain of the message).
2014-04-10 22:17:35 -07:00
friendica
fb88544ae4
Merge https://github.com/friendica/red into pending_merge
2014-04-10 18:50:33 -07:00
friendica
a798dd767d
push notes widget updates to channel clones on focusout (final save). Don't do this for the auto-save events (every ten seconds) which could generate superfluous network traffic.
2014-04-10 18:46:22 -07:00
RedMatrix
feb3a81623
Merge pull request #402 from sasiflo/master
...
Added info about SSL certificates
2014-04-11 11:23:13 +10:00
friendica
9bb7811d74
Discover page: when importing public items, alter the item so that it has the characteristics of one that was sourced by the sys channel instead of just being stored under the sys channel uid. This should allow comments and likes to flow upstream if permissions allow and may fix issue #398 . Permission may still be denied by the original poster, but without this the comment/like is treated as a forgery and is blocked from transmission.
2014-04-10 18:06:09 -07:00
friendica
a49069db4e
move the deleted flag setting to encode_item_flags() where it belongs now that we aren't giving deleted posts special treatment.
2014-04-10 16:26:27 -07:00
friendica
bf1f18e172
Include the entire original item when notifying other channels of deletions as it contains important routing and scope information. Previously we were only sending a couple of critical fields like the message-id, flags, and creation date. The thinking was that it is deleted, let's not resend the deleted contents anywhere. But in order to route this through the same path the original post took we really need the entire original post with all of its baggage attached.
2014-04-10 16:14:19 -07:00
sasiflo
f16fc1eb4f
Added some more details about why browser-valid SSL certificates must be
...
used when SSL is used at all.
It is now in the check failure message in the installation routine, the
installation readme and in the documentation pages.
2014-04-10 23:41:18 +02:00
friendica
c97222c2fc
improve the appearance of the ACL selector in a hackish way on the short term -
...
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.
2014-04-09 21:49:38 -07:00
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
