aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* add some mimetypesmarijus2015-01-222-2/+26
|
* 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 ↵friendica2015-01-211-1/+1
| | |/ | |/| | | | | | | this - causes issue with check_upstream_directory
| * | 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 ↵Jeroen2015-01-221-1/+2
| | | | | | | | | | | | | | | | the performance problems
| | * | change mod/sharedwithme backend to use activity object - this is not ↵marijus2015-01-224-67/+116
| | | | | | | | | | | | | | | | backwards compatible
| * | | 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 some external libraries
| | | * 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
| | |\ | | | | | | | | Rework directory server update selection query
| * | | add my.federated.social as directory serverfriendica2015-01-201-0/+1
| |/ /
| * | More styling for poco reputation page. Note: the reason this isn't yet ↵friendica2015-01-201-0/+4
| | | | | | | | | | | | linked to the UI is because we need to age some old '1' values that are bogus.
* | | 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
| | | | it isn't a directory server any more.
* 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 ↵friendica2015-01-191-1/+1
| | | | accurately describe its purpose, since we currently use it exclusively for addons (though this will not always be true).
* 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 groups
| | * 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.
| | * 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
| |
* | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-184-8/+23
|\ \
| * | allow system-loaded (i.e. pecl-oauth) to coexistHabeas Codice2015-01-181-1/+2
| | |
| * | fix postgres escapingHabeas Codice2015-01-181-5/+6
| | |
| * | fix update 1131 for postgres databasesHabeas Codice2015-01-182-2/+15
| | |
* | | typofriendica2015-01-181-2/+2
|/ /
* | remove all hardwired references to 'cloud' in the files interfaces and ↵friendica2015-01-182-9/+13
| | | | | | | | replace with $a->module. It's OK to leave them in the RedBrowser component because this will remain under /cloud. All the DAV bits need to be abstracted as they will eventually end up under /dav. $a->module will contain the correct string to use.
* | remove unrecognised code comment from markdown text.friendica2015-01-181-1/+2
| |
* | Merge pull request #866 from redswede/dev_redswedeRedMatrix2015-01-1914-18/+173
|\ \ | | | | | | Translations and updates to doc-files
| * \ Merge branch 'master' of git://github.com/friendica/red into dev_redswedeRedSwede2015-01-1983-115/+2054
| |\ \
| * | | translation of 2 helpfiles to swedishRedSwede2015-01-192-0/+143
| | | |