aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * 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
| | |/
| * | update V3 roadmapfriendica2015-01-212-1/+4
| | |
* | | change mod/sharedwithme backend to use activity object - this is not ↵marijus2015-01-224-67/+116
| |/ |/| | | | | backwards compatible
* | 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 query
| | * 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 ↵friendica2015-01-201-0/+4
|/ | | | linked to the UI is because we need to age some old '1' values that are bogus.
* 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
| | | |
| * | | Looked through the whole doc/-folder more or less. Added and commented a few ↵RedSwede2015-01-1712-15/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | things here and there. One question: * Is the crypto-js E2EE or not? If the devs agree that it is NOT then I propose removing this from the help files and gui.
| * | | edited the text to better reflect how the system works from a user perspective.RedSwede2015-01-161-3/+3
| | | | | | | | | | | | | | | | "If you restrict who can see these items, there is no way of making any single item public ever again - without allowing access to every public item you ever created. " <- this I did not understand.
* | | | don't unset a directory server which has no active channels and hence will ↵friendica2015-01-181-9/+24
| |/ / |/| | | | | | | | never have a site table update. Do this by probing the sys channel of that directory weekly and checking the directory status returned by it.
* | | Merge pull request #863 from einervonvielen/Fix_bbcode_toc_for_help_pagesRedMatrix2015-01-196-79/+93
|\ \ \ | | | | | | | | Fixed bbode element toc for webpages
| * | | Added table of contents for FAQs doc Einer von Vielen2015-01-184-54/+61
| | | | | | | | | | | | | | | | | | | | - help/faq_admins - help/faq_members - help/faq_developers
| * | | Fixed bbode element toc for webpagesEiner von Vielen2015-01-182-25/+32
| | | | | | | | | | | | | | | | | | | | | | | | - At the moment webpages can contain empty headings if the textarea "Title" is left empty in the webpage creator (https://hostname/webpages/username)
* | | | Merge pull request #862 from pafcu/helpRedMatrix2015-01-1965-12/+1699
|\ \ \ \ | | | | | | | | | | Add some database documentation + mod/help.php bugfix
| * | | | 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
|\ \ \ \ | |_|/ / |/| | | basic proof of concept file activity support - will send activity via th...