aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* bring back nav-search spinnermarijus2015-01-212-7/+11
* 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 queryHabeas Codice2015-01-201-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
|/
* typo in postgres db update, remove redmatrix.nl from directory servers since ...friendica2015-01-202-2/+1
* 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
* | 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 replac...friendica2015-01-182-9/+13
* | remove unrecognised code comment from markdown text.friendica2015-01-181-1/+2
* | Merge pull request #866 from redswede/dev_redswedeRedMatrix2015-01-1914-18/+173
|\ \
| * \ 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
| * | | Looked through the whole doc/-folder more or less. Added and commented a few ...RedSwede2015-01-1712-15/+27
| * | | edited the text to better reflect how the system works from a user perspective.RedSwede2015-01-161-3/+3
* | | | don't unset a directory server which has no active channels and hence will ne...friendica2015-01-181-9/+24
| |/ / |/| |
* | | Merge pull request #863 from einervonvielen/Fix_bbcode_toc_for_help_pagesRedMatrix2015-01-196-79/+93
|\ \ \
| * | | Added table of contents for FAQs doc Einer von Vielen2015-01-184-54/+61
| * | | Fixed bbode element toc for webpagesEiner von Vielen2015-01-182-25/+32
* | | | Merge pull request #862 from pafcu/helpRedMatrix2015-01-1965-12/+1699
|\ \ \ \
| * | | | Database schema documentationStefan Parviainen2015-01-1864-0/+1686
| * | | | Don't try to open unexisting files in helpStefan Parviainen2015-01-181-12/+13
| | |_|/ | |/| |
* | | | Merge pull request #864 from git-marijus/masterRedMatrix2015-01-198-7/+246
|\ \ \ \ | |_|/ / |/| | |
| * | | 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 fil...marijus2015-01-188-7/+246
|/ / /
* | | Merge pull request #859 from einervonvielen/Issue_846_view_calendar_eventpafcu2015-01-182-1/+2
|\ \ \
| * | | Fixed #846 Viewing event from calendar displays eventEiner von Vielen2015-01-182-1/+2
* | | | Merge pull request #858 from pafcu/masterpafcu2015-01-171-0/+1
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Remove accidental loggingStefan Parviainen2015-01-171-1/+0