Commit graph

3293 commits

Author SHA1 Message Date
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