Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-20 | 5 | -26/+35 | |
|\ | ||||||
| * | css fixes - hopefully | marijus | 2015-01-20 | 4 | -15/+24 | |
| | | ||||||
| * | satisfy the floated images | marijus | 2015-01-20 | 3 | -3/+3 | |
| | | ||||||
| * | as a workaround make nav-search dropdown behave a little better | marijus | 2015-01-20 | 3 | -11/+11 | |
| | | ||||||
* | | get rid of really old poco records once weekly | friendica | 2015-01-20 | 3 | -1/+10 | |
| | | ||||||
* | | poco rating variable getting over-written before local storage. | friendica | 2015-01-19 | 1 | -1/+1 | |
|/ | ||||||
* | oauth permissions table | friendica | 2015-01-19 | 4 | -3/+59 | |
| | ||||||
* | Change link label from Feature settings to Feature/Addon settings to more ↵ | friendica | 2015-01-19 | 1 | -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_merge | friendica | 2015-01-19 | 1 | -2/+2 | |
|\ | ||||||
| * | Merge pull request #870 from pafcu/autocomplete_fix | RedMatrix | 2015-01-20 | 1 | -1/+1 | |
| |\ | | | | | | | Fix autocomplete with groups | |||||
| | * | Fix autocomplete with groups | Stefan Parviainen | 2015-01-19 | 1 | -1/+1 | |
| | | | ||||||
| * | | Merge pull request #868 from pafcu/autocomplete_fix | git-marijus | 2015-01-19 | 1 | -1/+1 | |
| |\| | | | | | | | Fix issue #865. | |||||
| | * | Fix issue #865. | Stefan Parviainen | 2015-01-19 | 1 | -1/+1 | |
| | | | ||||||
* | | | put cloud back in get_cloudpath - just have to be careful where we use it. | friendica | 2015-01-19 | 2 | -3/+5 | |
|/ / | ||||||
* | | make typo.php descend into include/RedDAV | friendica | 2015-01-18 | 1 | -0/+8 | |
| | | ||||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-18 | 4 | -8/+23 | |
|\ \ | ||||||
| * | | allow system-loaded (i.e. pecl-oauth) to coexist | Habeas Codice | 2015-01-18 | 1 | -1/+2 | |
| | | | ||||||
| * | | fix postgres escaping | Habeas Codice | 2015-01-18 | 1 | -5/+6 | |
| | | | ||||||
| * | | fix update 1131 for postgres databases | Habeas Codice | 2015-01-18 | 2 | -2/+15 | |
| | | | ||||||
* | | | typo | friendica | 2015-01-18 | 1 | -2/+2 | |
|/ / | ||||||
* | | remove all hardwired references to 'cloud' in the files interfaces and ↵ | friendica | 2015-01-18 | 2 | -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. | friendica | 2015-01-18 | 1 | -1/+2 | |
| | | ||||||
* | | Merge pull request #866 from redswede/dev_redswede | RedMatrix | 2015-01-19 | 14 | -18/+173 | |
|\ \ | | | | | | | Translations and updates to doc-files | |||||
| * \ | Merge branch 'master' of git://github.com/friendica/red into dev_redswede | RedSwede | 2015-01-19 | 83 | -115/+2054 | |
| |\ \ | ||||||
| * | | | translation of 2 helpfiles to swedish | RedSwede | 2015-01-19 | 2 | -0/+143 | |
| | | | | ||||||
| * | | | Looked through the whole doc/-folder more or less. Added and commented a few ↵ | RedSwede | 2015-01-17 | 12 | -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. | RedSwede | 2015-01-16 | 1 | -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 ↵ | friendica | 2015-01-18 | 1 | -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_pages | RedMatrix | 2015-01-19 | 6 | -79/+93 | |
|\ \ \ | | | | | | | | | Fixed bbode element toc for webpages | |||||
| * | | | Added table of contents for FAQs doc | Einer von Vielen | 2015-01-18 | 4 | -54/+61 | |
| | | | | | | | | | | | | | | | | | | | | - help/faq_admins - help/faq_members - help/faq_developers | |||||
| * | | | Fixed bbode element toc for webpages | Einer von Vielen | 2015-01-18 | 2 | -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/help | RedMatrix | 2015-01-19 | 65 | -12/+1699 | |
|\ \ \ \ | | | | | | | | | | | Add some database documentation + mod/help.php bugfix | |||||
| * | | | | Database schema documentation | Stefan Parviainen | 2015-01-18 | 64 | -0/+1686 | |
| | | | | | ||||||
| * | | | | Don't try to open unexisting files in help | Stefan Parviainen | 2015-01-18 | 1 | -12/+13 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #864 from git-marijus/master | RedMatrix | 2015-01-19 | 8 | -7/+246 | |
|\ \ \ \ | |_|/ / |/| | | | basic proof of concept file activity support - will send activity via th... | |||||
| * | | | fix link | marijus | 2015-01-18 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | fix goaway link | marijus | 2015-01-18 | 1 | -2/+2 | |
| | | | | ||||||
| * | | | fix profile tabs link | marijus | 2015-01-18 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | basic proof of concept file activity support - will send activity via the ↵ | marijus | 2015-01-18 | 8 | -7/+246 | |
|/ / / | | | | | | | | | | filestorage module and via attach_delete() | |||||
* | | | Merge pull request #859 from einervonvielen/Issue_846_view_calendar_event | pafcu | 2015-01-18 | 2 | -1/+2 | |
|\ \ \ | | | | | | | | | Fixed #846 Viewing event from calendar displays event | |||||
| * | | | Fixed #846 Viewing event from calendar displays event | Einer von Vielen | 2015-01-18 | 2 | -1/+2 | |
| | | | | | | | | | | | | See https://github.com/friendica/red/issues/846 | |||||
* | | | | Merge pull request #858 from pafcu/master | pafcu | 2015-01-17 | 1 | -0/+1 | |
|\ \ \ \ | |/ / / |/| / / | |/ / | Fix bug with groups and autocomplete | |||||
| * | | Remove accidental logging | Stefan Parviainen | 2015-01-17 | 1 | -1/+0 | |
| | | | ||||||
| * | | Fix bug with groups and autocomplete | Stefan Parviainen | 2015-01-17 | 1 | -0/+2 | |
| | | | ||||||
* | | | Merge pull request #856 from pafcu/master | pafcu | 2015-01-16 | 1 | -16/+13 | |
|\| | | |/ |/| | Fix some issues with tagging. | |||||
| * | Fix some issues with tagging. | Stefan Parviainen | 2015-01-16 | 1 | -16/+13 | |
| | | ||||||
* | | more doc updates | friendica | 2015-01-16 | 35 | -0/+2759 | |
| | | ||||||
* | | mod_prep usability enhancements, doc updates | friendica | 2015-01-16 | 134 | -3736/+4250 | |
| | | ||||||
* | | validate poco chatrooms before storing | friendica | 2015-01-15 | 1 | -0/+3 | |
| | | ||||||
* | | fix to poco chatrooms | friendica | 2015-01-15 | 1 | -4/+4 | |
| | |