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 |
|