aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-222-2/+26
| |\
| | * add some mimetypesmarijus2015-01-222-2/+26
| * | fix dir server query take 2Habeas Codice2015-01-221-1/+1
| |/
| * Merge branch 'master' of https://github.com/friendica/redHabeas Codice2015-01-2117-89/+184
| |\
| | * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-212-2/+4
| | |\
| | | * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-222-6/+12
| | | |\
| | | * | make $links an array of linksmarijus2015-01-222-2/+4
| | * | | zot_finger second arg is optional but function declaration didn't specify thi...friendica2015-01-211-1/+1
| | | |/ | | |/|
| | * | couple of hubloc manager issuesfriendica2015-01-212-4/+8
| | * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-214-68/+118
| | |\|
| | | * Merge branch 'master' of https://github.com/friendica/redmarijus2015-01-228-8/+37
| | | |\
| | | | * added redmatrix.nl back as a directory server. this was not the issue with th...Jeroen2015-01-221-1/+2
| | | * | change mod/sharedwithme backend to use activity object - this is not backward...marijus2015-01-224-67/+116
| | * | | hubloc manage issuefriendica2015-01-211-2/+4
| | | |/ | | |/|
| | * | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-217-13/+42
| | |\ \
| | | * \ Merge pull request #873 from pafcu/masterRedMatrix2015-01-225-6/+31
| | | |\ \ | | | | |/ | | | |/|
| | | | * Update to latest version of jRange (fixes issue #867)Stefan Parviainen2015-01-214-4/+14
| | | | * Update to latest version of jquery-textcomplete.Stefan Parviainen2015-01-211-2/+17
| | | |/
| | | * bring back nav-search spinnermarijus2015-01-212-7/+11
| | * | update V3 roadmapfriendica2015-01-212-1/+4
| | |/
| | * Merge https://github.com/friendica/red into pending_mergefriendica2015-01-201-1/+1
| | |\
| | | * Merge pull request #872 from habeascodice/masterRedMatrix2015-01-211-1/+1
| | | |\
| | * | | add my.federated.social as directory serverfriendica2015-01-201-0/+1
| | |/ /
| | * | More styling for poco reputation page. Note: the reason this isn't yet linked...friendica2015-01-201-0/+4
| * | | directory server dba sql fixesHabeas Codice2015-01-211-3/+3
| | |/ | |/|
| * | Rework directory server update selection queryHabeas Codice2015-01-201-1/+1
| |/
| * typo in postgres db update, remove redmatrix.nl from directory servers since ...friendica2015-01-202-2/+1
* | onedirsync mergefriendica2015-01-261-3/+2
* | start on item_restrict conversionfriendica2015-01-229-54/+53
* | more expanding item flagsfriendica2015-01-2212-73/+37
* | heavy lifting converting item flag bitsfriendica2015-01-2228-192/+129
* | slow progress removing bitfields on item tablefriendica2015-01-2120-179/+156
* | working through the xchan table to remove bitfields, mostly complete except f...friendica2015-01-2020-203/+107
* | that should take care of the bitfields in hublocfriendica2015-01-2011-100/+51
* | first cut at unpacking bitfields in hubloc, fixed hubloc_error and hubloc_del...friendica2015-01-207-58/+33
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-205-26/+35
|\
| * css fixes - hopefullymarijus2015-01-204-15/+24
| * satisfy the floated imagesmarijus2015-01-203-3/+3
| * as a workaround make nav-search dropdown behave a little bettermarijus2015-01-203-11/+11
* | get rid of really old poco records once weeklyfriendica2015-01-203-1/+10
* | poco rating variable getting over-written before local storage.friendica2015-01-191-1/+1
|/
* oauth permissions tablefriendica2015-01-194-3/+59
* Change link label from Feature settings to Feature/Addon settings to more acc...friendica2015-01-191-1/+1
* Merge https://github.com/friendica/red into pending_mergefriendica2015-01-191-2/+2
|\
| * Merge pull request #870 from pafcu/autocomplete_fixRedMatrix2015-01-201-1/+1
| |\
| | * Fix autocomplete with groupsStefan Parviainen2015-01-191-1/+1
| * | Merge pull request #868 from pafcu/autocomplete_fixgit-marijus2015-01-191-1/+1
| |\|
| | * Fix issue #865.Stefan Parviainen2015-01-191-1/+1
* | | put cloud back in get_cloudpath - just have to be careful where we use it.friendica2015-01-192-3/+5
|/ /
* | make typo.php descend into include/RedDAVfriendica2015-01-181-0/+8