Commit graph

12957 commits

Author SHA1 Message Date
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
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