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
friendica
d68b202cad
start of legacy probe utility
2014-04-02 16:26:39 -07:00
friendica
69513441f5
removed default maximagesize - it can be set in the admin pages.
2014-04-02 15:36:18 -07:00
friendica
27fec9cb64
more efficient public feed fetching
2014-04-02 15:13:50 -07:00
friendica
0a097b8337
snakebite: bring back some of the legacy XML discovery interfaces, update as required.
2014-04-02 14:56:20 -07:00
Thomas Willingham
60a9b3a699
Merge pull request #391 from solstag/master
...
update pt-br translation
2014-04-02 03:26:44 +01:00
Alexandre Hannud Abdo
39e5370db8
update pt-br translation
2014-04-01 23:13:46 -03:00
friendica
1c3691d196
dispense with formalities
2014-04-01 15:24:11 -07:00
friendica
8d818280fd
Merge https://github.com/friendica/red into pending_merge
2014-04-01 14:54:51 -07:00
friendica
6ba32d714d
save notes every ten seconds while focused, then save them once more on focusout
2014-04-01 14:52:47 -07:00
RedMatrix
5ae20dd59a
Merge pull request #390 from beardy-unixer/master
...
Let admins set a default expire days value.
2014-04-02 06:17:48 +11:00
Thomas Willingham
f4dd8657cb
Let admins set a default expire days value.
2014-04-01 19:36:56 +01:00
friendica
78d7425a1d
wrong var name in add_source_route
2014-03-31 17:21:16 -07:00
friendica
8ffdccb99f
crank up logging
2014-03-31 17:14:56 -07:00
friendica
93f90040a1
community tags don't show up in the tagged posts because we removed the displayed list of hashtags at the bottom (which are usually redundant since hashtags are usually present in the message text). This brings them back, but only for tags which aren't currently present in the message body (e.g. community tags)
2014-03-31 17:03:07 -07:00
friendica
03c53502cb
Merge branch 'route'
2014-03-31 16:30:04 -07:00
friendica
421df717fe
doco
2014-03-31 16:29:46 -07:00
friendica
ced6d82633
finish up the source route storage so we can prevent messages from flowing upstream in complicated delivery chains
2014-03-31 16:25:05 -07:00
friendica
57a9ba4574
this is a mess and makes a complicated security model that one can probably drive a truck through. It will have to be fixed. It does make youtubes work again.
2014-03-31 15:56:58 -07:00
friendica
04d9187c7a
photo timestamp was missing from main profile photo url which prevents photo changes from being immediately seen there.
2014-03-31 15:04:56 -07:00
friendica
653d7df86d
issue #378 , failure to correctly link tags where one tag contains a substring of the other (depends on the order they are discovered).
2014-03-30 20:53:59 -07:00
friendica
3791cee52b
Merge https://github.com/friendica/red into pending_merge
2014-03-30 17:41:53 -07:00
friendica
ac91331c18
notes widget: jquery.live is deprecated, replacing with jquery.on and binding to focusout, as the input and paste callbacks are a bit wasteful - they are presumably called on every character typed, yet some of these events have gone missing (probably due to having a lot of network calls in quick succession) so hopefully a single save of the workspace on focusout should be more reliable.
2014-03-30 17:37:12 -07:00
RedMatrix
8efef6f98b
Merge pull request #387 from beardy-unixer/master
...
Default discover to on
2014-03-31 09:22:00 +11:00
friendica
b00478d3b5
revise the sandbox
2014-03-30 15:01:51 -07:00
Thomas Willingham
4a2805e12e
Missed one
2014-03-30 23:01:31 +01:00
Thomas Willingham
1093e8d83e
Default discover to on.
2014-03-30 22:59:37 +01:00
friendica
9e5f424394
typo
2014-03-29 23:45:21 -07:00
friendica
0b7588b1eb
issue #384
2014-03-29 23:43:31 -07:00
friendica
c400303f22
make the discover tab enabled by default the first you use the admin panel, though it will be disabled until you use the admin panel.
2014-03-29 23:24:38 -07:00
friendica
1108eaaed0
source routing stuff
2014-03-29 21:53:50 -07:00
RedMatrix
a31d5c7cdd
Merge pull request #385 from solstag/master
...
Let the site admin choose whether to display the Discover tab.
2014-03-30 15:18:05 +11:00
Alexandre Hannud Abdo
fedd19ec95
Let the site admin choose whether to display the Discover tab.
2014-03-30 00:03:12 -03:00
friendica
7ed177c7cd
check that aside actually exists before querying the html length
2014-03-29 00:04:06 -07:00
sasiflo
friendica
Thomas Willingham
Alexandre Hannud Abdo
marijus
Thomas Willingham
jeroenpraat