aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-231-97/+95
|\
| * disable noticesmarijus2015-01-241-2/+2
| |
| * some more kissmarijus2015-01-241-65/+51
| |
| * typomarijus2015-01-231-1/+1
| |
| * we get the object info before it is deleted nowmarijus2015-01-231-12/+12
| |
| * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-231-0/+9
| |\
| * | some code restructuremarijus2015-01-231-43/+55
| | |
* | | onedirsync issue reported by habeas codicefriendica2015-01-231-3/+2
| |/ |/|
* | provide pref to set default photo resolution for posts to something other ↵friendica2015-01-231-0/+9
|/ | | | than 2. The only acceptable option is 1. (640)
* Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-222-2/+26
|\
| * add some mimetypesmarijus2015-01-222-2/+26
| |
* | fix dir server query take 2Habeas Codice2015-01-221-1/+1
|/ | | | | rationale: use latest entry rather than latest update. update timestamp is updated for all entries upon success so they are equivalent. prevents dupes from fake null dates.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-211-1/+2
|\
| * make $links an array of linksmarijus2015-01-221-1/+2
| |
* | zot_finger second arg is optional but function declaration didn't specify ↵friendica2015-01-211-1/+1
|/ | | | this - causes issue with check_upstream_directory
* change mod/sharedwithme backend to use activity object - this is not ↵marijus2015-01-221-27/+76
| | | | backwards compatible
* Rework directory server update selection queryHabeas Codice2015-01-201-1/+1
|
* get rid of really old poco records once weeklyfriendica2015-01-202-0/+9
|
* poco rating variable getting over-written before local storage.friendica2015-01-191-1/+1
|
* Change link label from Feature settings to Feature/Addon settings to more ↵friendica2015-01-191-1/+1
| | | | accurately describe its purpose, since we currently use it exclusively for addons (though this will not always be true).
* put cloud back in get_cloudpath - just have to be careful where we use it.friendica2015-01-191-2/+4
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-181-5/+6
|\
| * fix postgres escapingHabeas Codice2015-01-181-5/+6
| |
* | typofriendica2015-01-181-2/+2
|/
* remove all hardwired references to 'cloud' in the files interfaces and ↵friendica2015-01-182-9/+13
| | | | replace with $a->module. It's OK to leave them in the RedBrowser component because this will remain under /cloud. All the DAV bits need to be abstracted as they will eventually end up under /dav. $a->module will contain the correct string to use.
* don't unset a directory server which has no active channels and hence will ↵friendica2015-01-181-9/+24
| | | | never have a site table update. Do this by probing the sys channel of that directory weekly and checking the directory status returned by it.
* basic proof of concept file activity support - will send activity via the ↵marijus2015-01-184-4/+114
| | | | filestorage module and via attach_delete()
* Merge pull request #856 from pafcu/masterpafcu2015-01-161-16/+13
|\ | | | | Fix some issues with tagging.
| * Fix some issues with tagging.Stefan Parviainen2015-01-161-16/+13
| |
* | validate poco chatrooms before storingfriendica2015-01-151-0/+3
| |
* | more heavy lifting on poco repfriendica2015-01-151-0/+1
| |
* | Merge branch 'pocorate'friendica2015-01-151-2/+5
|\ \
| * | more backend work on poco ratingfriendica2015-01-151-2/+5
| |/
* / backend for mailhost addonfriendica2015-01-151-0/+8
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-141-0/+4
|\
| * Merge pull request #850 from einervonvielen/tocRedMatrix2015-01-151-0/+4
| |\ | | | | | | Added a table of content as bbcode element [toc] for webpages
| | * Merge remote-tracking branch 'upstream/master' into tocEiner von Vielen2015-01-144-56/+48
| | |\
| | * | Added a table of content as bbcode element [toc] for webpages2015-01-141-1/+1
| | | | | | | | | | | | | | | | | | | | - Included jquery.toc.js (http://www.apache.org/licenses/LICENSE-2.0) - Modified jquery.toc.js to work with the webpages of the red#matrix - Added info to the help
| | * | TestEiner von Vielen2015-01-131-0/+4
| | | | | | | | | | | | | | | | ...with table of content. jquery.tableofconent.js works bunt not properly
* | | | correct some activity object types (for comments), also fix a foreach ↵friendica2015-01-141-2/+7
|/ / / | | | | | | | | | warning resulting from recent tag work
* | | ignore bbcode open tag (left bracket) in hash and mention tag regexes and ↵friendica2015-01-141-2/+2
| | | | | | | | | | | | turn it into a tag delimiter
* | | federate consensus items (in network only). Work in progress.friendica2015-01-141-0/+7
| |/ |/|
* | check mentions against the appropriate xchan_url and not a hard-coded ↵friendica2015-01-131-4/+4
| | | | | | | | /channel/ string
* | provide a setting to control ALLOWCODE permissions at the channel level - it ↵friendica2015-01-131-4/+4
| | | | | | | | isn't always appropriate to apply this to all channels in an account.
* | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretaggingfriendica2015-01-132-14/+2
|\ \ | | | | | | | | | | | | Conflicts: mod/profiles.php
| * | Allow tags in mail, many profile fields, and admin infoStefan Parviainen2015-01-132-14/+2
| |/
* | uninitialised theme parent in mod/cloudfriendica2015-01-121-1/+1
| |
* | theme toggle issue when viewing mod/cloud of another channelfriendica2015-01-121-0/+9
| |
* | don't wipe out the item body of a linked item to a photo when doing a normal ↵friendica2015-01-121-7/+18
| | | | | | | | delete and not forced
* | change deletion behaviour of linked photo items. Previously deleting the ↵friendica2015-01-121-28/+12
|/ | | | 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.