friendica
|
4ead2cd79d
|
final cleanup on ratings feature
|
2015-02-03 21:19:29 -08:00 |
|
friendica
|
86771547e6
|
finish off the sync functions
|
2015-02-03 18:35:54 -08:00 |
|
friendica
|
17ffe122b3
|
ratings - mopping up, most everything but directory sync implemented
|
2015-02-03 18:10:55 -08:00 |
|
friendica
|
5cb2f55dbb
|
rating form work
|
2015-02-03 16:52:09 -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
|
4362aa4c26
|
for now punt if have no poi, but we should get it from the server
|
2015-02-03 11:18:00 -08: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
|
125ebfeb0c
|
add signatures
|
2015-02-02 16:54:55 -08:00 |
|
friendica
|
e58bef049d
|
admin/dbsync not reporting failed updates
|
2015-02-01 15:41:01 -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 |
|
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 |
|
friendica
|
ec4d3a2349
|
fix to poco chatrooms
|
2015-01-15 20:56:55 -08:00 |
|
friendica
|
43254029ad
|
errors in mod_poco
|
2015-01-15 20:43:53 -08:00 |
|
friendica
|
dfe31dc3b7
|
more heavy lifting on poco rep
|
2015-01-15 19:05:42 -08:00 |
|
friendica
|
9c15844845
|
make sure mod/prep follows the poco_rating allow preference
|
2015-01-15 17:50:24 -08:00 |
|
friendica
|
597b07e8cc
|
poco rating - add a test module for pulling out ratings
|
2015-01-15 17:32:41 -08:00 |
|
friendica
|
e7932d97a2
|
editing stuff for poco reputation
|
2015-01-15 16:37:47 -08:00 |
|
friendica
|
1c9299ed42
|
more backend work on poco rating
|
2015-01-15 14:05:18 -08:00 |
|
friendica
|
56bc3bcdce
|
provide correct permissions role default for old-timers that didn't have any role configured.
|
2015-01-14 19:27:55 -08:00 |
|
friendica
|
168b67fa41
|
correct some activity object types (for comments), also fix a foreach warning resulting from recent tag work
|
2015-01-14 18:36:23 -08:00 |
|
friendica
|
7a24943c34
|
some back-end code to support location activity objects. Work in progress.
|
2015-01-14 14:46:01 -08:00 |
|
friendica
|
1005618faf
|
honor disable_discover_tab in mod/home - it isn't a tab here but basically block public content from showing if it's set.
|
2015-01-14 13:52:34 -08:00 |
|
friendica
|
a93f2b1b8f
|
now that's useful...
|
2015-01-13 18:41:11 -08:00 |
|
friendica
|
dfdef0af0d
|
provide a setting to control ALLOWCODE permissions at the channel level - it isn't always appropriate to apply this to all channels in an account.
|
2015-01-13 18:30:30 -08:00 |
|
friendica
|
98acefe228
|
revert recent 3.0 changes to mod/cloud so we can work on this completely in another branch and not destabilise core
|
2015-01-13 18:12:04 -08:00 |
|
friendica
|
111bbe65d9
|
Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging
Conflicts:
mod/profiles.php
|
2015-01-13 18:07:49 -08:00 |
|
friendica
|
e528483d81
|
hide friends broken, add parameter for item search by verb
|
2015-01-13 14:42:54 -08:00 |
|
Stefan Parviainen
|
47a2668b30
|
Allow tags in event description and location
|
2015-01-13 18:23:52 +01:00 |
|
Stefan Parviainen
|
93735df2c7
|
Allow tags in mail, many profile fields, and admin info
|
2015-01-13 17:54:40 +01:00 |
|
friendica
|
1b3e52af2d
|
theme toggle issue when viewing mod/cloud of another channel
|
2015-01-12 18:33:39 -08:00 |
|
friendica
|
2f9fe0280e
|
document the pros and cons of the not-yet written hassle-free connection auto-permission setting.
|
2015-01-12 17:20:28 -08:00 |
|
friendica
|
cdc52ba884
|
change deletion behaviour of linked photo items. Previously deleting the visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time.
|
2015-01-12 16:27:27 -08:00 |
|
friendica
|
9fc9af87e3
|
Merge https://github.com/friendica/red into pending_merge
|
2015-01-12 11:26:11 -08:00 |
|
friendica
|
962c6207ae
|
double perms msg
|
2015-01-12 11:25:48 -08:00 |
|
Stefan Parviainen
|
adc9564b5c
|
Refactor mention code to make it more reusable
|
2015-01-12 20:01:07 +01:00 |
|
friendica
|
580c30f516
|
another attempt to explain default permissions on connedit page
|
2015-01-11 21:18:29 -08:00 |
|
friendica
|
a088a8f03c
|
remove extraneous debug file left over from postgres work.
|
2015-01-11 20:02:24 -08:00 |
|
friendica
|
3f4f3e244a
|
that was not intended to be merged with master yet. Put it under a define
|
2015-01-11 15:22:58 -08:00 |
|
friendica
|
0259051a87
|
basic backend work for creating consensus items
|
2015-01-11 14:41:33 -08:00 |
|
friendica
|
b018b39e64
|
Merge branch 'master' into trinidad
|
2015-01-11 14:02:27 -08:00 |
|
Christian Vogeley
|
f0c7612bcd
|
Merge remote-tracking branch 'upstream/master'
Conflicts:
doc/html/classRedmatrix_1_1Import_1_1Import-members.html
doc/html/classRedmatrix_1_1Import_1_1Import.js
|
2015-01-11 16:22:59 +01:00 |
|
Christian Vogeley
|
43f143a211
|
Fix for issue #763 Error creating new channel within the limits of the
subscription plan
|
2015-01-11 16:12:36 +01:00 |
|
friendica
|
4c31598555
|
Merge branch 'master' into trinidad
|
2015-01-10 14:59:24 -08:00 |
|
friendica
|
10102ac2ac
|
connection clone issues
|
2015-01-10 14:59:10 -08:00 |
|
friendica
|
df0f67843e
|
Merge branch 'master' into trinidad
|
2015-01-10 13:05:04 -08:00 |
|
Habeas Codice
|
0368fe49f3
|
Fix unescaped image data
|
2015-01-10 11:08:37 -08:00 |
|
marijus
|
978d78b953
|
basic changes for file activity
|
2015-01-09 15:18:45 +01:00 |
|
friendica
|
fab09ef1bc
|
Merge branch 'master' into trinidad
|
2015-01-08 16:03:30 -08:00 |
|
pafcu
|
80c77b7f92
|
Merge pull request #833 from pafcu/oneautocompleter
Fixes for the new autocompletion
|
2015-01-08 18:25:38 +02:00 |
|
Stefan Parviainen
|
32c6eab01c
|
Fix saved searches on network page, fix caching mith multiple autocompleters
|
2015-01-08 17:16:08 +01:00 |
|
Stefan Parviainen
|
833d51527b
|
Honor requested count in navbar search
|
2015-01-08 16:05:00 +01:00 |
|
friendica
|
0657195125
|
Merge branch 'master' into trinidad
|
2015-01-07 14:39:09 -08:00 |
|
friendica
|
087d6744fc
|
Merge https://github.com/friendica/red into pending_merge
|
2015-01-07 14:39:07 -08:00 |
|
friendica
|
ce953e2f41
|
syncing connections issue, incorrect return_url after deleting connection
|
2015-01-07 14:35:03 -08:00 |
|
Stefan Parviainen
|
f2e648308c
|
Return results from acl.php in standard form
|
2015-01-07 20:45:00 +01:00 |
|
Stefan Parviainen
|
34ecbcceea
|
Make nav search use textcomplete
|
2015-01-07 19:39:50 +01:00 |
|
friendica
|
3ef487418d
|
don't allow admin to delete the sys channel from the channel manage page
|
2015-01-06 20:12:34 -08:00 |
|
friendica
|
c05586fbe7
|
begin the grand unification for 3.0. Start by splitting DAV into a web accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources.
|
2015-01-06 11:55:42 -08:00 |
|
friendica
|
39459c2d65
|
undo these bits of trinidad - we're going to do things differently
|
2015-01-05 18:22:15 -08:00 |
|
friendica
|
aa18a43eff
|
Merge branch 'master' into trinidad
|
2015-01-04 14:54:37 -08:00 |
|
friendica
|
3983348b96
|
the last checkin removed hostname from the address for autocomplete searches. This one allows it if explicitly added with a '@'. So 'mike' will find all mikes. 'mike@z' will find mike@zothub but not mike@popcorn.
|
2015-01-04 14:51:41 -08:00 |
|
friendica
|
47526cdecf
|
Merge branch 'master' into trinidad
|
2015-01-04 14:48:14 -08:00 |
|
friendica
|
57d8271eba
|
only check the LHS of xchan_addr for autocomplete, don't match on the hostname.
|
2015-01-04 14:47:08 -08:00 |
|
friendica
|
82a37ebae3
|
Merge branch 'master' into trinidad
|
2015-01-04 12:30:51 -08:00 |
|
RedMatrix
|
ebb1a61684
|
Merge pull request #816 from pafcu/acl
Autocomplete improvements
|
2015-01-05 07:30:07 +11:00 |
|
Stefan Parviainen
|
cb181993a8
|
Fix wrong require
|
2015-01-04 14:54:52 +01:00 |
|
Stefan Parviainen
|
ac4c17dd4c
|
Typo
|
2015-01-04 14:31:27 +01:00 |
|
Stefan Parviainen
|
57809f20a4
|
Sorting of autocomplete
|
2015-01-04 14:23:23 +01:00 |
|
Stefan Parviainen
|
386f361855
|
Autocmplete suggestions for non-local users, also suggest from visited channel's connections
|
2015-01-04 12:54:23 +01:00 |
|
friendica
|
edd1ad37c4
|
Merge branch 'master' into trinidad
|
2015-01-04 00:48:18 -08:00 |
|
marijus
|
0779e3ae53
|
provide some info for buttons
|
2015-01-03 13:42:05 +01:00 |
|
friendica
|
1ef1d1c2b7
|
Merge branch 'master' into trinidad
|
2015-01-02 19:22:46 -08:00 |
|
friendica
|
31648d65c8
|
some work on the edit connection workflow explanation and connedit page. This needs a lot more attention, but it was screaming for any improvement in documenting why we tell you that the permissions have been changed but not saved.
|
2015-01-02 19:20:52 -08:00 |
|
friendica
|
3157304bbd
|
Merge branch 'master' into trinidad
|
2015-01-02 17:26:38 -08:00 |
|
pafcu
|
0e4a10c7ec
|
Merge pull request #810 from pafcu/aclsort
Sort acl results according to match position (only type='c' for now)
|
2015-01-02 13:19:18 +02:00 |
|
Stefan Parviainen
|
6b5f8bfbe4
|
Sort acl results according to match position (only type='c' for now)
|
2015-01-02 12:08:36 +01:00 |
|
friendica
|
8b844ed978
|
Merge branch 'master' into trinidad
|
2015-01-01 23:48:27 -08:00 |
|
friendica
|
c7aa8bf1b4
|
syntax issues (with some php versions?), unchecked intval
|
2015-01-01 23:47:14 -08:00 |
|
friendica
|
82d0a4af45
|
Merge branch 'master' into trinidad
|
2015-01-01 22:33:28 -08:00 |
|
friendica
|
68c612c597
|
fix shares that are processed with markdown (regression, this was pulled from diaspora2bb a couple weeks back as it was affecting diaspora input, but here we're dealing with red input only)
|
2015-01-01 22:30:54 -08:00 |
|
RedMatrix
|
817b54688e
|
Merge pull request #805 from pafcu/moretpl
Move some HTML out to templates
|
2015-01-02 12:10:50 +11:00 |
|
Stefan Parviainen
|
85e76773a0
|
Use grouped select field for role selection
|
2015-01-01 15:54:16 +01:00 |
|
Stefan Parviainen
|
686b6ee118
|
Use grouped select field for timezone selection
|
2015-01-01 14:44:50 +01:00 |
|
Stefan Parviainen
|
70f0019905
|
Checkboxify yesno-fields, but use CSS to show them as switches in Redbasic
|
2015-01-01 10:08:20 +01:00 |
|
friendica
|
abd345f80f
|
Merge branch 'master' into trinidad
|
2014-12-30 15:25:06 -08:00 |
|
RedMatrix
|
ae9d08267c
|
Merge pull request #797 from anaqreon/imagelink
Imagelink
|
2014-12-31 10:23:50 +11:00 |
|
RedMatrix
|
4a82967639
|
Merge pull request #791 from pafcu/notifications
Improved notifications
|
2014-12-31 10:21:38 +11:00 |
|
Andrew Manning
|
c49b521884
|
Added url tag around image for inserted links
|
2014-12-30 16:16:57 -06:00 |
|
pafcu
|
0623b47237
|
Merge pull request #793 from pafcu/filestorageurlfix
Encode URL offered in filestorage. Fixes #780
|
2014-12-30 22:40:53 +02:00 |
|
Stefan Parviainen
|
f6b16e1d5a
|
Encode URL offered in filestorage. Fixes #780
|
2014-12-30 18:11:45 +01:00 |
|
Stefan Parviainen
|
e6a3ea2c95
|
Make showing wall posts, intros and private messages under Notices optional
|
2014-12-30 15:27:33 +01:00 |
|
Stefan Parviainen
|
2710510392
|
Sort notifications
|
2014-12-30 15:21:29 +01:00 |
|
marijus
|
8e034a3b6b
|
fix recursive file permissions
|
2014-12-30 13:56:27 +01:00 |
|
friendica
|
2f650b74d3
|
Merge branch 'master' into trinidad
|
2014-12-29 23:58:14 -08:00 |
|