Commit Graph

  • 561bab4ece remote rating and addition of rate-me to channel profile sidebar friendica 2015-02-04 17:32:29 -08:00
  • 48a145a8ed add the required js file friendica 2015-02-04 15:52:12 -08:00
  • 98c05ae911 Merge https://github.com/friendica/red into pending_merge friendica 2015-02-04 15:51:57 -08:00
  • 3988948516 first cut at rating widget. The flaw is that it is limited because it requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories. friendica 2015-02-04 15:48:39 -08:00
  • e5849f9432 not quite there yet but getting closer a little marijus 2015-02-04 22:55:22 +01:00
  • 1ceb0a7fba hide channel address in directory from hovertip if not logged into the matrix friendica 2015-02-03 23:36:37 -08:00
  • 0357180164 remove extra debugging friendica 2015-02-03 23:33:06 -08:00
  • 127bf82187 probably enough for now - couldn't get the censorship filter in today, I think that's the only bit missing. friendica 2015-02-03 23:30:07 -08:00
  • 0cc29af6d0 order ratings friends first friendica 2015-02-03 22:55:01 -08:00
  • 4ead2cd79d final cleanup on ratings feature friendica 2015-02-03 21:19:29 -08:00
  • 86771547e6 finish off the sync functions friendica 2015-02-03 18:35:54 -08:00
  • 17ffe122b3 ratings - mopping up, most everything but directory sync implemented friendica 2015-02-03 18:10:55 -08:00
  • 5cb2f55dbb rating form work friendica 2015-02-03 16:52:09 -08:00
  • de79bb89fc Merge branch 'master' into pocorate friendica 2015-02-03 16:03:58 -08:00
  • 3f50313862 garbage in garbage out friendica 2015-02-03 16:03:05 -08:00
  • 8a78d1d5df that didn't look so good on a small screen - let it hang out on the right margin friendica 2015-02-03 15:52:57 -08:00
  • c417a43338 styling for the directory page when it comes to ratings friendica 2015-02-03 15:50:12 -08:00
  • 36b756e4cd honour block public setting - especially for standalones friendica 2015-02-03 15:16:03 -08:00
  • df632c4232 run ratingsearch on the server friendica 2015-02-03 15:06:16 -08:00
  • 448af7458f Merge branch 'master' into pocorate friendica 2015-02-03 11:19:50 -08:00
  • 4362aa4c26 for now punt if have no poi, but we should get it from the server friendica 2015-02-03 11:18:00 -08:00
  • 44af22b968 Merge branch 'master' of https://github.com/friendica/red jeroenpraat 2015-02-03 19:58:40 +01:00
  • 0281a2c32a Fixed height of items in dropdown notification lists. They overlapped when the browser uses a higher font size. This must work for everyone. jeroenpraat 2015-02-03 19:58:15 +01:00
  • e890d2210d Fixed height of items in dropdown notification lists. They overlapped when the browser uses a higher font size. This must work for everyone. jeroen 2015-02-03 19:56:31 +01:00
  • 39a8c9e454 NL on 100 percent again :/ jeroen 2015-02-03 17:45:26 +01:00
  • 6067274b51 start to tie ratings to the directory page friendica 2015-02-02 23:58:44 -08:00
  • 77379029f5 add ratings to the directory sync arrays friendica 2015-02-02 21:07:46 -08:00
  • 1807db6cb0 send rating information to directories friendica 2015-02-02 20:13:07 -08:00
  • fa710106e5 sign the ratings, fix the bugs friendica 2015-02-02 17:58:51 -08:00
  • 03bb236651 Merge branch 'master' into pocorate friendica 2015-02-02 17:33:55 -08:00
  • fb6deb113b improved directory registration - honour standalones and do the right thing friendica 2015-02-02 17:32:54 -08:00
  • 09c146f311 Merge branch 'master' into pocorate friendica 2015-02-02 17:21:14 -08:00
  • 125ebfeb0c add signatures friendica 2015-02-02 16:54:55 -08:00
  • 08689db4ff Merge https://github.com/friendica/red into pending_merge friendica 2015-02-02 15:03:01 -08:00
  • a497b5e11e Merge branch 'pocorate'; commit '043ff33' friendica 2015-02-02 15:01:44 -08:00
  • 043ff33e43 issue #889 private tags for forums no longer recognised after tag refactor a few weeks back. This solution is not optimal as it also leaves you in the privacy ACL in some cases and not in others but it restores the previous functionality friendica 2015-02-02 14:59:01 -08:00
  • a80057fec7 comment out latest changes - needs more testing marijus 2015-02-02 17:45:30 +01:00
  • ed3b5f8251 comment this out for now - it is not always true marijus 2015-02-02 17:12:13 +01:00
  • 2546b0a525 one important line missing marijus 2015-02-02 16:48:49 +01:00
  • 74da8f2e87 we also need folder here marijus 2015-02-02 15:31:51 +01:00
  • 1b30e43c45 typo marijus 2015-02-02 15:26:35 +01:00
  • e0bc01a7f6 just select perms marijus 2015-02-02 15:25:30 +01:00
  • c29483b88c respect parent dir permissions marijus 2015-02-02 15:18:44 +01:00
  • aafed50a0e Merge branch 'master' into tres friendica 2015-02-01 20:30:47 -08:00
  • e58bef049d admin/dbsync not reporting failed updates friendica 2015-02-01 15:41:01 -08:00
  • 9bef0d5e14 Merge https://github.com/friendica/red into pending_merge friendica 2015-02-01 15:15:52 -08:00
  • b1a92d620e two tracks proceeding in parallel - first adding the ability to store a digital signature with ratings so that directories can pass them around, second provide some directory registration functions so we can obtain a list of directories from somewhere (to pass ratings around between them). This gives the primary directory role some value as that is where you register your directory. friendica 2015-02-01 15:10:52 -08:00
  • e238b639f8 typo, see #884 jeroenpraat 2015-02-02 00:00:13 +01:00
  • 22ad8f413d add multipart/mixed to getIconFromType() marijus 2015-02-01 12:48:25 +01:00
  • acac58fba0 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-31 14:53:11 -08:00
  • a7e5c7ce64 issue #885, autoperms not working for diaspora connections friendica 2015-01-31 14:52:29 -08:00
  • e6a5f78003 Merge branch 'master' into tres friendica 2015-01-31 00:50:20 -08:00
  • b597e27c4d revup friendica 2015-01-31 00:42:27 -08:00
  • 3e5226adc7 Add more detail about directory_mode settings to default config and docs Habeas Codice 2015-01-30 19:37:25 -08:00
  • 5d2ab4a4fc prevent silly fake null date from causing problems OTW from older builds Habeas Codice 2015-01-30 16:15:05 -08:00
  • 340212d77e sync_locations() toggle DB flag functions were broken - result of postgres changes. Split these into seperate set and reset blocks. friendica 2015-01-30 15:01:10 -08:00
  • ef04d21a8f fix random profiles friendica 2015-01-30 14:30:37 -08:00
  • b18fe85fb8 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-30 13:46:20 -08:00
  • ab0706521e let zot_refresh continue without a primary hub if one cannot be found. also weekly doc updates friendica 2015-01-30 13:45:28 -08:00
  • dbd3999117 better cross-browser compatibility for td hover colour marijus 2015-01-30 14:23:07 +01:00
  • b381579959 Merge pull request #881 from cvogeley/master RedMatrix 2015-01-30 18:14:10 +11:00
  • 4a243b63f7 cleanup event form and various required indicators on inputs friendica 2015-01-29 20:09:48 -08:00
  • 3e22de0be0 how did that stuff merge? grrrr.... friendica 2015-01-29 18:17:24 -08:00
  • 219fe3a8e7 bring back inline images friendica 2015-01-29 18:13:14 -08:00
  • 43f5fbddc6 enable ratings only in this branch until we're ready to push friendica 2015-01-29 15:21:50 -08:00
  • df6d54c64e Merge branch 'master' into pocorate friendica 2015-01-29 15:21:19 -08:00
  • d7dae3c72a Merge https://github.com/friendica/red into pending_merge friendica 2015-01-29 15:19:16 -08:00
  • e2edc2c968 disable ratings until we're a bit further along. It's all changing. friendica 2015-01-29 15:17:50 -08:00
  • 1ec6e62ed3 Merge pull request #880 from redswede/master RedMatrix 2015-01-30 10:17:43 +11:00
  • 912be23e16 Merge branch 'master' into tres friendica 2015-01-29 15:09:35 -08:00
  • ff68ea6087 more message restrict conversions friendica 2015-01-29 14:51:41 -08:00
  • f81df92ef8 Add allowed and not allowed emails to the UI in the Christian Vogeley 2015-01-29 20:27:35 +01:00
  • 05ce141ecc small autocomplete fix adding space to the output provides: the ability to press enter after pressing enter during the mention-js-popup (this second enter should behave as a normal one) FF35 RedSwede 2015-01-29 16:30:45 +01:00
  • 06291c6f42 non-tested fix for issue 847 RedSwede 2015-01-29 16:22:14 +01:00
  • bee939d79a fix issue 848 + code comments RedSwede 2015-01-29 16:06:39 +01:00
  • 775dc3a320 Renamed translation file RedSwede 2015-01-29 14:56:31 +01:00
  • fd0b6c967f Merge branch 'master' into pocorate friendica 2015-01-29 00:28:23 -08:00
  • c993ddd86e prate module friendica 2015-01-29 00:28:02 -08:00
  • 872b165eb2 implement diaspora profile message (oops) or updated profile photos won't be updated friendica 2015-01-29 00:25:29 -08:00
  • b9a760783d Merge https://github.com/friendica/red into pending_merge friendica 2015-01-28 21:11:07 -08:00
  • 74f9544ed4 provide compatibility functions so code breakage with customised setups or work in progress should be minor friendica 2015-01-28 21:08:37 -08:00
  • e157371c39 remote_user => remote_channel friendica 2015-01-28 20:58:59 -08:00
  • a496036066 local_user => local_channel friendica 2015-01-28 20:56:04 -08:00
  • 2039710962 postgres does not support the , syntax. a ; would work, if it weren't statement-locked. FWIW, the exact same queries listed for postgres are perfectly valid and equivalent on mysql. no need for separate statements. Habeas Codice 2015-01-28 17:47:31 -08:00
  • d59bd31a68 Merge branch 'master' of https://github.com/friendica/red Habeas Codice 2015-01-28 17:40:39 -08:00
  • 9b3b0b5e88 basic query for number of raters. Should probably be a join or subselect but that will take a bit more fiddling friendica 2015-01-28 17:39:53 -08:00
  • 1a53788833 bookmarkedchats: remove extraneous group by, dupes removed on insert suggestedchats: normalize to standard SQL Habeas Codice 2015-01-28 17:37:34 -08:00
  • 435509f609 fix improper group by usage Habeas Codice 2015-01-28 17:36:24 -08:00
  • 64181abc6f fix implicit boolean Habeas Codice 2015-01-28 17:34:53 -08:00
  • 1ef2d1c5c4 updates to put rating info into the local xlink before sending it to known directory servers friendica 2015-01-28 16:52:17 -08:00
  • da842da683 Merge branch 'master' into pocorate friendica 2015-01-28 16:06:36 -08:00
  • 54fd8b21db make sure we honour the disable_discover_tab pref friendica 2015-01-28 15:27:58 -08:00
  • 2c02f1184c allow diaspora posts to be delivered to the discover channel unless prohibited from doing so. friendica 2015-01-28 15:23:00 -08:00
  • db1998e0c8 limit the number of forums that can be tagged in a single post - default is 2. The reason is simple - count how many posts would be in transit simultaneously if this was unlimited and somebody tagged 40-50 forums. In practice when used legitimately - we've rarely seen more than two, in fact I don't recall seeing more than two ever. Typically it is one and occasionally two. Changing the default is tricky - a client system cannot do it, but the site hosting a forum can choose to. Since not all sites that host forums will choose to do so, the ordering of the mentions would then be important. friendica 2015-01-28 14:22:52 -08:00
  • 4de6aec657 Merge https://github.com/friendica/red into pending_merge friendica 2015-01-28 02:23:54 -08:00
  • 42816f10de Revert "issue with de email template (lostpass_eml.tpl)" friendica 2015-01-28 02:23:19 -08:00
  • 3e8fa8c8a2 issue with de email template (lostpass_eml.tpl) friendica 2015-01-28 01:48:07 -08:00
  • c826f005e4 fix /view/de/lostpass_eml.tpl marijus 2015-01-28 10:44:48 +01:00
  • 6c7269be94 add yet another firehose check friendica 2015-01-28 01:13:32 -08:00
  • f1203bb3dd Merge https://github.com/friendica/red into pending_merge friendica 2015-01-28 01:07:45 -08:00