aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* 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 thi...friendica2015-01-211-1/+1
|/
* change mod/sharedwithme backend to use activity object - this is not backward...marijus2015-01-221-27/+76
* 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 acc...friendica2015-01-191-1/+1
* 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 replac...friendica2015-01-182-9/+13
* don't unset a directory server which has no active channels and hence will ne...friendica2015-01-181-9/+24
* basic proof of concept file activity support - will send activity via the fil...marijus2015-01-184-4/+114
* Merge pull request #856 from pafcu/masterpafcu2015-01-161-16/+13
|\
| * 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
| |\
| | * 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
| | * | TestEiner von Vielen2015-01-131-0/+4
* | | | correct some activity object types (for comments), also fix a foreach warning...friendica2015-01-141-2/+7
|/ / /
* | | ignore bbcode open tag (left bracket) in hash and mention tag regexes and tur...friendica2015-01-141-2/+2
* | | 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 /channe...friendica2015-01-131-4/+4
* | provide a setting to control ALLOWCODE permissions at the channel level - it ...friendica2015-01-131-4/+4
* | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretaggingfriendica2015-01-132-14/+2
|\ \
| * | 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
* | change deletion behaviour of linked photo items. Previously deleting the visi...friendica2015-01-121-28/+12
|/
* Refactor mention code to make it more reusableStefan Parviainen2015-01-122-0/+61
* optionally use openssl encryption functions (higher performance over mcrypt, ...friendica2015-01-111-2/+2
* allow the use of openssl cryptofriendica2015-01-111-0/+6
* basic backend work for creating consensus itemsfriendica2015-01-113-27/+60
* Merge remote-tracking branch 'upstream/master'Christian Vogeley2015-01-1121-154/+169
|\
| * connection clone issuesfriendica2015-01-101-0/+3
| * basic changes for file activitymarijus2015-01-092-1/+6
| * clean up some url anomalies in dir_sort_links after security fixfriendica2015-01-081-1/+3
| * double q argument could also cause issuesfriendica2015-01-081-1/+4
| * SECURITY: dir_sort_links() exposes session cookiefriendica2015-01-081-2/+2
| * include channel clones in PM deliveries (also some whitespace edits)friendica2015-01-083-16/+17
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-071-9/+1
| |\