Commit graph

3892 commits

Author SHA1 Message Date
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
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
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
bee939d79a fix issue 848 + code comments 2015-01-29 16:06:39 +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
b9a760783d Merge https://github.com/friendica/red into pending_merge 2015-01-28 21:11:07 -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
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
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
marijus
87814670c1 no need for new line here - spacing is done via css 2015-01-28 08:56:56 +01:00
friendica
145b30adfc allow RSS connections in the type 'a' autocomplete results as that is used for channel sources. Without it a feed cannot be selected as a channel source. 2015-01-27 18:34:18 -08:00
friendica
525c62ab1d Merge https://github.com/friendica/red into pending_merge 2015-01-27 11:48:39 -08:00
friendica
f62383e648 allow doc/help system to use subdirs 2015-01-27 11:48:10 -08:00
marijus
65aa6cf708 move userReadableSize() and getIconFromType() from /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme 2015-01-27 19:00:16 +01:00
friendica
efb6842d74 superblock enhancements 2015-01-26 20:47:53 -08:00
friendica
d73972e8e2 provide a json feed of search results 2015-01-26 17:09:33 -08:00
friendica
b428fdf66e abstract poco into a single function in socgraph so we can provide different wrappers for it providing slightly different functionality. 2015-01-25 16:27:09 -08:00
friendica
0125e9d288 Hide all the scary decision making stuff that sends intellectually challenged beings into siezures and brain melt-downs and online freak-outs. 2015-01-25 14:06:57 -08:00
friendica
4ca2ec7638 rework the new connection stuff so we don't need a "permissions have been changed but not saved" message. 2015-01-25 13:30:40 -08:00
anaqreon
1cbfe5adf1 misspelling 2015-01-25 15:49:07 -05:00
Habeas Codice
1d80bcf2e7 standardize sql 2015-01-24 21:16:43 -08:00
Habeas Codice
0405f2bcb9 Merge branch 'master' of https://github.com/friendica/red 2015-01-23 17:26:37 -08:00
Habeas Codice
891d231bbe rand() fixes 2015-01-23 17:25:05 -08:00
marijus
0cbe64c360 some more kiss 2015-01-24 01:13:02 +01:00
marijus
8789c96e78 some code restructure 2015-01-23 14:50:39 +01:00
marijus
e874376268 this will require more fixing in include/enotify 2015-01-23 02:09:28 +01:00
marijus
87dcc4c145 possible performance improvement for sharedwithme update query 2015-01-22 22:50:38 +01:00
Habeas Codice
c05f0ec407 Merge branch 'master' of https://github.com/friendica/red 2015-01-21 21:27:07 -08:00
Habeas Codice
6d291d880e directory server dba sql fixes 2015-01-21 21:25:50 -08:00
marijus
cad8228db3 Merge branch 'master' of https://github.com/friendica/red 2015-01-22 04:58:34 +01:00
marijus
3731ff97ff make $links an array of links 2015-01-22 04:57:59 +01:00
friendica
b946ac63a1 couple of hubloc manager issues 2015-01-21 19:09:12 -08:00
friendica
0010eaa411 Merge https://github.com/friendica/red into pending_merge 2015-01-21 18:34:31 -08:00
friendica
8472e706bc hubloc manage issue 2015-01-21 18:34:15 -08:00
marijus
4ff71fc0c7 change mod/sharedwithme backend to use activity object - this is not backwards compatible 2015-01-22 02:34:38 +01:00
RedMatrix
39dad87adc Merge pull request #862 from pafcu/help
Add some database documentation + mod/help.php bugfix
2015-01-19 10:19:08 +11:00
marijus
b4faf4d90b fix link 2015-01-18 15:31:13 +01:00
marijus
9ac0922ff2 fix goaway link 2015-01-18 15:29:05 +01:00
marijus
973398b915 fix profile tabs link 2015-01-18 15:15:48 +01:00
marijus
1c2d956d7f basic proof of concept file activity support - will send activity via the filestorage module and via attach_delete() 2015-01-18 14:44:58 +01:00
Stefan Parviainen
319b279b3a Don't try to open unexisting files in help 2015-01-18 10:26:05 +01:00
friendica
8f8700ddd2 mod_prep usability enhancements, doc updates 2015-01-16 00:53:04 -08:00