Commit graph

3290 commits

Author SHA1 Message Date
friendica
e6185eea28 The scenario is that you're authenticated via magic-auth on a remote hub and you change channels locally. Next time you start an auth exchange we'll look to see if your identity changed and we should start fresh if that's the case, rather than just falling through and keeping the old credentials. 2014-02-10 15:39:19 -08:00
friendica
a7fa14800d better bookmark escaping 2014-02-10 01:44:21 -08:00
friendica
a76c53657b don't add bookmark tags to naked links inside code blocks 2014-02-10 01:11:59 -08:00
friendica
c7ffae03d8 perform remote discovery on abook sync of nomadic clones if remote channel (xchan) is unknown 2014-02-09 19:45:22 -08:00
friendica
b92f00587b don't allow the browser to open uploaded html/css/js 2014-02-09 14:56:52 -08:00
friendica
8727a75437 fix the "every other link gets messed up" problem 2014-02-09 13:46:40 -08:00
friendica
6387921000 Merge https://github.com/friendica/red into zpull 2014-02-09 00:31:16 -08:00
friendica
c5f0b85357 fix wall photos 2014-02-09 00:30:43 -08:00
Christian Vogeley
c9192991c9 Add class to bookmark links to make it better them able
E.g.: css (not yet included)
.bookmark-identifier{
display:none;
}
.bookmark:hover:before{
text-decoration:none;
content:"#^";
color:#000000;
background:#FFFFFF;
}

.bookmark:hover{
	color: #FFFFFF;
	background: #3465A4;
}
2014-02-09 01:37:09 +01:00
friendica
e346aa7560 that's better 2014-02-08 12:08:07 -08:00
Thomas Willingham
3222b15485 Pass mids to conv_item template 2014-02-08 17:49:09 +00:00
friendica
97739920eb create a new "subdued" CSS class for things that shouldn't be in your face unless you want them and intentionally hover over them. Typically this would be accomplished via an opacity or colour change, but themes are free to use other methods. Also changed the channel_tabs "chatroom" link to use the subdued class if no rooms have been created rather than a count of chatrooms. Themse should probably create a .subdued and .subdued:hover definition because we'll probably take most of the stuff which is now hardwired to use opacity by id and change it to use the class definition instead. 2014-02-08 00:48:19 -08:00
friendica
1ec7ffc774 Merge https://github.com/friendica/red into zpull 2014-02-07 13:40:26 -08:00
friendica
63589d4f2e from olivier: use double quotes in js strings, updated FR translation
from me: provide future ability to have an optional edit link/icon next to menus (such as bookmarks)
2014-02-07 13:39:13 -08:00
marijus
f62ec4132e let oneself be added to a collection in exchange for deleted contacts 2014-02-07 21:28:39 +01:00
friendica
c80325b427 order menu_list by description, not name 2014-02-07 01:49:34 -08:00
friendica
14fd940e08 To be listed as a public site, you need to be an https site with a valid cert. If you don't make the cut, you will either not be listed as a public site or you will be de-listed. Period. This is non-negotiable. 2014-02-07 00:50:04 -08:00
friendica
e8d98fbc85 extend the usermenu so we don't have to keep going back to channel homepage to get to the other channel links 2014-02-06 16:43:04 -08:00
friendica
9b2dc9b87c make all naked links bookmark-able 2014-02-06 16:22:40 -08:00
friendica
a46fa1fbae apply service class restriction to the number of channels allowed in a chatroom at a time ('chatters_inroom'). If you've got a public site you probably want to restrict this. 2014-02-06 15:23:20 -08:00
friendica
3e677ec53d add bookmark tag to naked links if they're red sites. We can do this because red links are linkified when the post is submitted. Can't do this for other naked links because they only get linkified during display and won't have a taxonomy object attached to the message. 2014-02-06 13:54:39 -08:00
friendica
f9381ed746 notification bug - don't use $r, we already set it to something else that we need further on. 2014-02-06 13:32:29 -08:00
friendica
05a70a8760 add chatroom links 2014-02-05 19:16:12 -08:00
friendica
1b406be544 allow bookmarks to use richtext 2014-02-05 16:28:51 -08:00
friendica
da8a79ebfa cleanup - nothing more 2014-02-05 16:01:02 -08:00
friendica
fdc0a7e95e fix auto-add of bookmarks to find sender correctly and optionally auto add bookmarks for self 2014-02-05 15:56:18 -08:00
friendica
8595318089 Merge https://github.com/friendica/red into zpull 2014-02-05 15:03:46 -08:00
friendica
efa30f1b03 This would be about the 75th attempt to try and prevent duplicated email notifications for comments. Eventually we'll find something that works. 2014-02-05 15:01:53 -08:00
marijus
a606fc0ba3 add a sanitized style tag to bbcode 2014-02-05 14:34:25 +01:00
friendica
24f32e55c8 bookmarking bugfix 2014-02-05 03:29:02 -08:00
friendica
f30a39f9df bookmark debug logging 2014-02-05 03:15:10 -08:00
friendica
8a11c29413 make links in comments bookmark-able 2014-02-04 19:39:56 -08:00
friendica
aede006970 bookmarks - mop up and go home 2014-02-04 17:12:13 -08:00
friendica
3665bc38ef bookmarking 2014-02-04 16:06:56 -08:00
friendica
46b9352a84 fix the search for system bookmarks 2014-02-04 01:42:43 -08:00
friendica
d8f16442a1 bookmark permissions 2014-02-04 00:52:34 -08:00
friendica
9ce3dac479 some tagging fixes - including old bugs which were never reported 2014-02-03 19:54:32 -08:00
friendica
876f5d4de0 transmit, receive, and parse bookmarks 2014-02-03 19:38:15 -08:00
friendica
6c91580716 code cleanup - remove some unused functions 2014-02-03 02:21:06 -08:00
friendica
ee42079685 The problem with a lot of packages is that it's easier to re-write them than to re-use them. 2014-02-02 21:25:52 -08:00
friendica
2768262f93 Add switch to allow menus to be used as bookmark collections 2014-02-02 16:49:09 -08:00
friendica
abb68e846d remove the text "requires compatible chat plugin" 2014-02-02 16:02:04 -08:00
toclimb
ba6178bef3 More efficient smilie replacing 2014-02-02 14:52:00 +01:00
friendica
e83419b53e add links to change chat status and leave room 2014-02-02 03:43:52 -08:00
friendica
6b15e57cdb add epub mimetype (application/epub+zip) 2014-02-02 02:43:36 -08:00
friendica
2c75210fdb config: don't try to unserialise an array 2014-02-01 20:07:47 -08:00
friendica
bd691300a7 provide some interesting new options to channel sources 2014-01-31 20:02:59 -08:00
friendica
a1d40431f2 chat expiration (default 2 hours) - but can be set on a per-chatroom basis 2014-01-30 20:10:47 -08:00
friendica
2f876334d5 Merge https://github.com/friendica/red into zpull 2014-01-30 14:37:50 -08:00
friendica
0fae8acdef fix basic auth with account (not channel) login 2014-01-30 14:36:56 -08:00
Michael Meer
c5ac5544cb clean up logger commands. Placed apostrophs at the end from some comments to keep the syntax highlighting in vi working 2014-01-30 11:04:20 +01:00
Michael Meer
0a2b2a1390 attempt with fix URL for testing works 2014-01-30 10:39:09 +01:00
friendica
6c6a9b963a a bit more ajax work on chat and chatsvc and some fiddling with layouts 2014-01-30 01:00:46 -08:00
friendica
080928f214 chatroom management front-end stuff 2014-01-29 21:29:48 -08:00
friendica
838ebbcb62 apply service class limits (at the account level) to chatroom creation as chat has the potential to adversely affect system performance. In the future we may also want to service_class restrict the number of participants in a room. 2014-01-29 18:29:03 -08:00
friendica
b8fb6a4373 more chat infrastructure 2014-01-29 17:09:20 -08:00
friendica
677f5f641e more testing of chatroom interfaces, also corrected a function call that should have been a class instantiation in reddav 2014-01-29 16:02:02 -08:00
friendica
1915add7c1 Merge pull request #290 from git-marijus/master
add image floating to bbcode
2014-01-29 15:28:09 -08:00
marijus
75022367e5 minor whitespace cleanup 2014-01-30 00:15:13 +01:00
marijus
fe2b6f3dfb add image floating to bbcode 2014-01-30 00:01:19 +01:00
toclimb
4c28939488 Don't look for emoticons inside the matching angle brackets of HTML tags (seriously) 2014-01-29 23:56:05 +01:00
friendica
a1e7c65d51 chatroom permissions enforcement 2014-01-29 03:40:14 -08:00
friendica
6a9d43bcbe debug chatroom_list widget 2014-01-29 03:16:07 -08:00
friendica
10b51a9471 issues uncovered whilst testing the chatroom API 2014-01-29 02:25:21 -08:00
friendica
9f54675702 chatroom list widget backend 2014-01-29 01:52:23 -08:00
friendica
9261a170eb basic chatroom management backend 2014-01-29 00:08:29 -08:00
friendica
d970c69f91 online indication to the directory popup 2014-01-28 19:49:56 -08:00
friendica
cc11535e34 online indication on profile sidebar 2014-01-28 17:07:25 -08:00
friendica
3dfd38021f SECURITY: remove style and class bbcodes 2014-01-28 16:35:10 -08:00
friendica
d79a2e3b55 undo pull request #287 2014-01-28 16:32:47 -08:00
toclimb
3cab53a7ef Don't look for text emoticons inside the matching angle brackets of a HTML tag 2014-01-29 00:43:54 +01:00
friendica
f104b4dc27 preserve expiration when editing 2014-01-27 23:49:42 -08:00
friendica
d6a9497e4a cleanup include/menu in preparation for the next phase of bookmarking 2014-01-27 14:46:39 -08:00
friendica
d296b02b0e The final piece of the DAV authentication puzzle. Provide a directory view to an un-auth'd person (without asking for a password) by adding a query parameter 'davguest=1'. This is a bit of a hack, but there was no response on the official forum about how to do this correctly so it will have to do. On the downside, if permission is denied, it won't ask for a password - but we're talking about unauthenticated folks who didn't go through magic auth so chances are even if they authenticate, permission will still be denied. 2014-01-26 14:15:57 -08:00
friendica
0948c3c3ca allow site defaults for enabled features 2014-01-26 03:27:36 -08:00
friendica
f90b3b60cb don't prompt guests for a password if they're accessing an embedded public file. 2014-01-26 02:58:03 -08:00
friendica
b5c6db1205 Merge https://github.com/friendica/red into zpull 2014-01-25 15:51:32 -08:00
friendica
339a0f69c1 some tweaks to items_fetch for the api 2014-01-25 15:51:10 -08:00
root
8b399b2fb8 Typo 2014-01-25 23:06:44 +00:00
friendica
6911439f0e Merge pull request #284 from cvogeley/master
API changes
2014-01-25 15:03:23 -08:00
friendica
e68c01cc48 set session['my_address'] to current site in change channel, not primary hub location. Also remove all the old Friendica-style authentication code. 2014-01-25 14:39:09 -08:00
Christian Vogeley
a25b8c951b Check user_info['self] in api user_timeline 2014-01-25 22:56:15 +01:00
Christian Vogeley
b71e855c5b remove wall restriction
original didn’t have that
2014-01-25 13:44:31 +01:00
Christian Vogeley
6b3ea9dc14 API My wall posts 2014-01-25 03:50:47 +01:00
friendica
21f6549204 Merge https://github.com/friendica/red into zpull 2014-01-23 23:47:08 -08:00
friendica
3490604926 add zid to audio/video (again) 2014-01-23 23:46:43 -08:00
Thomas Willingham
ad67d3e483 Ooops, included site specific hack 2014-01-24 03:48:54 +00:00
Thomas Willingham
d57361ea4a Make share previews a bit longer. We can't go any longer than this
without suhosin starting to break things for channels with long names
 - this limit works with the channel with the longest name in the matrix
today, but we may need to make this a pconfig anyway.
2014-01-24 03:44:50 +00:00
friendica
357ddd1bf7 display a somewhat more pleasant hovertip on qr codes 2014-01-23 15:53:29 -08:00
friendica
ab6b6794b4 fix marital partner linking 2014-01-23 15:43:35 -08:00
friendica
bf8e73ca73 missing filename in uploaded photos (we don't really use this, but we will need to have a filename to export via DAV or API and the original filename would be the most likely choice). 2014-01-22 23:54:14 -08:00
friendica
bc98f4ddf4 fix api/red/photos when supplied with an album name 2014-01-22 23:04:19 -08:00
friendica
43f2d6972c API: provide a link to photo albums in api/red/albums 2014-01-22 22:56:16 -08:00
friendica
79c287916f Merge https://github.com/friendica/red into zpull 2014-01-22 22:15:30 -08:00
friendica
66baa3cab0 try to reduce the number of simulaneous deliveries of the same post when dealing with owner relays that have more than one channel instance. If things melt down in the next few hours and I'm not available please revert this. I've reviewed a few times and think it's OK, but this part of the delivery code is traditionally touchy. 2014-01-22 22:07:47 -08:00
friendica
e4bce90b53 Merge pull request #279 from git-marijus/master
make network tabs regard selected group (collection) and vice versa
2014-01-22 14:52:31 -08:00
marijus
040d87c999 update argument ?f= 2014-01-22 23:24:09 +01:00
Thomas Willingham
25f7a7fac9 Give pages enough to construct a share button. 2014-01-22 22:17:12 +00:00
Christian Vogeley
d341358afb Add $since_id to items_fetch 2014-01-22 23:15:42 +01:00
marijus
eb868f6df8 make network tabs regard selected group (collection) and vice versa 2014-01-22 17:18:40 +01:00