aboutsummaryrefslogtreecommitdiffstats
path: root/mod
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-132-4/+4
| | | | 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 'moretagging' of git://github.com/pafcu/red into pafcu-moretaggingfriendica2015-01-137-3/+30
|\ | | | | | | | | 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-136-3/+25
| |
* | hide friends broken, add parameter for item search by verbfriendica2015-01-136-2/+7
| |
* | theme toggle issue when viewing mod/cloud of another channelfriendica2015-01-122-18/+0
| |
* | document the pros and cons of the not-yet written hassle-free connection ↵friendica2015-01-121-0/+9
| | | | | | | | auto-permission setting.
* | change deletion behaviour of linked photo items. Previously deleting the ↵friendica2015-01-121-1/+1
| | | | | | | | 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-122-115/+34
|\|
| * Refactor mention code to make it more reusableStefan Parviainen2015-01-122-115/+34
| |
* | double perms msgfriendica2015-01-121-1/+1
|/
* another attempt to explain default permissions on connedit pagefriendica2015-01-111-4/+4
|
* 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
|
* basic backend work for creating consensus itemsfriendica2015-01-111-0/+20
|
* Merge branch 'master' into trinidadfriendica2015-01-111-1/+1
|\
| * Merge remote-tracking branch 'upstream/master'Christian Vogeley2015-01-1118-205/+253
| |\ | | | | | | | | | | | | | | | 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-111-1/+1
| | | | | | | | | | | | subscription plan
* | | Merge branch 'master' into trinidadfriendica2015-01-101-2/+2
|\ \ \ | | |/ | |/|
| * | connection clone issuesfriendica2015-01-101-2/+2
| | |
* | | Merge branch 'master' into trinidadfriendica2015-01-102-1/+2
|\| |
| * | Fix unescaped image dataHabeas Codice2015-01-101-0/+1
| | |
| * | basic changes for file activitymarijus2015-01-091-1/+1
| | |
* | | Merge branch 'master' into trinidadfriendica2015-01-082-23/+28
|\| |
| * | Merge pull request #833 from pafcu/oneautocompleterpafcu2015-01-082-23/+28
| |\ \ | | | | | | | | Fixes for the new autocompletion
| | * | Fix saved searches on network page, fix caching mith multiple autocompletersStefan Parviainen2015-01-081-22/+26
| | | |
| | * | Honor requested count in navbar searchStefan Parviainen2015-01-081-1/+2
| | | |
* | | | Merge branch 'master' into trinidadfriendica2015-01-074-42/+22
|\| | |
| * | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-071-34/+14
| |\| |
| | * | Return results from acl.php in standard formStefan Parviainen2015-01-071-20/+0
| | | |
| | * | Make nav search use textcompleteStefan Parviainen2015-01-071-14/+14
| | | |
| * | | syncing connections issue, incorrect return_url after deleting connectionfriendica2015-01-072-6/+6
| | | |
| * | | don't allow admin to delete the sys channel from the channel manage pagefriendica2015-01-061-2/+2
| |/ /
* | | begin the grand unification for 3.0. Start by splitting DAV into a web ↵friendica2015-01-062-27/+156
| | | | | | | | | | | | accessible component and a DAV accessible component so that we can eliminate the http-auth prompts for web-accessed resources.
* | | undo these bits of trinidad - we're going to do things differentlyfriendica2015-01-051-1/+1
| | |
* | | Merge branch 'master' into trinidadfriendica2015-01-041-1/+1
|\| |
| * | the last checkin removed hostname from the address for autocomplete ↵friendica2015-01-041-1/+1
| | | | | | | | | | | | searches. This one allows it if explicitly added with a '@'. So 'mike' will find all mikes. 'mike@z' will find mike@zothub but not mike@popcorn.
* | | Merge branch 'master' into trinidadfriendica2015-01-041-1/+1
|\| |
| * | only check the LHS of xchan_addr for autocomplete, don't match on the hostname.friendica2015-01-041-1/+1
| | |
* | | Merge branch 'master' into trinidadfriendica2015-01-042-76/+73
|\| |
| * | Merge pull request #816 from pafcu/aclRedMatrix2015-01-051-75/+72
| |\ \ | | | | | | | | Autocomplete improvements
| | * | TypoStefan Parviainen2015-01-041-3/+3
| | | |
| | * | Sorting of autocompleteStefan Parviainen2015-01-044-21/+56
| | |\ \
| | * | | Autocmplete suggestions for non-local users, also suggest from visited ↵Stefan Parviainen2015-01-041-75/+52
| | | | | | | | | | | | | | | | | | | | channel's connections
| * | | | Fix wrong requireStefan Parviainen2015-01-041-1/+1
| | |/ / | |/| |
* | | | Merge branch 'master' into trinidadfriendica2015-01-041-1/+3
|\| | |
| * | | provide some info for buttonsmarijus2015-01-031-1/+3
| | | |
* | | | Merge branch 'master' into trinidadfriendica2015-01-021-9/+11
|\| | |