Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
* | | errors in mod_poco | friendica | 2015-01-15 | 1 | -2/+2 |
| | | |||||
* | | more heavy lifting on poco rep | friendica | 2015-01-15 | 6 | -24/+51 |
| | | |||||
* | | document the poco reputation kill switch | friendica | 2015-01-15 | 1 | -1/+2 |
| | | |||||
* | | make sure mod/prep follows the poco_rating allow preference | friendica | 2015-01-15 | 1 | -0/+9 |
| | | |||||
* | | Merge branch 'pocorate' | friendica | 2015-01-15 | 11 | -6/+156 |
|\ \ | |||||
| * | | poco rating - add a test module for pulling out ratings | friendica | 2015-01-15 | 4 | -5/+90 |
| | | | |||||
| * | | editing stuff for poco reputation | friendica | 2015-01-15 | 4 | -3/+33 |
| | | | |||||
| * | | more backend work on poco rating | friendica | 2015-01-15 | 8 | -5/+40 |
| | | | |||||
* | | | backend for mailhost addon | friendica | 2015-01-15 | 1 | -0/+8 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-15 | 1 | -14/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge pull request #854 from pafcu/fixcollapse | pafcu | 2015-01-15 | 1 | -14/+2 |
| |\ \ | | | | | | | | | Actually fix problem with post collapsing in webkit-based browsers | ||||
| | * | | Actually fix problem with post collapsing in webkit-based browsers | Stefan Parviainen | 2015-01-15 | 1 | -14/+2 |
| | | | | |||||
| * | | | Merge pull request #853 from friendica/revert-852-master | mrjive | 2015-01-15 | 0 | -0/+0 |
| |\ \ \ | | | | | | | | | | | Revert "Merge pull request #1 from friendica/master" | ||||
| | * | | | Revert "Merge pull request #1 from friendica/master" | mrjive | 2015-01-15 | 0 | -0/+0 |
| |/ / / | |||||
| * | | | Merge pull request #852 from mrjive/master | mrjive | 2015-01-15 | 0 | -0/+0 |
| |\ \ \ | | |_|/ | |/| | | Merge pull request #1 from friendica/master | ||||
| | * | | Merge pull request #1 from friendica/master | mrjive | 2015-01-06 | 2895 | -102490/+663457 |
| | |\ \ | | | | | | | | | | | test pull request | ||||
* | | | | | revup | friendica | 2015-01-15 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | provide correct permissions role default for old-timers that didn't have any ↵ | friendica | 2015-01-14 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | role configured. | ||||
* | | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-14 | 5 | -1/+105 |
|\ \ \ \ | |||||
| * \ \ \ | Merge pull request #850 from einervonvielen/toc | RedMatrix | 2015-01-15 | 5 | -1/+105 |
| |\ \ \ \ | | | | | | | | | | | | | Added a table of content as bbcode element [toc] for webpages | ||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' into toc | Einer von Vielen | 2015-01-14 | 22 | -116/+128 |
| | |\ \ \ \ | |||||
| | * | | | | | Added a table of content as bbcode element [toc] for webpages | 2015-01-14 | 6 | -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 | ||||
| | * | | | | | Test | Einer von Vielen | 2015-01-13 | 4 | -0/+198 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ...with table of content. jquery.tableofconent.js works bunt not properly | ||||
* | | | | | | | correct some activity object types (for comments), also fix a foreach ↵ | friendica | 2015-01-14 | 2 | -16/+28 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | warning resulting from recent tag work | ||||
* | | | | | | ignore bbcode open tag (left bracket) in hash and mention tag regexes and ↵ | friendica | 2015-01-14 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | turn it into a tag delimiter | ||||
* | | | | | | some back-end code to support location activity objects. Work in progress. | friendica | 2015-01-14 | 2 | -0/+2 |
| | | | | | | |||||
* | | | | | | federate consensus items (in network only). Work in progress. | friendica | 2015-01-14 | 2 | -1/+8 |
| | | | | | | |||||
* | | | | | | honor disable_discover_tab in mod/home - it isn't a tab here but basically ↵ | friendica | 2015-01-14 | 2 | -1/+6 |
| |/ / / / |/| | | | | | | | | | | | | | | block public content from showing if it's set. | ||||
* | | | | | check mentions against the appropriate xchan_url and not a hard-coded ↵ | friendica | 2015-01-13 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | | | /channel/ string | ||||
* | | | | | now that's useful... | friendica | 2015-01-13 | 1 | -2/+8 |
| | | | | | |||||
* | | | | | provide a setting to control ALLOWCODE permissions at the channel level - it ↵ | friendica | 2015-01-13 | 4 | -9/+9 |
| | | | | | | | | | | | | | | | | | | | | isn't always appropriate to apply this to all channels in an account. | ||||
* | | | | | revert recent 3.0 changes to mod/cloud so we can work on this completely in ↵ | friendica | 2015-01-13 | 1 | -30/+19 |
| | | | | | | | | | | | | | | | | | | | | another branch and not destabilise core | ||||
* | | | | | Merge branch 'pafcu-moretagging' | friendica | 2015-01-13 | 9 | -17/+32 |
|\ \ \ \ \ | |||||
| * | | | | | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging | friendica | 2015-01-13 | 9 | -17/+32 |
|/| | | | | | | |_|_|/ | |/| | | | | | | | | | | | | | Conflicts: mod/profiles.php | ||||
| * | | | | Allow tags in event description and location | Stefan Parviainen | 2015-01-13 | 1 | -0/+4 |
| | | | | | |||||
| * | | | | Allow tags in mail, many profile fields, and admin info | Stefan Parviainen | 2015-01-13 | 8 | -17/+27 |
| | | | | | |||||
* | | | | | hide friends broken, add parameter for item search by verb | friendica | 2015-01-13 | 7 | -2/+9 |
| | | | | | |||||
* | | | | | uninitialised theme parent in mod/cloud | friendica | 2015-01-12 | 1 | -1/+1 |
| | | | | |