aboutsummaryrefslogtreecommitdiffstats
path: root/mod
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into tresfriendica2015-01-2989-595/+595
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: include/group.php include/text.php mod/acl.php mod/channel.php mod/connections.php mod/display.php mod/group.php mod/item.php mod/locs.php mod/network.php mod/photos.php mod/ping.php mod/starred.php mod/viewsrc.php
| * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-281-1/+1
| |\
| | * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-288-236/+83
| | |\
| | * | fix implicit booleanHabeas Codice2015-01-281-1/+1
| | | |
| * | | remote_user => remote_channelfriendica2015-01-2817-23/+23
| | | |
| * | | local_user => local_channelfriendica2015-01-2887-584/+584
| | |/ | |/|
| * | no need for new line here - spacing is done via cssmarijus2015-01-281-1/+1
| | |
* | | more message restrict conversionsfriendica2015-01-2910-26/+25
| | |
* | | Merge branch 'master' into tresfriendica2015-01-274-28/+54
|\| | | | | | | | | | | | | | Conflicts: include/socgraph.php
| * | allow RSS connections in the type 'a' autocomplete results as that is used ↵friendica2015-01-271-3/+7
| | | | | | | | | | | | for channel sources. Without it a feed cannot be selected as a channel source.
| * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-271-14/+24
| |\ \
| | * | move userReadableSize() and getIconFromType() from ↵marijus2015-01-271-14/+24
| | | | | | | | | | | | | | | | /include/RedDAV/RedBrowser.php to include/text.php and add template for mod/sharedwithme
| * | | allow doc/help system to use subdirsfriendica2015-01-271-6/+14
| |/ /
| * | superblock enhancementsfriendica2015-01-261-5/+9
| | |
* | | Merge branch 'master' into tres and add some work on the item_deleted flag ↵friendica2015-01-2611-273/+82
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | refactor Conflicts: include/attach.php include/onedirsync.php include/zot.php mod/locs.php
| * | provide a json feed of search resultsfriendica2015-01-261-0/+17
| | |
| * | abstract poco into a single function in socgraph so we can provide different ↵friendica2015-01-252-207/+11
| |/ | | | | | | wrappers for it providing slightly different functionality.
| * Hide all the scary decision making stuff that sends intellectually ↵friendica2015-01-251-0/+2
| | | | | | | | challenged beings into siezures and brain melt-downs and online freak-outs.
| * rework the new connection stuff so we don't need a "permissions have been ↵friendica2015-01-251-10/+3
| | | | | | | | changed but not saved" message.
| * misspellinganaqreon2015-01-251-1/+1
| |
| * standardize sqlHabeas Codice2015-01-241-1/+1
| |
| * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-233-30/+13
| |\
| | * some more kissmarijus2015-01-241-30/+9
| | |
| | * some code restructuremarijus2015-01-232-3/+4
| | |
| | * this will require more fixing in include/enotifymarijus2015-01-231-1/+1
| | |
| | * possible performance improvement for sharedwithme update querymarijus2015-01-221-4/+7
| | |
| * | rand() fixesHabeas Codice2015-01-232-3/+5
| |/
| * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-213-42/+49
| |\
| | * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-221-3/+9
| | |\
| | | * couple of hubloc manager issuesfriendica2015-01-211-1/+5
| | | |
| | | * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-212-39/+39
| | | |\
| | | * | hubloc manage issuefriendica2015-01-211-2/+4
| | | | |
| | * | | make $links an array of linksmarijus2015-01-221-1/+2
| | | |/ | | |/|
| | * | change mod/sharedwithme backend to use activity object - this is not ↵marijus2015-01-222-39/+39
| | |/ | | | | | | | | | backwards compatible
| * / directory server dba sql fixesHabeas Codice2015-01-211-3/+3
| |/
* | start on item_restrict conversionfriendica2015-01-223-17/+5
| |
* | more expanding item flagsfriendica2015-01-225-13/+7
| |
* | heavy lifting converting item flag bitsfriendica2015-01-2213-70/+39
| |
* | slow progress removing bitfields on item tablefriendica2015-01-218-46/+52
| |
* | working through the xchan table to remove bitfields, mostly complete except ↵friendica2015-01-2011-83/+49
| | | | | | | | for updating the updater
* | that should take care of the bitfields in hublocfriendica2015-01-202-15/+10
| |
* | first cut at unpacking bitfields in hubloc, fixed hubloc_error and ↵friendica2015-01-202-12/+7
|/ | | | hubloc_deleted
* Merge pull request #862 from pafcu/helpRedMatrix2015-01-191-12/+13
|\ | | | | Add some database documentation + mod/help.php bugfix
| * Don't try to open unexisting files in helpStefan Parviainen2015-01-181-12/+13
| |
* | fix linkmarijus2015-01-181-2/+2
| |
* | fix goaway linkmarijus2015-01-181-2/+2
| |
* | fix profile tabs linkmarijus2015-01-181-1/+1
| |
* | basic proof of concept file activity support - will send activity via the ↵marijus2015-01-182-0/+123
| | | | | | | | filestorage module and via attach_delete()
* | mod_prep usability enhancements, doc updatesfriendica2015-01-161-11/+18
| |
* | fix to poco chatroomsfriendica2015-01-151-4/+4
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-12 18:42:53 +0000