| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' of https://github.com/friendica/red | Habeas Codice | 2015-01-21 | 3 | -42/+49 |
|\ |
|
| * | Merge branch 'master' of https://github.com/friendica/red | marijus | 2015-01-22 | 1 | -3/+9 |
| |\ |
|
| | * | couple of hubloc manager issues | friendica | 2015-01-21 | 1 | -1/+5 |
| | * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-21 | 2 | -39/+39 |
| | |\ |
|
| | * | | hubloc manage issue | friendica | 2015-01-21 | 1 | -2/+4 |
| * | | | make $links an array of links | marijus | 2015-01-22 | 1 | -1/+2 |
| | |/
| |/| |
|
| * | | change mod/sharedwithme backend to use activity object - this is not backward... | marijus | 2015-01-22 | 2 | -39/+39 |
| |/ |
|
* / | directory server dba sql fixes | Habeas Codice | 2015-01-21 | 1 | -3/+3 |
|/ |
|
* | Merge pull request #862 from pafcu/help | RedMatrix | 2015-01-19 | 1 | -12/+13 |
|\ |
|
| * | Don't try to open unexisting files in help | Stefan Parviainen | 2015-01-18 | 1 | -12/+13 |
* | | 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 fil... | marijus | 2015-01-18 | 2 | -0/+123 |
* | | mod_prep usability enhancements, doc updates | friendica | 2015-01-16 | 1 | -11/+18 |
* | | 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 | 1 | -7/+28 |
* | | make sure mod/prep follows the poco_rating allow preference | friendica | 2015-01-15 | 1 | -0/+9 |
* | | poco rating - add a test module for pulling out ratings | friendica | 2015-01-15 | 2 | -4/+52 |
* | | editing stuff for poco reputation | friendica | 2015-01-15 | 1 | -2/+15 |
* | | more backend work on poco rating | friendica | 2015-01-15 | 2 | -1/+10 |
|/ |
|
* | provide correct permissions role default for old-timers that didn't have any ... | friendica | 2015-01-14 | 1 | -1/+4 |
* | correct some activity object types (for comments), also fix a foreach warning... | friendica | 2015-01-14 | 1 | -14/+21 |
* | some back-end code to support location activity objects. Work in progress. | friendica | 2015-01-14 | 1 | -0/+1 |
* | honor disable_discover_tab in mod/home - it isn't a tab here but basically bl... | friendica | 2015-01-14 | 1 | -0/+5 |
* | 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 | 2 | -4/+4 |
* | revert recent 3.0 changes to mod/cloud so we can work on this completely in a... | friendica | 2015-01-13 | 1 | -30/+19 |
* | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretagging | friendica | 2015-01-13 | 7 | -3/+30 |
|\ |
|
| * | 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 | 6 | -3/+25 |
* | | hide friends broken, add parameter for item search by verb | friendica | 2015-01-13 | 6 | -2/+7 |
* | | theme toggle issue when viewing mod/cloud of another channel | friendica | 2015-01-12 | 2 | -18/+0 |
* | | document the pros and cons of the not-yet written hassle-free connection auto... | friendica | 2015-01-12 | 1 | -0/+9 |
* | | change deletion behaviour of linked photo items. Previously deleting the visi... | friendica | 2015-01-12 | 1 | -1/+1 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-12 | 2 | -115/+34 |
|\| |
|
| * | Refactor mention code to make it more reusable | Stefan Parviainen | 2015-01-12 | 2 | -115/+34 |
* | | double perms msg | friendica | 2015-01-12 | 1 | -1/+1 |
|/ |
|
* | another attempt to explain default permissions on connedit page | friendica | 2015-01-11 | 1 | -4/+4 |
* | remove extraneous debug file left over from postgres work. | friendica | 2015-01-11 | 1 | -1/+0 |
* | that was not intended to be merged with master yet. Put it under a define | friendica | 2015-01-11 | 1 | -2/+36 |
* | basic backend work for creating consensus items | friendica | 2015-01-11 | 1 | -0/+20 |
* | Merge branch 'master' into trinidad | friendica | 2015-01-11 | 1 | -1/+1 |
|\ |
|
| * | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2015-01-11 | 18 | -205/+253 |
| |\ |
|
| * | | Fix for issue #763 Error creating new channel within the limits of the | Christian Vogeley | 2015-01-11 | 1 | -1/+1 |
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-10 | 1 | -2/+2 |
|\ \ \
| | |/
| |/| |
|
| * | | connection clone issues | friendica | 2015-01-10 | 1 | -2/+2 |
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-10 | 2 | -1/+2 |
|\| | |
|
| * | | Fix unescaped image data | Habeas Codice | 2015-01-10 | 1 | -0/+1 |