Commit graph

3750 commits

Author SHA1 Message Date
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
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
1108eaaed0 source routing stuff 2014-03-29 21:53:50 -07: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
fc5f3f4800 externals/discover: try up to 3 times to find a site that actually has content. Then give up until the next queue run. 2014-03-28 15:58:58 -07:00
friendica
6925cf9fe5 external -> discover 2014-03-28 01:24:30 -07:00
friendica
52c456d254 don't include standalone test sites in external host list 2014-03-27 20:57:45 -07:00
friendica
a6d8668a5f try and sort out the item delete mess 2014-03-27 20:28:48 -07:00
friendica
8c3efd20f4 this should work a bit better 2014-03-27 18:53:14 -07:00
friendica
6aa8cbf968 Merge https://github.com/friendica/red into zpull 2014-03-27 18:03:39 -07:00
friendica
8594d069a1 new connection notification 2014-03-27 18:03:19 -07:00
Thomas Willingham
6394f06635 typo 2014-03-28 00:36:38 +00:00
friendica
1f931c0e3c firehose: provide system prefs to allow folks to fine tune to their needs 2014-03-27 16:40:10 -07:00
friendica
a0674af416 firehose fixes and optimisations. In particular get rid of the unresponsive script warning when trying to load updates (sine they aren't our posts, we can't check for unseen, hence we can't really load updates). Also make the url selection pluggable. 2014-03-27 15:35:29 -07:00
friendica
41d8cfa72a link in the firehose 2014-03-27 00:25:34 -07:00
friendica
5a3903a40c firehose testing (network?f=&fh=1) - some possible security bugs so testing purposes only 2014-03-26 22:05:19 -07:00
friendica
a00c581e27 need include 2014-03-26 20:22:57 -07:00
friendica
20717e3416 let's limit this to two weeks so it doesn't pound servers and waste too much space 2014-03-26 19:23:45 -07:00
friendica
e476ed6be5 there's the problem 2014-03-26 19:13:26 -07:00
friendica
ed14c1f224 more work on firehose 2014-03-26 18:45:01 -07:00
friendica
9a3a2819c1 add admin/channels 2014-03-26 17:05:45 -07:00
friendica
79f5fd8e2a allow zotfeed to create a firehose of a site. 2014-03-26 16:09:07 -07:00
friendica
7375e30506 This should be a slight improvement in setting ciphers - we'll punt on RedHat but open up the list just for openssl distros which seem to have all the problems at the moment. 2014-03-25 15:19:18 -07:00
friendica
f14596b1eb Merge https://github.com/friendica/red into zpull 2014-03-25 12:47:46 -07:00
friendica
dc091800c3 missed one 2014-03-25 12:47:29 -07:00
friendica
8547e4b2a8 ensure wall_upload always has width and height if the image is valid 2014-03-25 12:44:30 -07:00
Thomas Willingham
f5467a6d51 Fix wall photo uploads. 2014-03-25 04:24:26 +00:00
friendica
50a7e9ce8f this should improve queue performance dramatically. 2014-03-24 19:40:36 -07:00
friendica
235b033560 that should fix it. 2014-03-24 19:01:20 -07:00
friendica
10f1867521 that didn't work out well 2014-03-24 18:42:54 -07:00
friendica
e6ea4a7574 ssl ciphers - be liberal in what we accept, conservative in what we generate 2014-03-24 17:16:01 -07:00
friendica
350624e993 don't allow normal channels to have the name 'sys'. 2014-03-23 18:45:42 -07:00
friendica
7575ff11fb make sure crypto is loaded before creating a keypair 2014-03-23 18:34:17 -07:00
friendica
0a5d0d98f8 cheange encode_item() logging to logger_data because it's way too noisy and had no loglevel set 2014-03-23 18:26:48 -07:00
friendica
944d051e45 create_sys_channel during setup bypasses our check when creating the first account that there is a site keypair. Esnure that a site keypair is created before any sys channels are created. 2014-03-23 18:12:32 -07:00
friendica
34eb79e6ba provide 'style' option to archive widget to choose between 'select' and 'list' format 2014-03-23 16:20:44 -07:00
friendica
b6b4ffa68d add curl error text to mod/probe so we can remotely diagnose communication issues from other sites. 2014-03-23 15:24:38 -07:00
friendica
6a014abe1c Merge https://github.com/friendica/red into zpull 2014-03-23 14:45:56 -07:00
friendica
7666aaea6a improve curl error logging 2014-03-23 14:45:08 -07:00
marijus
7d90340eda add width and height to uploaded photo body 2014-03-22 21:59:32 +01:00
marijus
13916566f0 use border-box for everything 2014-03-22 21:10:26 +01:00
friendica
caa284e786 we don't allow forgeries to be received - save some bandwidth by not allowing them to be sent. We do have to figure out how some secondary delivery chains are ending up with posts belonging to the original owner instead of the chain owner, but that's for another day. 2014-03-21 01:14:51 -07:00
friendica
6d37e41fc3 found what I believe is the root cause of issue #230, but don't yet have a workable solution. This one is hard. 2014-03-20 22:08:16 -07:00
friendica
1156b141db increase log info to track down source of ownership failures 2014-03-20 16:45:19 -07:00
friendica
fa5ac26828 doco 2014-03-19 19:56:21 -07:00
friendica
68fc2a220e prune_hub_reinstalls() and add cron weekly as a side effect 2014-03-19 19:53:14 -07:00
friendica
8c177fbc4b cleanup 2014-03-18 16:50:46 -07:00
Thomas Willingham
c8fb979ed8 oops 2014-03-18 02:43:36 +00:00
Thomas Willingham
1446cc8096 Missed one 2014-03-18 02:41:58 +00:00
friendica
aa07edbdd1 sprintf error 2014-03-17 18:44:01 -07:00
friendica
e7981c8a03 remove mysql dependencies from cache api 2014-03-16 21:34:51 -07:00
friendica
e57bf86a27 mail notification goes to old link 2014-03-16 20:49:29 -07:00
friendica
ecb2e52a74 little fixes of hopefully nil significance 2014-03-16 20:34:21 -07:00
friendica
6f9fde997b this is the correct fix 2014-03-16 15:20:04 -07:00
Christian Vogeley
521b091779 merge 2014-03-15 21:54:10 +01:00
Christian Vogeley
f0736fc955 API: statusnet_html:trim was trimming too much 2014-03-15 21:52:20 +01:00
friendica
3cb179aff1 contact_block() not being shown to unauthenticated visitors - even if perms allow. Also separate the permissions logic for this function so that we can have a mini-profile widget and a separate contact_block widget instead of always lumping them together. We probably also should move contact_block() outside of include/text.php as it doesn't really belong there. Just not sure where it belongs - perhaps contact_widgets wouold be a good place. 2014-03-13 17:13:36 -07:00
friendica
3f337dad2c file had wrong extension 2014-03-11 21:45:20 -07:00
friendica
5e41ef9219 protect filed conversations from expiration - we check the parent to see if it is filed, but one may have filed a comment and that will vanish when the parent expires unless the parent is protected. 2014-03-11 17:41:56 -07:00
friendica
55fe471ce8 version update 2014-03-11 15:29:26 -07:00
marijus
34fd387438 this commit is an attempt to make conv items better scalable on smaller screens. also save some horizontal space. 2014-03-10 17:17:49 +01:00
friendica
80e381176e collapse the advanced directory search so that folks who think they're advanced but really aren't don't whinge about it. 2014-03-08 19:04:07 -08:00
friendica
bef416a2d1 advanced search front-end 2014-03-08 17:39:20 -08:00
friendica
5ec38459dc notify when permissions change and haven't been saved. 2014-03-07 21:55:52 -08:00
friendica
8c7e076dae bring friends back 2014-03-06 01:29:42 -08:00
friendica
d58abc0230 add clock widget and correct some doco 2014-03-05 04:28:48 -08:00
friendica
61f47cd5ed move language selector to a module 2014-03-05 03:19:20 -08:00
friendica
267283748f Red API: /api/red/item/new ; which is like /api/statuses/update except it uses Red semantics and returns success/failure indication. 2014-03-04 19:57:54 -08:00
friendica
a072668f8a undo 2014-03-04 15:29:27 -08:00
Thomas Willingham
f2f6485a4f Make zid() work for observers as well as local users 2014-03-04 23:18:33 +00:00
friendica
86d60f572f change flags for one-way connections from hidden to unconnected so we can still use hidden for - well hiding connections 2014-03-04 14:35:42 -08:00
friendica
3d49bf0320 directory sync issues 2014-03-03 21:00:42 -08:00
friendica
bfd9f5ec87 enable network/matrix expiration, this should be functional but the options have been reduced/restricted so we're only looking at network posts and ignore anything that is filed, starred, or is resource_type 'photo' (which should not be possible in non-wall posts, but we just want to be sure). Will require the adventurous tester(s) to set 'channel_expire_days' in their channel record. 2014-03-03 19:15:11 -08:00
friendica
12480a13cd item widget - displays one (webpage) item by mid. This is how you could put multiple content blobs on a page without turning them all into blocks. 2014-03-03 18:20:52 -08:00
friendica
d16324685a implement horizontal menu class in redbasic 2014-03-03 15:21:43 -08:00
friendica
81c439bc7d revert the temporary fix for the missing hdr.tpl and add the ability to provide context sensitive help/documentation by passing the current URL path to the help module as $_REQUEST['cmd']. So we could create a special help page for settings/display or whatever. The only issue is whether this should be presented first with a link to the main help page, or if we put a line at the top of the main help page that says "I need help for settings/display". Also edited the help target window name, as "friendika-help" is a bit dated. 2014-03-03 14:33:49 -08:00
friendica
7baeb45183 some anomolies found when viewing connections in various cases. 2014-03-02 19:40:59 -08:00
friendica
895c9411d9 add choklet template with several defined flavours, two and three column fluid layouts with optional side margins and a region for a blog-style header photo 2014-03-02 16:46:34 -08:00
friendica
e931af8307 first cut at choklet template 2014-03-02 15:47:01 -08:00
friendica
bf401a5afa allow templates to have multiple styles - this would be a bit like having a schema for a template file. At first you'll think this is insane and overly complicated, you'll just have to wait and see what I'm up to. Then it will start to make sense. 2014-03-02 00:24:29 -08:00
friendica
247cb85c94 it's unfortunate that we use the term "layout" to refer both to a template file and to Comanche .PDL files. I think we should probably refer to the template file as "template" just to avoid confusion. For the moment we'll provide both, since the 'layout' is already in the wild. But please use "template" going forward. 2014-03-01 17:49:28 -08:00
friendica
096cc726b7 dang - you really have to bludgeon this thing to get youtube to use https 2014-02-28 01:30:05 -08:00
friendica
46f0de7120 try to fix youtube mixed content warnings 2014-02-28 00:57:35 -08:00
friendica
102521844b put schemas in Comanche (this requires theme support (!)) 2014-02-27 20:48:10 -08:00
friendica
d2bc7c606a minor fixes to suggested chatrooms 2014-02-27 17:10:26 -08:00
friendica
642da17b86 chatroom suggestions 2014-02-27 17:07:11 -08:00
friendica
402d44e2f4 fix photos in private mail 2014-02-27 16:01:44 -08:00
cvogeley
7cdca97654 Typo 2014-02-27 09:54:07 +01:00
friendica
c8f1bf89a9 vsprintf error 2014-02-26 14:51:29 -08:00
friendica
364fc9f163 comanche: provide an option to add a menu class for different theming choices on some menus (e.g. horizontal, tabbed, etc.) 2014-02-25 20:58:20 -08:00
friendica
1857036a99 I'll have to fix this someday. 2014-02-25 20:36:56 -08:00
friendica
e7e97e578b put bookmarked chatrooms into poco 2014-02-25 19:48:13 -08:00
friendica
08313bac6c allow personalised page layouts for modules. 2014-02-25 14:12:51 -08:00
friendica
b1021df485 provide ability to bookmark chatrooms using rbmark 2014-02-24 21:34:49 -08:00
friendica
2becbae402 remote "add bookmark" - like rpost but saves a bookmark from a remote hub into one of your own bookmark folders (or a new one if desired). 2014-02-24 20:46:52 -08:00
friendica
fdb25f3450 string 'null' showing up in timeago since last modify 2014-02-24 15:27:39 -08:00
friendica
29ebfc25ca take a p 2014-02-24 15:07:00 -08:00
friendica
b2372c0c8f Merge https://github.com/friendica/red into zpull 2014-02-24 14:19:53 -08:00
friendica
5bd71e4e4d set theme for un-viewable profile 2014-02-24 14:19:21 -08:00
Alexandre Hannud Abdo
59211e0ac8 Translation for jQuery.divgrow strings. Fix mismatch in jQuery.timeago strings 2014-02-24 17:47:57 -03:00
friendica
5b4e3f46bc minor stuff, some doco, auth cleanup, and make "unknown" more translateable by context. 2014-02-22 14:58:12 -08:00
friendica
075b7fa9c8 This should resolve the dav authentication loop (correctly) 2014-02-22 13:33:18 -08:00
friendica
44d7047fce SECURITY: do not automatically open an iframe which points into the local website. 2014-02-20 21:15:35 -08:00
friendica
8367a92214 fix login weirdness for accounts that need to be approved 2014-02-20 18:38:52 -08:00
friendica
e12f6f1bd9 small changes to a couple of lookup functions which we need to use a bit more 2014-02-20 17:20:24 -08:00
friendica
e55170c00a code cleanup 2014-02-20 17:07:43 -08:00
friendica
3bddaa9e04 title missing in private mention posts 2014-02-20 15:00:29 -08:00
friendica
4944070e79 vsprintf error on update 2014-02-20 02:30:37 -08:00
friendica
d8434bb480 use the medium size photo on the nav bar if that photo stays larger, as the small one usually looks awful when you scale it up. 2014-02-20 01:49:40 -08:00
friendica
6eb971656e believe i found the issue which was causing hundreds/thousands of identical hublocs to be created 2014-02-20 01:35:08 -08:00
friendica
40dbd34405 Merge pull request #322 from dawnbreak/master
Doxygen include/attach.php
2014-02-20 14:08:47 +11:00
Klaus
d755fb83a7 Doxygen include/attach.php
Some Doxygen as far as I understood and some styleguides.
2014-02-19 21:04:20 +01:00
friendica
24d119b8c4 introduce a new privacy level "PERMS_AUTHED" to indicate somebody that is able to successfully authenticate (but is not necessarily in this network). 2014-02-18 20:59:25 -08:00
friendica
6ac81c9360 fix zrl bookmarks which broke with this checkin: c9192991c9
It was documented that:
  Issues: Currently the order of HTML parameters in the text is somewhat rigid and inflexible.
but as that was in a different function it was easy to overlook.
2014-02-18 19:47:13 -08:00
friendica
5747e20e50 some more snakebite and fix up include/account - forgot about that inline array stuff 2014-02-18 16:59:31 -08:00
friendica
7d4916ec71 service class downgrade to the default service class on account expiration if using a non-default service class and account has expired. 2014-02-18 15:17:18 -08:00
friendica
9a51f8ce65 edit bookmarks 2014-02-18 14:26:23 -08:00
friendica
0b4aa5a39c get_theme_uid() - if no uid, look for a system channel and use that. This allows default theme/scheme tweaks at the server level. 2014-02-17 20:38:30 -08:00
friendica
ea709361f6 snakebite, cont. magic-auth via openid is now possible, with the caveat that one needs a hand-crafted xchan at the moment to make use of it and if you wish to do so, there will be no assistance or help provided. The risk of system instability and mangled DBs now and going forward is significant if you try this. 2014-02-17 20:10:43 -08:00
friendica
d6ab975b18 operation snakebite continued. openid now works for local accounts using the rmagic module and after storing your openid in pconfig. This is just an interesting but trivial (in the bigger scheme of things) side effect of snakebite. The snake hasn't even waken up yet. 2014-02-17 19:48:05 -08:00
friendica
d3120264cb more snakebite stuff 2014-02-17 18:23:01 -08:00
friendica
9b0ae023ff Merge https://github.com/friendica/red into zpull 2014-02-17 16:00:39 -08:00
friendica
b3ce1cd87b project "snakebite" 2014-02-17 16:00:17 -08:00
friendica
2de0bb4981 Merge pull request #319 from dawnbreak/master
Commenting language.php and some changes
2014-02-18 10:30:09 +11:00
Klaus
bee287f859 Commenting language.php and some changes
Some commenting for Doxygen, simplified detect_language() a bit, added a new function get_language_name() that I will use soon or can be used in general to display localized language names from language codes.
2014-02-18 00:14:07 +01:00
friendica
08b571c9d0 project "snakebite" 2014-02-17 14:30:02 -08:00
friendica
f38ab09041 Merge pull request #316 from dawnbreak/master
Make asset icons work in subdir installs as well.
2014-02-17 15:11:05 +11:00
friendica
70526915c8 several things were not working correctly w/r/t community tagging. The preference vanished from settings at some point, and we also weren't updating the original post timestamp so that the changed taxonomy would propagate correctly as an edit. 2014-02-16 16:04:46 -08:00
friendica
16cd9e2a7e don't include deleted channels in number of channels service class checks 2014-02-16 14:48:07 -08:00
friendica
0f5ebb9b5a Merge https://github.com/friendica/red into zpull 2014-02-16 14:14:50 -08:00
friendica
ebd52368bb strip hard-wired zids from posted links as they will have the wrong identity when somebody tries to view the link 2014-02-16 14:13:26 -08:00
Klaus
29f6a1ee33 removed unused function posted_date_widget
This functions seems not to be used anywhere. include/widgets.php contains widget_archive($arr) which has the same functionality.
2014-02-16 10:25:32 +01:00
Klaus
01f31c2f20 Make asset icons work in subdir installs as well.
This should be the right way I guess, especially if red# is installed in a subdirectory. (untested)
2014-02-15 22:25:14 +01:00
Klaus
53d6d4c655 Fix call to asset icons in RedBrowser.
RedBrowser was not displaying asset icons correctly, because the URL was wrong.
2014-02-15 21:48:40 +01:00
friendica
b00f24ad75 fix tag delivery default permissions (use channel_allow_cid rather than allow_cid etc.) 2014-02-13 14:20:23 -08:00
friendica
213c03c606 more debugging dav in windows, windows never forgets your dav credentials even if you get them wrong and even if you remove them from the credential vault. This makes it very difficult to manage two or more channels with file resources. 2014-02-13 03:52:16 -08:00
friendica
5cedc324eb reddav - disable assets 2014-02-13 03:06:48 -08:00
friendica
d4d44f9878 oops - still using the !@#$ youtube bbcodes 2014-02-12 19:59:24 -08:00
friendica
bff92e7a21 remove some obsolete bbcode tags 2014-02-12 19:57:22 -08:00
friendica
c7dda0c4c1 return the expected array 2014-02-12 15:12:42 -08:00
marijus
8e68ecc68b dont show onlinestatus if block_public is on 2014-02-12 23:41:08 +01:00
friendica
1ca85abf83 Merge https://github.com/friendica/red into zpull 2014-02-12 13:46:25 -08:00
friendica
7c0101899d another bbcode addition for the demo, however this one is potentially useful for other purposes 2014-02-12 13:45:11 -08:00
marijus
18b2ff9c24 whitespace 2014-02-12 21:36:20 +01:00
marijus
e06d9e97c5 make chatrooms in /chat/channel visible to observers aswell 2014-02-12 21:31:11 +01:00
friendica
e47035f85a bbcode element of where you are on a site. perhaps this is less than generally useful but I plan to use it in a demo video where there is no other way to accomplish this 2014-02-12 11:42:33 -08:00
friendica
13a3dcf47f dav issue when listing protected contents from OS interface 2014-02-12 00:04:35 -08:00
friendica
8089c3202b better auth logging in dav 2014-02-11 21:20:34 -08:00
friendica
655b6445d5 use profile photo on vcard before reverting to xchan photo 2014-02-11 19:51:43 -08:00
friendica
b5728fa42e fixes to thing profile assignments 2014-02-11 16:56:39 -08:00
friendica
9498ed17ab move expiration of notifications to the equivalent of "cron daily" to try and reduce the number of things the poller has to do on every run. 2014-02-11 14:35:02 -08:00
friendica
c0e1e7ed2c Merge https://github.com/friendica/red into zpull 2014-02-11 14:27:44 -08:00
friendica
d02529fde1 implement a forced directory update mode where we unconditionally create a directory sync packet. This is needed to ensure that monthly directory pings are propagated to other directory servers so they can each prove for themselves whether or not an account is alive or dead. We do not trust other directories to provide us information beyond "look at this entry and decide for yourself" as doing otherwise would invite rogue directory manipulations. As this scheduled update occurs on all channels across all servers, we should also pick up refresh messages from all existing channel clones and these should also propagate out to all directory servers using the same mechanism (though perhaps not at the same time). 2014-02-11 14:19:20 -08:00
Thomas Willingham
2d9655627a Clear out old notifications in the poller. 2014-02-11 20:14:45 +00:00
friendica
59094cda51 reversed args in update_modtime, incorrect ud_guid and ud_hash 2014-02-10 20:38:26 -08:00
friendica
74fb7d158b Check for the correct DB name before pushing. 2014-02-10 19:20:55 -08:00
friendica
7f741a7e85 add channel_notify_flags to list of things which should *not* be synced across nomads. You probably only want one site to send you notification emails for the same events as opposed to all of them. 2014-02-10 19:18:09 -08:00
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
friendica
3b375a3d3f fix location of string file in Translations.md, fix some permissions and owner vagueness (potential bugs) in profile_tabs() 2014-01-21 23:09:33 -08:00
friendica
a13393fb23 seems you can't easily have a blank password for DAV guests, so the guest password is now +++ 2014-01-21 20:42:10 -08:00
friendica
0dbbe007e8 add the quota and volume size code 2014-01-21 15:38:02 -08:00
friendica
60416d6f33 fix the admin interface to pending registrations 2014-01-21 14:56:42 -08:00
friendica
530adb50ee sql error 2014-01-21 00:40:45 -08:00
Michael Meer
a13593590b added buttons to perform later hubloc actions 2014-01-20 12:12:40 +01:00
friendica
1fa8546d46 zidify audio/video links 2014-01-20 01:29:41 -08:00
friendica
0250223438 revert 26dfcecf05 2014-01-19 22:34:28 -08:00
Thomas Willingham
26dfcecf05 Prevent zids messing up dav 2014-01-20 06:28:38 +00:00
Thomas Willingham
9fb36df8d9 Fix dav directory creation. 2014-01-20 01:54:52 +00:00
friendica
3f7032e542 Merge https://github.com/friendica/red into zpull 2014-01-18 21:46:16 -08:00
friendica
db67f08d3c some more bookmark infrastructure plus a doc update 2014-01-18 21:45:42 -08:00
Thomas Willingham
331609cb87 vcard widget needs to include Contact if it's not included from the module that calls it. 2014-01-18 18:38:53 +00:00
Thomas Willingham
2e83b78d70 Merge branch 'master' of https://github.com/friendica/red 2014-01-17 23:32:03 +00:00
Thomas Willingham
a59b7c97f4 Missed these from git add...a year ago 2014-01-17 23:30:33 +00:00
friendica
c7585e4e58 Merge pull request #274 from zzottel/master
set jsAvailable cookie expire time to match PHPSESSID's
2014-01-17 12:55:01 -08:00
Thomas Willingham
1a76f1c659 Un-break dav auth. 2014-01-17 20:52:57 +00:00
zottel
a0d6d3c7f9 set jsAvailable cookie expire time to match PHPSESSID's 2014-01-17 07:56:34 +01:00
friendica
18a40d0c37 prevent zid's from reaching the DAV core code. 2014-01-16 01:19:58 -08:00
Thomas Willingham
9f66e5aef3 Merge remote-tracking branch 'upstream/master' 2014-01-15 23:01:02 +00:00
Thomas Willingham
9addc83520 Log failed auth to it's own file so fail2ban doesn't have to parse MB of text 2014-01-15 22:54:51 +00:00
friendica
e4217dc141 fix folder timestamps and change them when a child DAV file is written to 2014-01-15 04:02:15 -08:00
friendica
47b8071ca7 dav: throw exception if channel for requested DAV directory is deleted 2014-01-15 03:12:47 -08:00
friendica
cff7056f8f mod_attach: output stream wasn't working 2014-01-11 12:58:00 -08:00
friendica
f125be846c DAV put() issues 2014-01-10 19:18:30 -08:00
friendica
74e099b135 fix cloud path in filestorage edit page 2014-01-10 18:33:46 -08:00
friendica
0ce3e7235a other reddav issues, but probably won't fix the empty file 2014-01-10 13:47:56 -08:00
friendica
ffa86dfea8 this may fix filesize 0 issues 2014-01-10 13:10:50 -08:00
friendica
c9879edb3e break delivery loop if an item is deleted twice 2014-01-10 12:37:48 -08:00
friendica
4e9866f6b2 Merge pull request #260 from zzottel/master
Small fix
2014-01-10 01:14:59 -08:00
friendica
3298768d95 directory creation error, display localtimes on cloud webpage, doc updates 2014-01-10 00:47:40 -08:00
zottel
d71989c6ba fix the fix (can't work on query if it hasn't been added to $dest yet) 2014-01-10 09:21:36 +01:00
friendica
ee2bea37e9 mod_filestorage: provide a URL for linking to webpages and other websites 2014-01-09 21:01:53 -08:00
friendica
a309bc0d47 only let visitors remove their own files. 2014-01-09 19:20:10 -08:00
friendica
49882f2be4 add cloud link to profile_tabs and Comanchify the sucker 2014-01-09 19:00:06 -08:00
friendica
170d4c9c68 add link from DAV web ui to filestorage to set properties or delete or whatever 2014-01-09 18:34:25 -08:00
friendica
5a3ee3f718 wrap the web interface to DAV in a Red page. This is before we make the strings translateable and put it in a template. 2014-01-09 18:19:49 -08:00
friendica
a78d9b973d simplify permalink selection logic 2014-01-09 16:23:58 -08:00
friendica
db8ebc9f37 some minor cleanup on plinks for some very subtle permissions issues 2014-01-09 15:45:17 -08:00
friendica
ba0fdde51c process str_replace before urlencoding 2014-01-09 14:56:43 -08:00
friendica
fe7aa9926b Merge https://github.com/friendica/red into zpull 2014-01-09 14:11:05 -08:00
friendica
ca570f97e0 remove a lot of extraneous debugging now that most of this stuff basically works 2014-01-09 13:54:18 -08:00
zottel
acdf053a0b use display/ plinks for comments 2014-01-09 17:29:04 +01:00
zottel
5d83855afd use plinks instead of llinks on network/ and channel/ pages, though not in
mode network-new (network/new and network/search)
2014-01-09 16:04:51 +01:00
zottel
c0f6d73195 save channel/<channel>/?mid=... plinks with the items 2014-01-09 16:02:40 +01:00
zottel
cd65d172ba urlencode query_string for magic auth to make sure GET params make it back
to the originating server
2014-01-09 15:59:42 +01:00
friendica
c6b9e44353 fix table bbcode 2014-01-09 00:53:33 -08:00
friendica
6eda806444 This should be approaching completion for file OS storage. May be a few minor bugs remaining due to some late-breaking fixes but I've been testing it as I go. 2014-01-08 18:06:52 -08:00
friendica
7910221832 preparatory work for supporting a "list view" mode for conversations. This would be useful for forum-like channels and/or block-oriented themes. 2014-01-08 15:20:12 -08:00
friendica
29db236981 qr enhancements 2014-01-08 14:11:39 -08:00
friendica
8b93881ce7 qr code support 2014-01-07 20:36:16 -08:00
friendica
4011837805 more work on dav - deletion and a bit more progress on OS storage 2014-01-07 18:47:33 -08:00
friendica
b8564134aa make storage limit service classes apply to accounts, not channels. Also include a css file that was missing from work yesterday. 2014-01-07 14:10:28 -08:00
friendica
e635dcb309 bbcode convenience variables for producing documentation. 2014-01-06 23:54:40 -08:00
friendica
5a5466346c prepare for OS file storage, and add bbcode attachment link to mod/filestorage. This isn't beautiful, but it's a start. 2014-01-06 18:13:02 -08:00
friendica
8223f04b97 add potentially recursive set permissions function for file storage 2014-01-06 14:57:51 -08:00
friendica
db0867aeec reddav: improve and cleanup permission checks 2014-01-06 14:33:49 -08:00
friendica
196b3022bd Merge branch 'master' into movejs
Conflicts:
	version.inc
2014-01-06 02:37:06 -08:00
friendica
ae8a30273a whitespace 2014-01-06 02:23:56 -08:00
friendica
64152ac956 implement storage size limits 2014-01-05 19:49:45 -08:00
friendica
daf5daa2d3 disable web browser post inputs if no storage write permission 2014-01-05 19:25:56 -08:00
friendica
e10c237386 make directory hierarchy work 2014-01-05 18:44:32 -08:00
friendica
56f4b0f976 more syntax 2014-01-05 18:19:56 -08:00
friendica
ea251d2939 typos 2014-01-05 18:18:39 -08:00
friendica
bcb812b2f8 set channel default permissions on file creation 2014-01-05 17:54:20 -08:00
friendica
cbc34a40ad reddav: bring permissions up to date with recent code changes 2014-01-05 17:42:56 -08:00
friendica
d0be9d3b23 dav uploading actually works - there's just an issue with the AnyClient running through a proxy. There are probably still some issues with tree structure, but you should be able to use your personal cloud in your top level storage directory now. 2014-01-05 17:28:19 -08:00
friendica
0297241a64 some dav cleanup 2014-01-05 16:37:07 -08:00
friendica
061894d37f reddav - basic mkdir support - needs more work to be robust 2014-01-05 16:00:05 -08:00
friendica
d920e212ac typo in import_directory_profile 2014-01-05 15:51:44 -08:00
friendica
587c5d3e46 a few fixes to webpage editing 2014-01-04 13:44:43 -08:00
friendica
0c85c97480 move js files from core 2014-01-04 03:58:21 -08:00
friendica
f2ba6ed998 fix mimetype detection fallback 2014-01-03 14:18:06 -08:00
friendica
475b24ca9e more dav work 2014-01-03 01:44:25 -08:00
friendica
a1c198814d basic browsing and file retrieval for webdav working - uploads not yet. A lot of permissions stuff is in place so it's marginally (but probably not completely) permission controlled 2014-01-02 17:49:39 -08:00
friendica
ad08561d84 some DAV tweaks before the next round of heavy lifting 2014-01-02 01:09:57 -08:00
friendica
057d885baf return to working on red-dav; This is a bit of a slog at the moment and the basic framework isn't even close to working. This does break the working test we did have (which was never connected to the Red backend). Now we're starting to connect Red and DAV together intimately. There will probably be some twists and turns along the way as we get the information we need into all the class objects that need them. But the important part is that the RedDirectory and RedFile classes are loading without throwing white screens and from here we can use logging to figure out what the DAV front end is trying to do and what it is passing to the backend and hopefully figure out what it expects to do with the results. Unless you're a competent developer with a strong background in OOP and are helping develop this code, you should keep it an arm's length away from any production site and don't even think of enabling it. By default it is turned off. 2014-01-01 16:07:36 -08:00
friendica
c95909921e auto-crop imported photos for things and xchans. This results in undistorted images but may result in cropping important parts of the picture. Still this will work well for 95 out of 100 cases. If the width exceeds the height by greater than 1.2 we will remove an equal margin from either side of the photo leaving the center intact. If the height exceeds the width we will chop off the bottom to make it square. This is good for most single person photographs, unless the object of interest is off-center horizontally in a wide photo - or one is trying to emphasize aspects of human anatomy which may be at the bottom of a tall photo. 2013-12-30 21:41:13 -08:00
friendica
0dd7d93674 basic edit and delete for things 2013-12-30 04:25:55 -08:00
friendica
a331e1acde modify tag_deliver and tgroup_check to handle exclusion tags 2013-12-29 19:45:54 -08:00
friendica
f36be066af display_thing: it ain't much, but it's implemented. 2013-12-29 00:51:27 -08:00
friendica
22f614feba a bit more backend work on things 2013-12-28 17:04:23 -08:00
friendica
1d0fddd39c things can now have (consistent sized) photos - plus I found a couple of issues with duplicate notifications and contact photos not getting an album name (it was crossed with filename). The last one doesn't matter as neither is used, but it was wrong so it has been corrected. Oh and thing photos weren't working at all because the form element name was different than what the module was looking for. But that had never been tested as I was waiting to get the import/resize finished. Next up for that module is display and deletion of things; but the priority is pretty low. 2013-12-28 13:28:49 -08:00
friendica
121ee48963 sslify - remove the redirect fallback - as it gets called occasionally and creates mixed content exceptions. Let's see how we go without it. Also a doc update. 2013-12-27 21:19:23 -08:00
friendica
c59688553c remove prettyphoto from core - this will affect the enhanced photo albums feature on the short term which has been disabled until we figure out how to make the setting per-theme instead of a core option. The library is still available in core (library/prettyphoto) currently but needs to be moved to theme js and loaded/accessed from there [for themes which use it]. Then the library will be removed. It appears that other lightboxes commonly use rel= to group photo albums. So we may provide a generic rel= tag in photo album templates so that the choice of lightbox or album viewer is not only a theme option but could also be accomplished with plugins. 2013-12-26 13:08:16 -08:00
friendica
152ed96379 issue #230 - deletion failure in multiple delivery chains 2013-12-26 00:14:17 -08:00
friendica
66600ed2f8 try again 2013-12-25 04:06:26 -08:00
friendica
6c0a3f31bb didn't work 2013-12-25 02:48:59 -08:00
friendica
4ec569d6e7 sslify http links in media elements if you're on an https server 2013-12-25 02:45:22 -08:00
friendica
fe00e9b261 extend the directory profiles a bit more 2013-12-25 01:57:04 -08:00
friendica
8194ade886 improve the directory popup a bit 2013-12-23 19:44:23 -08:00
friendica
49d2ada4f8 Merge https://github.com/friendica/red into zpull 2013-12-23 15:15:56 -08:00
friendica
63a42480c7 add account_level, is_foreigner and is_member functions; convert all e2ee user input and prompts to hex to avoid javascipt's lame handling of quotes. !!This breaks all prior encrypted posts.!! 2013-12-23 15:13:09 -08:00
friendica
f3abd76e04 Merge pull request #253 from cvogeley/master
Show expire date in post tooltip
2013-12-23 14:10:51 -08:00
Christian Vogeley
84d8fab6f1 Show expire date in post tooltip 2013-12-23 22:29:35 +01:00
Thomas Willingham
50e39c330d Zidification of author links in webpages. 2013-12-23 18:41:41 +00:00
friendica
1a42580ad4 remove a couple of mysql reserved words from being used as table or row names. For this round we're getting 'group' and 'desc'. Warning: potentially destabilising as this touches a lot of code. 2013-12-22 18:37:39 -08:00
friendica
97728543c1 clean up sys_channel creation so it will work 2013-12-22 14:08:38 -08:00
friendica
30219b5bda Merge pull request #249 from cvogeley/master
New modal dialog for item expiry
2013-12-22 13:44:34 -08:00
Thomas Willingham
0d5c5187f9 Style 2013-12-22 21:15:13 +00:00
Thomas Willingham
2074bd0a3b Must have broken that in a merge - put it back 2013-12-22 21:13:24 +00:00
Thomas Willingham
c4b4f27796 Some sys chan stuff 2013-12-22 20:47:57 +00:00
Christian Vogeley
870df76463 Merge remote-tracking branch 'upstream/master' into bootstrap
Conflicts:
	view/php/theme_init.php
2013-12-22 14:31:27 +01:00
Christian Vogeley
25a533bd72 New modal dialog for item expiry 2013-12-22 14:21:57 +01:00
friendica
0366991b45 appears that I missed a few files for Comanchification. so here's mitem. 2013-12-22 02:04:55 -08:00
friendica
d32bbaf599 split private messages into two modules - "message" is just for message lists, "mail" is for reading and writing conversations. This is so we can Comanchify it cleanly. 2013-12-21 23:47:44 -08:00
friendica
aa312f72bf comanchify mod_directory. Two modules remaining. Actually three because message needs to be split. 2013-12-20 12:43:04 -08:00
friendica
2c0fbc508e comanchify connedit, group 2013-12-19 23:56:37 -08:00
friendica
cd78f9d13d sourced items which are then edited at the source weren't setting up the second delivery chain. 2013-12-19 20:23:19 -08:00
friendica
bccc20f38c default photo issue, and connections page showing deleted accounts. Also show last updated on connedit page 2013-12-19 19:16:46 -08:00
friendica
564f431551 comanchificate mod_photos 2013-12-19 17:36:31 -08:00
friendica
7c81889b33 make default profile photo configurable - should be functional but needs admin ui 2013-12-19 16:33:36 -08:00
friendica
f8042cc467 add 'src' parameter to api photo list 2013-12-19 15:23:36 -08:00
friendica
e6dc916915 if somebody tagged you in a private post, the tag email notification contained the obscured message. Clear it. 2013-12-19 13:52:23 -08:00
friendica
825492407e more comanche 2013-12-19 02:35:45 -08:00
friendica
b28a37c38e more comanche 2013-12-19 02:25:44 -08:00
friendica
125543aded more comanche migration 2013-12-19 02:16:14 -08:00
friendica
38fd8410eb split off mod_connections into mod_connections & mod_connedit - lots of links to fix 2013-12-18 01:00:08 -08:00
friendica
7b5a42568a Tricky little bug. Allowed somebody to bypass comment permissions. Hopefully the fix will have no undesired side effects. 2013-12-16 18:07:41 -08:00
friendica
065300f7c3 bloody hell - it isn't defined either. 2013-12-15 18:43:54 -08:00
friendica
817d146123 bloody hell... php version incompatibility with openssl - openssl no longer accepts a string as an algorithm. Earlier versions didn't recognise sha256. So we'll look to see if the algorithm constant for sha256 is defined and if so we'll use that instead of the string. 2013-12-15 18:30:10 -08:00
friendica
950bd72e02 use sitename for the banner if nothing else has been set 2013-12-14 21:37:37 -08:00
friendica
d14e2db6b4 make home.html fullpage mode - make directory search work for non-logged in, but leave off suggest and invite 2013-12-14 17:03:37 -08:00
friendica
c00f0d4b28 a couple more comanche conversions 2013-12-14 13:26:40 -08:00
friendica
0215043826 prepare for Comanchification of mod_photos 2013-12-13 13:30:33 -08:00
friendica
94975f8d30 categories should already be html encoded - ensure this is the case but don't double encode 2013-12-13 12:30:44 -08:00
friendica
65c0b84313 always load css and js sources using the same url as the page that is being visited so there is no http/https mismatch. 2013-12-12 18:13:52 -08:00
zottel
3a11980e49 htmspecialchars_decode only takes one argument. 2013-12-12 13:32:11 +01:00
friendica
303324cdff more htmlspecialchars sanitisation 2013-12-12 02:15:02 -08:00
friendica
b3fe221b7f issue #240 - we were using htmlentities instead of htmlspecialchars in several places, and this was a bit greedy in the set of characters which were converted from utf-8 to HTML entities. Also brought mail attachments up to date so they are rendered identically to item attachments. 2013-12-11 23:13:36 -08:00
friendica
18f0ab2605 cmax wasn't defaulting correctly 2013-12-11 19:56:57 -08:00
friendica
b4e1e8a4a4 The affinity tool is not a "traditional" widget. But it is nevertheless a widget. It just makes fewer page layout decisions which are hard-coded. If you want to shrink it down and put it on the sidebar in your theme, go for it. 2013-12-11 19:43:41 -08:00
friendica
2f46bacded head_remove_css, head_remove_js 2013-12-11 18:29:56 -08:00
friendica
c57b6745e8 Merge https://github.com/friendica/red into zpull
Conflicts:
	view/theme/redbasic/css/style.css
2013-12-11 15:32:25 -08:00
friendica
06c81e189f Merge pull request #239 from git-marijus/master
make empty notes saveable as well
2013-12-11 15:35:54 -08:00
friendica
40e2900326 comanchify all the simple cases - those that only load a profile. Rework permission checks for the profile sidebar so that it is all done internally. Remove crepair which we aren't using. 2013-12-11 14:54:36 -08:00
marijus
aea1e1af82 this makes quotes appear as quotes in notes once page is reloaded. i guess thats fine since we use escape_tags() in notes.php 2013-12-11 18:57:42 +01:00
Thomas Willingham
d93ba783f5 Don't let nobody set an xconfig in safe search. 2013-12-11 15:35:19 +00:00
marijus
1d8c15f2df make suggest channels a feature 2013-12-11 12:01:28 +01:00
friendica
652959678f cleanup and Comanchification of mod_profile 2013-12-10 23:27:17 -08:00