Commit Graph

  • 99c19b307e don't fix the height of the archive widget - fix the maximum height friendica 2014-02-13 02:55:16 -08:00
  • ec99cac9e8 very simple scheme friendica 2014-02-13 00:52:54 -08:00
  • d4d44f9878 oops - still using the !@#$ youtube bbcodes friendica 2014-02-12 19:59:24 -08:00
  • bff92e7a21 remove some obsolete bbcode tags friendica 2014-02-12 19:57:22 -08:00
  • c7dda0c4c1 return the expected array friendica 2014-02-12 15:12:42 -08:00
  • 11e6530d7f Merge pull request #312 from git-marijus/master friendica 2014-02-13 10:08:20 +11:00
  • 2c1b366fdf make activities optional for profile things, clean up the forms friendica 2014-02-12 14:44:27 -08:00
  • 8e68ecc68b dont show onlinestatus if block_public is on marijus 2014-02-12 23:41:08 +01:00
  • 1ca85abf83 Merge https://github.com/friendica/red into zpull friendica 2014-02-12 13:46:25 -08:00
  • 7c0101899d another bbcode addition for the demo, however this one is potentially useful for other purposes friendica 2014-02-12 13:45:11 -08:00
  • a14df3ab72 Merge pull request #311 from git-marijus/master friendica 2014-02-13 08:43:20 +11:00
  • 18b2ff9c24 whitespace marijus 2014-02-12 21:36:20 +01:00
  • e06d9e97c5 make chatrooms in /chat/channel visible to observers aswell marijus 2014-02-12 21:31:11 +01:00
  • 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 friendica 2014-02-12 11:42:33 -08:00
  • ba360b4347 ui improvements on the manage page friendica 2014-02-12 03:05:55 -08:00
  • 2fefbfdea3 Merge https://github.com/friendica/red into zpull friendica 2014-02-12 00:05:29 -08:00
  • 13a3dcf47f dav issue when listing protected contents from OS interface friendica 2014-02-12 00:04:35 -08:00
  • 33777f8194 Merge pull request #310 from tobiasd/20140212 tobiasd 2014-02-12 09:03:16 +01:00
  • 8ffd076884 DE: update to the strings Tobias Diekershoff 2014-02-12 09:01:42 +01:00
  • 8089c3202b better auth logging in dav friendica 2014-02-11 21:20:34 -08:00
  • 7f3f981d96 fix a mysql error which popped up in the dbfail log friendica 2014-02-11 20:45:17 -08:00
  • 655b6445d5 use profile photo on vcard before reverting to xchan photo friendica 2014-02-11 19:51:43 -08:00
  • 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. friendica 2014-02-11 18:45:50 -08:00
  • b5728fa42e fixes to thing profile assignments friendica 2014-02-11 16:56:39 -08:00
  • 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. friendica 2014-02-11 14:35:02 -08:00
  • c0e1e7ed2c Merge https://github.com/friendica/red into zpull friendica 2014-02-11 14:27:44 -08:00
  • 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). friendica 2014-02-11 14:19:20 -08:00
  • 2b38936cde Merge pull request #309 from beardy-unixer/master friendica 2014-02-12 08:30:06 +11:00
  • 2d9655627a Clear out old notifications in the poller. Thomas Willingham 2014-02-11 20:14:45 +00:00
  • 841f3922aa typos in authtest friendica 2014-02-10 20:40:12 -08:00
  • 59094cda51 reversed args in update_modtime, incorrect ud_guid and ud_hash friendica 2014-02-10 20:38:26 -08:00
  • 74fb7d158b Check for the correct DB name before pushing. friendica 2014-02-10 19:20:55 -08:00
  • 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. friendica 2014-02-10 19:18:09 -08:00
  • dfcb863c70 fix ambiguous result message from authtest friendica 2014-02-10 18:20:23 -08:00
  • 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. friendica 2014-02-10 15:39:19 -08:00
  • 12319c41e3 add chanview mode to settings friendica 2014-02-10 15:14:03 -08:00
  • b757bbea4e Merge https://github.com/friendica/red into zpull friendica 2014-02-10 14:42:13 -08:00
  • 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 friendica 2014-02-10 14:37:50 -08:00
  • 35a3b2d8eb s/Options All/AllowOverride All Thomas Willingham 2014-02-10 21:36:19 +00:00
  • 54a89eb410 more bookmark fixes friendica 2014-02-10 03:31:26 -08:00
  • a7fa14800d better bookmark escaping friendica 2014-02-10 01:44:21 -08:00
  • a76c53657b don't add bookmark tags to naked links inside code blocks friendica 2014-02-10 01:11:59 -08:00
  • 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. friendica 2014-02-09 20:08:29 -08:00
  • c7ffae03d8 perform remote discovery on abook sync of nomadic clones if remote channel (xchan) is unknown friendica 2014-02-09 19:45:22 -08:00
  • 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. friendica 2014-02-09 16:47:06 -08:00
  • 9f6d0a2676 Merge pull request #307 from git-marijus/master friendica 2014-02-10 10:02:13 +11:00
  • b58baa5e4a more XSS blockage of uploaded files friendica 2014-02-09 15:00:47 -08:00
  • 3ad9cf67c6 whitespace marijus 2014-02-10 00:00:35 +01:00
  • 46153e4a57 moving background-color to style.css marijus 2014-02-09 23:59:19 +01:00
  • b92f00587b don't allow the browser to open uploaded html/css/js friendica 2014-02-09 14:56:52 -08:00
  • 4fc0126661 theming chat a little marijus 2014-02-09 23:52:09 +01:00
  • 66e7d182d4 Merge https://github.com/friendica/red into zpull friendica 2014-02-09 13:47:00 -08:00
  • 8727a75437 fix the "every other link gets messed up" problem friendica 2014-02-09 13:46:40 -08:00
  • 8bf7b0fffd Doco - abcjsplugin from Olivier Thomas Willingham 2014-02-09 18:09:50 +00:00
  • 6387921000 Merge https://github.com/friendica/red into zpull friendica 2014-02-09 00:31:16 -08:00
  • c5f0b85357 fix wall photos friendica 2014-02-09 00:30:43 -08:00
  • 96881e8330 Merge pull request #306 from cvogeley/master friendica 2014-02-09 18:49:31 +11:00
  • 176b0881ce . Christian Vogeley 2014-02-09 01:39:37 +01:00
  • c9192991c9 Add class to bookmark links to make it better them able Christian Vogeley 2014-02-09 01:37:09 +01:00
  • e346aa7560 that's better friendica 2014-02-08 12:08:07 -08:00
  • e71571f619 revert last fix, it double tags friendica 2014-02-08 12:02:45 -08:00
  • 4a5c1441e1 Merge https://github.com/friendica/red into zpull friendica 2014-02-08 11:56:32 -08:00
  • 92dea7888b allow somebody to type #^{{naked link}} -- auto-linkify it and create a bookmark tag. friendica 2014-02-08 11:53:47 -08:00
  • 7ca2e97a5f Merge pull request #305 from beardy-unixer/master friendica 2014-02-09 06:51:00 +11:00
  • 3222b15485 Pass mids to conv_item template Thomas Willingham 2014-02-08 17:49:09 +00:00
  • 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. friendica 2014-02-08 00:48:19 -08:00
  • ecac985e33 make bookmarks message into an 'info' so it expires and goes away after a bit friendica 2014-02-07 23:33:40 -08:00
  • 8c845f5d50 set default for account_level in DB friendica 2014-02-07 22:47:03 -08:00
  • ae6bd7dc1e fix issue with double linkify in the git feed friendica 2014-02-07 15:41:31 -08:00
  • 1ec7ffc774 Merge https://github.com/friendica/red into zpull friendica 2014-02-07 13:40:26 -08:00
  • 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) friendica 2014-02-07 13:37:33 -08:00
  • a3c8178703 Merge pull request #304 from git-marijus/master friendica 2014-02-08 08:00:55 +11:00
  • 4c0f9a91b9 Merge branch 'upstream' marijus 2014-02-07 21:35:18 +01:00
  • f62ec4132e let oneself be added to a collection in exchange for deleted contacts marijus 2014-02-07 21:28:39 +01:00
  • fd1c444c45 Merge branch 'master' of https://github.com/friendica/red into upstream marijus 2014-02-07 20:47:55 +01:00
  • 6d1f211fab Merge pull request #303 from tuscanhobbit/master Paolo T 2014-02-07 18:06:32 +01:00
  • 8ebd3afd64 IT: update to the strings tuscanhobbit 2014-02-07 18:04:09 +01:00
  • 917a939d46 IT: update to the strings tuscanhobbit 2014-02-07 18:02:20 +01:00
  • 6dd05bb53f Merge branch 'master' of https://github.com/friendica/red into upstream marijus 2014-02-07 13:50:18 +01:00
  • c80325b427 order menu_list by description, not name friendica 2014-02-07 01:49:34 -08:00
  • 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. friendica 2014-02-07 00:50:04 -08:00
  • fb49647993 doc updates friendica 2014-02-07 00:49:45 -08:00
  • cda1224066 missing element in new chatroom link friendica 2014-02-06 23:10:14 -08:00
  • b779400218 mod/ping - don't perform any database calls if installing friendica 2014-02-06 21:31:42 -08:00
  • 9370cca8ad Merge https://github.com/friendica/red into zpull friendica 2014-02-06 16:43:55 -08:00
  • e8d98fbc85 extend the usermenu so we don't have to keep going back to channel homepage to get to the other channel links friendica 2014-02-06 16:43:04 -08:00
  • 72218f831e Merge branch 'master' of https://github.com/friendica/red Thomas Willingham 2014-02-07 00:25:51 +00:00
  • be475bb0cc Minor doco - markdown doesn't like angle brackets. Also give instructions for mounting one's own directory rather than the cloud root. Thomas Willingham 2014-02-07 00:24:39 +00:00
  • 9b2dc9b87c make all naked links bookmark-able friendica 2014-02-06 16:22:40 -08:00
  • 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. friendica 2014-02-06 15:23:20 -08:00
  • 6f2c168d1a Merge branch 'master' of https://github.com/friendica/red into upstream marijus 2014-02-06 23:11:47 +01:00
  • 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. friendica 2014-02-06 13:54:39 -08:00
  • f9381ed746 notification bug - don't use $r, we already set it to something else that we need further on. friendica 2014-02-06 13:32:29 -08:00
  • a2b311991a Merge branch 'master' of https://github.com/friendica/red into upstream marijus 2014-02-06 14:56:59 +01:00
  • c26ae94592 Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-06 14:54:23 +01:00
  • 7a522be20b leave out the quotes friendica 2014-02-06 01:05:22 -08:00
  • c739c43893 more important things to mention. And this is still only the important stuff. friendica 2014-02-06 00:50:13 -08:00
  • d1bd6cdb25 Merge branch 'master' of https://github.com/friendica/red marijus 2014-02-06 08:49:17 +01:00
  • 2c451d5c28 a couple more friendica 2014-02-05 20:53:01 -08:00
  • 2479e32a42 Merge branch 'newhomepage' friendica 2014-02-05 20:44:24 -08:00