aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/friendica/red into dev_redswedeRedSwede2015-01-1983-115/+2054
|\
| * 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...
| | * | 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 ↵marijus2015-01-188-7/+246
| |/ / | | | | | | | | | filestorage module and via attach_delete()
| * | Merge pull request #859 from einervonvielen/Issue_846_view_calendar_eventpafcu2015-01-182-1/+2
| |\ \ | | | | | | | | Fixed #846 Viewing event from calendar displays event
| | * | Fixed #846 Viewing event from calendar displays eventEiner von Vielen2015-01-182-1/+2
| | | | | | | | | | | | See https://github.com/friendica/red/issues/846
| * | | Merge pull request #858 from pafcu/masterpafcu2015-01-171-0/+1
| |\ \ \ | | |/ / | |/| / | | |/ Fix bug with groups and autocomplete
| | * Remove accidental loggingStefan Parviainen2015-01-171-1/+0
| | |
| | * Fix bug with groups and autocompleteStefan Parviainen2015-01-171-0/+2
| | |
| * | Merge pull request #856 from pafcu/masterpafcu2015-01-161-16/+13
| |\| | | | | | | Fix some issues with tagging.
| | * Fix some issues with tagging.Stefan Parviainen2015-01-161-16/+13
| | |
* | | 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.
* | more doc updatesfriendica2015-01-1635-0/+2759
| |
* | mod_prep usability enhancements, doc updatesfriendica2015-01-16134-3736/+4250
| |
* | validate poco chatrooms before storingfriendica2015-01-151-0/+3
| |
* | fix to poco chatroomsfriendica2015-01-151-4/+4
| |
* | errors in mod_pocofriendica2015-01-151-2/+2
| |
* | more heavy lifting on poco repfriendica2015-01-156-24/+51
| |
* | document the poco reputation kill switchfriendica2015-01-151-1/+2
| |
* | make sure mod/prep follows the poco_rating allow preferencefriendica2015-01-151-0/+9
| |
* | Merge branch 'pocorate'friendica2015-01-1511-6/+156
|\ \
| * | poco rating - add a test module for pulling out ratingsfriendica2015-01-154-5/+90
| | |
| * | editing stuff for poco reputationfriendica2015-01-154-3/+33
| | |
| * | more backend work on poco ratingfriendica2015-01-158-5/+40
| | |
* | | backend for mailhost addonfriendica2015-01-151-0/+8
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-151-14/+2
|\ \ \ | | |/ | |/|
| * | Merge pull request #854 from pafcu/fixcollapsepafcu2015-01-151-14/+2
| |\ \ | | | | | | | | Actually fix problem with post collapsing in webkit-based browsers
| | * | Actually fix problem with post collapsing in webkit-based browsersStefan Parviainen2015-01-151-14/+2
| | | |
| * | | Merge pull request #853 from friendica/revert-852-mastermrjive2015-01-150-0/+0
| |\ \ \ | | | | | | | | | | Revert "Merge pull request #1 from friendica/master"
| | * | | Revert "Merge pull request #1 from friendica/master"mrjive2015-01-150-0/+0
| |/ / /
| * | | Merge pull request #852 from mrjive/mastermrjive2015-01-150-0/+0
| |\ \ \ | | |_|/ | |/| | Merge pull request #1 from friendica/master
| | * | Merge pull request #1 from friendica/mastermrjive2015-01-062895-102490/+663457
| | |\ \ | | | | | | | | | | test pull request
* | | | | revupfriendica2015-01-151-1/+1
|/ / / /
* | | | provide correct permissions role default for old-timers that didn't have any ↵friendica2015-01-141-1/+4
| | | | | | | | | | | | | | | | role configured.
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-145-1/+105
|\ \ \ \
| * \ \ \ Merge pull request #850 from einervonvielen/tocRedMatrix2015-01-155-1/+105
| |\ \ \ \ | | | | | | | | | | | | Added a table of content as bbcode element [toc] for webpages
| | * \ \ \ Merge remote-tracking branch 'upstream/master' into tocEiner von Vielen2015-01-1422-116/+128
| | |\ \ \ \
| | * | | | | Added a table of content as bbcode element [toc] for webpages2015-01-146-195/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Included jquery.toc.js (http://www.apache.org/licenses/LICENSE-2.0) - Modified jquery.toc.js to work with the webpages of the red#matrix - Added info to the help
| | * | | | | TestEiner von Vielen2015-01-134-0/+198
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ...with table of content. jquery.tableofconent.js works bunt not properly
* | | | | | | correct some activity object types (for comments), also fix a foreach ↵friendica2015-01-142-16/+28
|/ / / / / / | | | | | | | | | | | | | | | | | | warning resulting from recent tag work