aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | isn't always appropriate to apply this to all channels in an account.
* revert recent 3.0 changes to mod/cloud so we can work on this completely in ↵friendica2015-01-131-30/+19
| | | | another branch and not destabilise core
* 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
|/| | | | | | | | | Conflicts: mod/profiles.php
| * 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 ↵friendica2015-01-121-0/+9
| | | | | | | | auto-permission setting.
* | 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-122-29/+13
| | | | | | | | 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.
* | 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 reusable
| | * 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 collapse
| | * 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
| | | | but potentially more likely to have been compromised)
* 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
| | |\ | | | | | | | | Fix for #Issue763
| | | * 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
| | | | | | | | | | | | | | | | This reverts commit 5beec923b462cbb6a4653b5387998787ed8f45b7.
| | | * Revert "put back in"Christian Vogeley2015-01-111-4/+0
| | | | | | | | | | | | | | | | This reverts commit ab07857d9c8762fb00998761866262e012bab791.
| | | * 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
| | | |\ | | | |/ | | |/| | | | | | | | | | | | | Conflicts: doc/html/classRedmatrix_1_1Import_1_1Import-members.html doc/html/classRedmatrix_1_1Import_1_1Import.js
| | | * Fix for issue #763 Error creating new channel within the limits of theChristian Vogeley2015-01-113-2/+28
| | | | | | | | | | | | | | | | subscription plan
| | | * 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
| | |\ \ | | | | | | | | | | Fixed / Changed step-by-step manual for beginning developers
| | | * | Changed step-by-step manual for beginning developers.Einer von Vielen2015-01-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | - Fixed: Deleted wrong "orign" in push - Changed: Spellings - Added: Eclipses GIT plugin "Eclipse Mylyn to GitHub connector"
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 12:18:55 +0000