Commit Graph

9503 Commits

Author SHA1 Message Date
friendica 99c19b307e don't fix the height of the archive widget - fix the maximum height 2014-02-13 02:55:16 -08:00
friendica ec99cac9e8 very simple scheme 2014-02-13 00:52:54 -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
friendica 11e6530d7f Merge pull request #312 from git-marijus/master
dont show onlinestatus if block_public is on
2014-02-13 10:08:20 +11:00
friendica 2c1b366fdf make activities optional for profile things, clean up the forms 2014-02-12 14:44:27 -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
friendica a14df3ab72 Merge pull request #311 from git-marijus/master
make chatrooms in /chat/channel visible to observers aswell
2014-02-13 08:43:20 +11: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 ba360b4347 ui improvements on the manage page 2014-02-12 03:05:55 -08:00
friendica 2fefbfdea3 Merge https://github.com/friendica/red into zpull 2014-02-12 00:05:29 -08:00
friendica 13a3dcf47f dav issue when listing protected contents from OS interface 2014-02-12 00:04:35 -08:00
tobiasd 33777f8194 Merge pull request #310 from tobiasd/20140212
DE: update to the strings
2014-02-12 09:03:16 +01:00
Tobias Diekershoff 8ffd076884 DE: update to the strings 2014-02-12 09:01:42 +01:00
friendica 8089c3202b better auth logging in dav 2014-02-11 21:20:34 -08:00
friendica 7f3f981d96 fix a mysql error which popped up in the dbfail log 2014-02-11 20:45:17 -08:00
friendica 655b6445d5 use profile photo on vcard before reverting to xchan photo 2014-02-11 19:51:43 -08:00
friendica 95a45a119d shamelessly steal, and cut/paste from the settings page to get mod_photos edit permissions working - and it looks like we still have some other fancybox instances (yet another lightbox) which haven't yet been converted to colorbox and will need to be fixed. Way too many lightboxes. 2014-02-11 18:45:50 -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
friendica 2b38936cde Merge pull request #309 from beardy-unixer/master
Clear out old notifications in the poller.
2014-02-12 08:30:06 +11:00
Thomas Willingham 2d9655627a Clear out old notifications in the poller. 2014-02-11 20:14:45 +00:00
friendica 841f3922aa typos in authtest 2014-02-10 20:40:12 -08: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 dfcb863c70 fix ambiguous result message from authtest 2014-02-10 18:20:23 -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 12319c41e3 add chanview mode to settings 2014-02-10 15:14:03 -08:00
friendica b757bbea4e Merge https://github.com/friendica/red into zpull 2014-02-10 14:42:13 -08:00
friendica bf09fc9bbe getting bookmark support in tinymce is left as a FIXME. I've got something that almost works, but not quite in editor_plugin_src.js2 2014-02-10 14:37:50 -08:00
Thomas Willingham 35a3b2d8eb s/Options All/AllowOverride All 2014-02-10 21:36:19 +00:00
friendica 54a89eb410 more bookmark fixes 2014-02-10 03:31:26 -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 eb96a04d34 since the project donate section was added to siteinfo - add a way for the hub admin to add in a donation section to keep the hub running. 2014-02-09 20:08:29 -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 cf3b76c046 backend for chatroom activity monitor - honours permissions and returns (json) how many in room and last chat timestamp, regardless of whether the observer is actually in the room. 2014-02-09 16:47:06 -08:00
friendica 9f6d0a2676 Merge pull request #307 from git-marijus/master
theming chat a little
2014-02-10 10:02:13 +11:00
friendica b58baa5e4a more XSS blockage of uploaded files 2014-02-09 15:00:47 -08:00
marijus 3ad9cf67c6 whitespace 2014-02-10 00:00:35 +01:00
marijus 46153e4a57 moving background-color to style.css 2014-02-09 23:59:19 +01:00
friendica b92f00587b don't allow the browser to open uploaded html/css/js 2014-02-09 14:56:52 -08:00