aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* check mentions against the appropriate xchan_url and not a hard-coded /channe...friendica2015-01-131-4/+4
* now that's useful...friendica2015-01-131-2/+8
* provide a setting to control ALLOWCODE permissions at the channel level - it ...friendica2015-01-134-9/+9
* revert recent 3.0 changes to mod/cloud so we can work on this completely in a...friendica2015-01-131-30/+19
* Merge branch 'pafcu-moretagging'friendica2015-01-139-17/+32
|\
| * Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretaggingfriendica2015-01-139-17/+32
|/|
| * Allow tags in event description and locationStefan Parviainen2015-01-131-0/+4
| * Allow tags in mail, many profile fields, and admin infoStefan Parviainen2015-01-138-17/+27
* | hide friends broken, add parameter for item search by verbfriendica2015-01-137-2/+9
* | uninitialised theme parent in mod/cloudfriendica2015-01-121-1/+1
* | theme toggle issue when viewing mod/cloud of another channelfriendica2015-01-123-18/+9
* | document the pros and cons of the not-yet written hassle-free connection auto...friendica2015-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-122-29/+13
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-126-116/+98
|\ \
| * | Merge pull request #844 from pafcu/moretaggingpafcu2015-01-125-116/+96
| |\|
| | * Refactor mention code to make it more reusableStefan Parviainen2015-01-125-116/+96
| * | Merge pull request #842 from pafcu/masterpafcu2015-01-121-0/+2
| |\|
| | * Possibly fix issue with readmore.js collapseStefan Parviainen2015-01-121-0/+2
| |/
* / double perms msgfriendica2015-01-122-2/+2
|/
* another attempt to explain default permissions on connedit pagefriendica2015-01-114-18/+46
* remove extraneous debug file left over from postgres work.friendica2015-01-111-1/+0
* that was not intended to be merged with master yet. Put it under a definefriendica2015-01-111-2/+36
* 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-115-27/+84
* Merge branch 'master' into trinidadfriendica2015-01-1112-153/+33
|\
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-1111-152/+32
| |\
| | * Merge pull request #840 from cvogeley/masterRedMatrix2015-01-1211-152/+32
| | |\
| | | * CorrectionChristian Vogeley2015-01-111-1/+1
| | | * CorrectionChristian Vogeley2015-01-111-1/+1
| | | * CorrectionChristian Vogeley2015-01-113-4/+3
| | | * corrcetionChristian Vogeley2015-01-111-1/+1
| | | * CorrectChristian Vogeley2015-01-111-19/+18
| | | * Revert "put back in"Christian Vogeley2015-01-111-18/+0
| | | * Revert "put back in"Christian Vogeley2015-01-111-4/+0
| | | * put back inChristian Vogeley2015-01-111-0/+4
| | | * put back inChristian Vogeley2015-01-111-0/+18
| | | * .Christian Vogeley2015-01-111-0/+131
| | | * .Christian Vogeley2015-01-111-1/+1
| | | * fix accidentally removed fileChristian Vogeley2015-01-111-0/+446
| | | * Merge remote-tracking branch 'upstream/master'Christian Vogeley2015-01-111714-40293/+538358
| | | |\ | | | |/ | | |/|
| | | * Fix for issue #763 Error creating new channel within the limits of theChristian Vogeley2015-01-113-2/+28
| | | * mergeChristian Vogeley2014-12-277-757/+18
| * | | revupfriendica2015-01-111-1/+1
| |/ /
* | | Merge branch 'master' into trinidadfriendica2015-01-102-2/+5
|\| |
| * | connection clone issuesfriendica2015-01-102-2/+5
* | | Merge branch 'master' into trinidadfriendica2015-01-1058-6617/+7131
|\| |
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-1011-5411/+5452
| |\ \
| | * \ Merge pull request #839 from einervonvielen/dev_beginning_fix1RedMatrix2015-01-111-17/+25
| | |\ \
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-25 19:44:04 +0000