Commit graph

12744 commits

Author SHA1 Message Date
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
friendica
d7dae3c72a Merge https://github.com/friendica/red into pending_merge 2015-01-29 15:19:16 -08:00
friendica
e2edc2c968 disable ratings until we're a bit further along. It's all changing. 2015-01-29 15:17:50 -08:00
RedMatrix
1ec6e62ed3 Merge pull request #880 from redswede/master
fixes
2015-01-30 10:17:43 +11:00
Christian Vogeley
f81df92ef8 Add allowed and not allowed emails to the UI in the
admin menu
2015-01-29 20:27:35 +01:00
RedSwede
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
2015-01-29 16:30:45 +01:00
RedSwede
06291c6f42 non-tested fix for issue 847 2015-01-29 16:22:14 +01:00
RedSwede
bee939d79a fix issue 848 + code comments 2015-01-29 16:06:39 +01:00
RedSwede
775dc3a320 Renamed translation file 2015-01-29 14:56:31 +01:00
friendica
fd0b6c967f Merge branch 'master' into pocorate 2015-01-29 00:28:23 -08:00
friendica
c993ddd86e prate module 2015-01-29 00:28:02 -08:00
friendica
872b165eb2 implement diaspora profile message (oops) or updated profile photos won't be updated 2015-01-29 00:25:29 -08:00
friendica
b9a760783d Merge https://github.com/friendica/red into pending_merge 2015-01-28 21:11:07 -08:00
friendica
74f9544ed4 provide compatibility functions so code breakage with customised setups or work in progress should be minor 2015-01-28 21:08:37 -08:00
friendica
e157371c39 remote_user => remote_channel 2015-01-28 20:58:59 -08:00
friendica
a496036066 local_user => local_channel 2015-01-28 20:56:04 -08:00
Habeas Codice
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.
2015-01-28 17:47:31 -08:00
Habeas Codice
d59bd31a68 Merge branch 'master' of https://github.com/friendica/red 2015-01-28 17:40:39 -08:00
friendica
9b3b0b5e88 basic query for number of raters. Should probably be a join or subselect but that will take a bit more fiddling 2015-01-28 17:39:53 -08:00
Habeas Codice
1a53788833 bookmarkedchats: remove extraneous group by, dupes removed on insert
suggestedchats: normalize to standard SQL
2015-01-28 17:37:34 -08:00
Habeas Codice
435509f609 fix improper group by usage 2015-01-28 17:36:24 -08:00
Habeas Codice
64181abc6f fix implicit boolean 2015-01-28 17:34:53 -08:00
friendica
1ef2d1c5c4 updates to put rating info into the local xlink before sending it to known directory servers 2015-01-28 16:52:17 -08:00
friendica
da842da683 Merge branch 'master' into pocorate 2015-01-28 16:06:36 -08:00
friendica
54fd8b21db make sure we honour the disable_discover_tab pref 2015-01-28 15:27:58 -08:00
friendica
2c02f1184c allow diaspora posts to be delivered to the discover channel unless prohibited from doing so. 2015-01-28 15:23:00 -08:00
friendica
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. 2015-01-28 14:22:52 -08:00
friendica
4de6aec657 Merge https://github.com/friendica/red into pending_merge 2015-01-28 02:23:54 -08:00
friendica
42816f10de Revert "issue with de email template (lostpass_eml.tpl)"
This reverts commit 3e8fa8c8a2.
2015-01-28 02:23:19 -08:00
friendica
3e8fa8c8a2 issue with de email template (lostpass_eml.tpl) 2015-01-28 01:48:07 -08:00
marijus
c826f005e4 fix /view/de/lostpass_eml.tpl 2015-01-28 10:44:48 +01:00