aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #935 from dawnbreak/masterRedMatrix2015-03-231-26/+50
|\ | | | | Two possible bugfixes in bb2diaspora.php.
| * Two possible bugfixes in bb2diaspora.php.Klaus Weidenbach2015-03-221-26/+50
| | | | | | | | | | | | | | | | | | I have found two suspicious parts and tried to correct them. I have no diaspora enabled hubs and I am also not sure what influence these two changes will have: $unset($item['author']) ==> unset($item['author']); if(cnt) ==> if($cnt) Before merging can someone with diaspora contacts test this.
* | move the maintenance part to include/sharedwithme.phpMario Vavti2015-03-221-0/+32
| |
* | do not override item_private here anymoreMario Vavti2015-03-221-1/+1
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-213-155/+173
|\|
| * Fixed an exit of a loop in builtin_activity_puller().Klaus Weidenbach2015-03-211-128/+132
| | | | | | | | There was a "$return", but I think it should be "return".
| * Bugfix und variable initialization.Klaus Weidenbach2015-03-212-27/+41
| | | | | | | | | | Fixed a wrong perm_is_allowed() parameter, commented some other places where we use variables that are not set and should not work.
* | add loadtime search to channel and fix it for home. display and search need ↵friendica2015-03-211-2/+1
|/ | | | further investigation
* change permission roles for things like channel admin to make them more ↵friendica2015-03-201-27/+27
| | | | easily manually settable from the connections edit page.
* some tabs title statuseditor restructuringMario Vavti2015-03-211-1/+1
|
* some cleanupMario Vavti2015-03-201-13/+8
|
* possible improvement regarding deletionMario Vavti2015-03-201-29/+42
|
* Explicitly force link for 'All Collections' on the network page to gid=0 so ↵friendica2015-03-191-1/+1
| | | | it can be used with a default page over-ride for gid.
* tweaks to directory registrations which don't seem to be happening, also ↵friendica2015-03-192-2/+16
| | | | downgrade any directory that claims to be a primary directory for RED_GLOBAL.
* ratenotif: loop oddityfriendica2015-03-191-9/+9
|
* make the channel item query match recent changes to network item query (and ↵friendica2015-03-182-2/+2
| | | | some slightly older changes in display item query), and allow '@' in linkified urls.
* Change wording on the photo location feature. When photos are merged with ↵friendica2015-03-181-1/+1
| | | | DAV storage we won't be stripping metadata by default.
* get the correct hemisphere for geotagged photosfriendica2015-03-171-2/+2
|
* turn photo location mapping into a featurefriendica2015-03-172-1/+2
|
* The random bad signatures are because something somewhere is trimming the ↵friendica2015-03-171-2/+2
| | | | body text. It could be any one of hundreds of functions that touch the message body. We really want to trim the body text, so I'm putting back all the trim statements - in mod/item and item_store and item_store_update. The last fix for random bad sigs noted that one of the trims wasn't there, so the others were removed. The correct fix is for all the trims to be there. We will probably have a few (quite a few) bad sigs during the transition back to trimmed text but this should nail it for anybody on recent code and with new content.
* display a map for photos if allowed. Note: there is a bug in that if the map ↵friendica2015-03-161-0/+41
| | | | div starts with display:none one needs to reload the frame or zoom in or they end up at minimum resolution. Still trying to sort this out.
* started to add the ability to geotag photos (default will be disabled) but ↵friendica2015-03-162-3/+12
| | | | my phone isn't outputting the GPS tags even after being explicitly enabled so I'll have to wait until I've got a device that I can reliably test against.
* openid cleanupfriendica2015-03-161-7/+5
|
* also update the api to matchfriendica2015-03-161-2/+2
|
* phase one of the great file storage unification - use one button for uploads ↵friendica2015-03-161-1/+1
| | | | of any type (image or attachment). We'll sort out which one it is and deal with it appropriately.
* Documentation and remove duplicate code.Klaus Weidenbach2015-03-161-72/+79
| | | | | Add a bit Doxygen documentation and remove some duplicate code from account.php.
* create terms for Diaspora mention tags - which in Diaspora are handled ↵friendica2015-03-131-3/+97
| | | | differently than other tag links and have to be done separately; they aren't processed by linkify_tags which handles all of our other tag processing. Also move the abook_channel clause in mod_network to the join statement. This works fine in mysql and achievies the desired result. I hope postgres can handle an expression as a join clause.
* Merge pull request #928 from dawnbreak/docuRedMatrix2015-03-142-29/+69
|\ | | | | Some documentation, fix chatroom service class lookup.
| * Some documentation, fix chatroom service class lookup.Klaus Weidenbach2015-03-142-29/+69
| | | | | | | | | | Add some Doxygen documentation and fixing a service class lookup for chatroom_create().
* | invoke tgroup_check() on diaspora posts/comments in case the recipient is a ↵friendica2015-03-131-19/+34
|/ | | | forum with channel_w_stream permissions restricted.
* Some cleanups.Klaus Weidenbach2015-03-133-68/+99
| | | | | | Fixed dbesc_identifier(), but it is not used yet. Corrected some other variable names and variable initialization before using them.
* remove the now redundant audio/video buttons and label the editor text style ↵friendica2015-03-112-1/+6
| | | | buttons which didn't have them. Unused editor buttons were commented in case we need to bring them back. If things go smoothly we can remove them. Use the link icon going forward - for all links.
* Merge pull request #925 from unary/fixinsertRedMatrix2015-03-121-1/+1
|\ | | | | add missing %d for abook_closeness
| * add missing %d for abook_closenessMichael Johnston2015-03-111-1/+1
| |
* | make embeds bookmarkablefriendica2015-03-111-1/+1
| |
* | turn parse_url into the definitive url attaching mechanismfriendica2015-03-112-3/+35
|/
* don't relay diaspora comments to sys channelfriendica2015-03-111-0/+6
|
* skip trying to come up with an intelligent way to decide what photos should ↵friendica2015-03-111-19/+1
| | | | get a status post - leave it manual.
* allow urls using the zot: or zots: URL schemes to exist without getting ↵friendica2015-03-101-1/+1
| | | | filtered away.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-101-31/+58
|\
| * Fix SQL query for removing orphan hooks.Klaus Weidenbach2015-03-101-31/+58
| | | | | | | | | | initialize some variables before using them. commented out some unused variables.
* | Change logic of "don't create a status post for this photo upload" and turn ↵friendica2015-03-102-3/+3
|/ | | | it into a bona-fide on/off toggle. This takes up one more vertical line, but we have it to spare, and the single button (while concise visually) provided no feedback of the current state, or indicate whether a second click toggled it. Some addons use this setting so addons will need to be pulled when this is pulled in order to remain in sync.
* View upload photo button only if you have permission.Klaus Weidenbach2015-03-101-59/+54
| | | | | | | | | | Check if post_photos permission is available otherwise hide the photo upload button. Or should we show the button and just disable it with a title, about missing permission to upload photos? In comments we use the same icon, but just add [img] bb-code. Should we provide this if no permission to upload photos. Do we need different icons for [img] and photo upload buttons?
* diaspora's spammy permission model seems to have leaked through our ↵friendica2015-03-101-2/+5
| | | | firehose. Don't let it.
* more work on queue optimisationsfriendica2015-03-093-7/+39
|
* whitespacefriendica2015-03-091-2/+1
|
* make network page default options work more or less universally instead of ↵friendica2015-03-092-5/+6
| | | | just from the navbar, and fix some saved-search weirdness related to the delete-term icon
* Allow site to over-ride directory options. Bugger off.friendica2015-03-091-38/+31
|
* Fix missing value in insert for default closenessAlexandre Hannud Abdo2015-03-091-1/+1
|
* change default affinity (abook_closeness) to 80 for all new connections ↵friendica2015-03-083-3/+21
| | | | going forward (was 99). This way it can be adjusted down later without requiring you to change all your existing connections upward (since your existing connections are likely all sitting at 99 at the moment). The default setting is also configurable with a pconfig system.new_abook_closeness