Commit Graph
12774 Commits
Author SHA1 Message Date
friendica de79bb89fc Merge branch 'master' into pocorate 2015-02-03 16:03:58 -08:00
friendica 3f50313862 garbage in garbage out 2015-02-03 16:03:05 -08:00
friendica 8a78d1d5df that didn't look so good on a small screen - let it hang out on the right margin 2015-02-03 15:52:57 -08:00
friendica c417a43338 styling for the directory page when it comes to ratings 2015-02-03 15:50:12 -08:00
friendica 36b756e4cd honour block public setting - especially for standalones 2015-02-03 15:16:03 -08:00
friendica df632c4232 run ratingsearch on the server 2015-02-03 15:06:16 -08:00
friendica 448af7458f Merge branch 'master' into pocorate 2015-02-03 11:19:50 -08:00
friendica 4362aa4c26 for now punt if have no poi, but we should get it from the server 2015-02-03 11:18:00 -08:00
jeroenpraat 44af22b968 Merge branch 'master' of https://github.com/friendica/red 2015-02-03 19:58:40 +01:00
jeroenpraat 0281a2c32a Fixed height of items in dropdown notification lists. They overlapped when the browser uses a higher font size. This must work for everyone. 2015-02-03 19:58:15 +01:00
jeroen e890d2210d Fixed height of items in dropdown notification lists. They overlapped when the browser uses a higher font size. This must work for everyone. 2015-02-03 19:56:31 +01:00
jeroen 39a8c9e454 NL on 100 percent again :/ 2015-02-03 17:45:26 +01:00
friendica 6067274b51 start to tie ratings to the directory page 2015-02-02 23:58:44 -08:00
friendica 77379029f5 add ratings to the directory sync arrays 2015-02-02 21:07:46 -08:00
friendica 1807db6cb0 send rating information to directories 2015-02-02 20:13:07 -08:00
friendica fa710106e5 sign the ratings, fix the bugs 2015-02-02 17:58:51 -08:00
friendica 03bb236651 Merge branch 'master' into pocorate 2015-02-02 17:33:55 -08:00
friendica fb6deb113b improved directory registration - honour standalones and do the right thing 2015-02-02 17:32:54 -08:00
friendica 09c146f311 Merge branch 'master' into pocorate 2015-02-02 17:21:14 -08:00
friendica 125ebfeb0c add signatures 2015-02-02 16:54:55 -08:00
friendica 08689db4ff Merge https://github.com/friendica/red into pending_merge 2015-02-02 15:03:01 -08:00
friendica a497b5e11e Merge branch 'pocorate'; commit '043ff33' 2015-02-02 15:01:44 -08:00
friendica 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 2015-02-02 14:59:01 -08:00
marijus a80057fec7 comment out latest changes - needs more testing 2015-02-02 17:45:30 +01:00
marijus ed3b5f8251 comment this out for now - it is not always true 2015-02-02 17:12:13 +01:00
marijus 2546b0a525 one important line missing 2015-02-02 16:48:49 +01:00
marijus 74da8f2e87 we also need folder here 2015-02-02 15:31:51 +01:00
marijus 1b30e43c45 typo 2015-02-02 15:26:35 +01:00
marijus e0bc01a7f6 just select perms 2015-02-02 15:25:30 +01:00
marijus c29483b88c respect parent dir permissions 2015-02-02 15:18:44 +01:00
friendica e58bef049d admin/dbsync not reporting failed updates 2015-02-01 15:41:01 -08:00
friendica 9bef0d5e14 Merge https://github.com/friendica/red into pending_merge 2015-02-01 15:15:52 -08:00
friendica 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. 2015-02-01 15:10:52 -08:00
jeroenpraat e238b639f8 typo, see #884 2015-02-02 00:00:13 +01:00
marijus 22ad8f413d add multipart/mixed to getIconFromType() 2015-02-01 12:48:25 +01:00
friendica acac58fba0 Merge https://github.com/friendica/red into pending_merge 2015-01-31 14:53:11 -08:00
friendica a7e5c7ce64 issue #885, autoperms not working for diaspora connections 2015-01-31 14:52:29 -08:00
friendica b597e27c4d revup 2015-01-31 00:42:27 -08:00
Habeas Codice 3e5226adc7 Add more detail about directory_mode settings to default config and docs 2015-01-30 19:37:25 -08:00
Habeas Codice 5d2ab4a4fc prevent silly fake null date from causing problems OTW from older builds 2015-01-30 16:15:05 -08:00
friendica 340212d77e sync_locations() toggle DB flag functions were broken - result of postgres changes. Split these into seperate set and reset blocks. 2015-01-30 15:01:10 -08:00
friendica ef04d21a8f fix random profiles 2015-01-30 14:30:37 -08:00
friendica b18fe85fb8 Merge https://github.com/friendica/red into pending_merge 2015-01-30 13:46:20 -08:00
friendica ab0706521e let zot_refresh continue without a primary hub if one cannot be found. also weekly doc updates 2015-01-30 13:45:28 -08:00
marijus dbd3999117 better cross-browser compatibility for td hover colour 2015-01-30 14:23:07 +01:00
RedMatrix b381579959 Merge pull request #881 from cvogeley/master
Add allowed and not allowed emails to the UI in the
2015-01-30 18:14:10 +11:00
friendica 3e22de0be0 how did that stuff merge? grrrr.... 2015-01-29 18:17:24 -08:00
friendica 219fe3a8e7 bring back inline images 2015-01-29 18:13:14 -08:00
friendica 43f5fbddc6 enable ratings only in this branch until we're ready to push 2015-01-29 15:21:50 -08:00
friendica df6d54c64e Merge branch 'master' into pocorate 2015-01-29 15:21:19 -08:00