friendica
|
13e18332aa
|
Merge https://github.com/friendica/red into zpull
|
2013-09-28 04:42:08 -07:00 |
|
friendica
|
110974eb55
|
fix can_comment_on_post when viewing wall-to-wall
|
2013-09-28 04:41:12 -07:00 |
|
friendica
|
8fe5575469
|
string update
|
2013-09-28 04:40:57 -07:00 |
|
friendica
|
c98605df37
|
doc updates
|
2013-09-28 04:30:57 -07:00 |
|
friendica
|
b1c6ef9f33
|
Merge pull request #157 from 0xAF/master
Add colorpicker jquery plugin for themes
|
2013-09-28 04:02:34 -07:00 |
|
Stanislav Lechev [0xAF]
|
24128a4e1f
|
Add colorpicker jquery plugin for themes
|
2013-09-28 12:23:55 +03:00 |
|
friendica
|
4b3c565174
|
convert to plaintext before matching words in body. Otherwise every post I make with a link in it is going to match a test for zot.
|
2013-09-26 19:58:24 -07:00 |
|
friendica
|
6dc4d963fa
|
Merge https://github.com/friendica/red into zpull
|
2013-09-26 19:35:09 -07:00 |
|
friendica
|
017db29947
|
aggregate channels
|
2013-09-26 19:34:45 -07:00 |
|
Thomas Willingham
|
dc692cd748
|
Actually, lets add a content wrapper while we're in there.
|
2013-09-27 03:11:28 +01:00 |
|
Thomas Willingham
|
83a41a5af6
|
Typo
|
2013-09-27 03:06:20 +01:00 |
|
Thomas Willingham
|
b838585e27
|
Issue #131
|
2013-09-27 03:03:37 +01:00 |
|
Thomas Willingham
|
8d92d21135
|
Merge branch 'master' of https://github.com/friendica/red
|
2013-09-27 02:45:16 +01:00 |
|
Thomas Willingham
|
d6607f2093
|
Minor theme stuff - make the pages toolbar a toolbar, get rid of a naughty center tag, and stop very long tags overlapping the directory.
|
2013-09-27 02:44:28 +01:00 |
|
friendica
|
8e94e79c7b
|
Merge https://github.com/friendica/red into zpull
|
2013-09-26 16:26:08 -07:00 |
|
friendica
|
edc5566f79
|
structure for channel unions
|
2013-09-26 16:25:28 -07:00 |
|
Olaf Conradi
|
c81ad135ac
|
Merge pull request #155 from oohlaf/fixes
Explain why public comments are disabled and what needs to happen to enable them.
|
2013-09-26 14:03:26 -07:00 |
|
Olaf Conradi
|
26492b3ad4
|
Add explanation why public comments are disabled.
|
2013-09-26 22:57:13 +02:00 |
|
Thomas Willingham
|
689cea3170
|
Typo
|
2013-09-26 18:26:03 +01:00 |
|
friendica
|
6519433301
|
suppress creating the directory update record for profile updates which are part of the normal import_xchan sequence - otherwise we get two for every change. Create it normally if we are called with a profile_update message and don't go through the whole import_xchan thing.
|
2013-09-25 21:22:36 -07:00 |
|
friendica
|
00e5ded1c8
|
populate the new fields in the directory updates table
|
2013-09-24 20:13:53 -07:00 |
|
friendica
|
d62508072c
|
don't send email notifications for likes (as comment notifications). We'll need a separate preference for whether you want notifications for likes.
|
2013-09-24 19:43:28 -07:00 |
|
friendica
|
2a0406ec8c
|
add some text for issue #79
|
2013-09-24 19:23:39 -07:00 |
|
Olaf Conradi
|
a2ee22e51f
|
Merge pull request #154 from oohlaf/fixes
Fix name of Bleichenbacher
|
2013-09-24 12:06:57 -07:00 |
|
Olaf Conradi
|
66d2fe2289
|
Fix name of Bleichenbacher
|
2013-09-24 21:04:01 +02:00 |
|
zzottel
|
e9a51797a2
|
Merge pull request #153 from zzottel/master
Fix observer=1 tag. Using only observer without =1 won't work anymore
|
2013-09-24 05:39:37 -07:00 |
|
zottel
|
5092ae9e2b
|
Fix observer=1 tag. Using only observer without =1 won't work anymore now.
|
2013-09-24 14:35:47 +02:00 |
|
friendica
|
5ee339c99e
|
Merge https://github.com/friendica/red into zpull
|
2013-09-24 05:22:07 -07:00 |
|
friendica
|
d4ea56a77e
|
reduce susceptibility to bleichenberger attack
|
2013-09-24 05:20:29 -07:00 |
|
friendica
|
c9b485bc3e
|
Merge pull request #152 from MicMee/master
Preparation for maintenance od hubloc/server
|
2013-09-24 01:52:48 -07:00 |
|
Michael Meer
|
a37986cdc0
|
added new smarty template admin_hubloc.tpl
|
2013-09-24 09:33:52 +02:00 |
|
Michael Meer
|
54823a6589
|
admin hubloc page now with content from all hublocs, in next steps I add some tests with zping and reduce the content to known problems.
|
2013-09-24 09:28:42 +02:00 |
|
friendica
|
1f916adfb8
|
spice this up a little bit...
|
2013-09-23 18:38:08 -07:00 |
|
friendica
|
32416a915a
|
Merge https://github.com/friendica/red into zpull
|
2013-09-23 18:28:07 -07:00 |
|
friendica
|
15ce90e69c
|
oauth settings - clarify text
|
2013-09-23 18:27:23 -07:00 |
|
friendica
|
c1234d6f5f
|
Merge pull request #151 from zzottel/master
add [observer] tags and [observer.baseurl]
|
2013-09-23 16:50:06 -07:00 |
|
zottel
|
e79bc29244
|
add [observer] tags and [observer.baseurl]
|
2013-09-23 13:26:23 +02:00 |
|
friendica
|
a2b20bd58f
|
one more edge case in the public perms - don't match perms = 0 which is private, this and prior checkin are for issue #114
|
2013-09-22 23:00:55 -07:00 |
|
friendica
|
956d275693
|
fixes for display and search privacy enforcement
|
2013-09-22 22:52:48 -07:00 |
|
friendica
|
3ff9642750
|
update ru strings
|
2013-09-22 21:18:15 -07:00 |
|
friendica
|
44354c1aa8
|
bug #150, if deny access is present but nobody has been allowed, create an allow list containing everybody in your address book. Then subtract those who are denied.
|
2013-09-22 20:55:55 -07:00 |
|
friendica
|
cdfb5f9dc7
|
adult channel setting
|
2013-09-22 20:38:24 -07:00 |
|
Thomas Willingham
|
2c9c206808
|
Fix perms for viewing a channel
|
2013-09-21 19:23:21 +01:00 |
|
friendica
|
df8035344f
|
clean up app management a bit
|
2013-09-20 21:36:10 -07:00 |
|
friendica
|
fd2379530c
|
hopefully(?) the final word on remote comment permissions
|
2013-09-20 20:15:53 -07:00 |
|
friendica
|
43e290f4c0
|
fix contact comment permissions
|
2013-09-20 19:14:57 -07:00 |
|
friendica
|
15ae108832
|
missing uid check on comanche_block to ensure we get the block with that name that we own
|
2013-09-20 18:41:15 -07:00 |
|
friendica
|
7585b58d28
|
when it's a contentious issue, make it an option.
|
2013-09-20 18:24:11 -07:00 |
|
friendica
|
fb03195c3f
|
OK, sure.
|
2013-09-20 18:07:16 -07:00 |
|
friendica
|
1126d8f2e3
|
hopefully this will go over a bit better - check post owner permissions as well as local owner permissions for comments during submission, since the comment was being blindly accepted on the local system due to only checking the profile owner. Also change collections query to include only top-level posts by a member of the collection.
|
2013-09-20 17:58:11 -07:00 |
|