| Commit message (Expand) | Author | Age | Files | Lines |
... | |
* | | 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 |
| * | | basic changes for file activity | marijus | 2015-01-09 | 1 | -1/+1 |
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-08 | 2 | -23/+28 |
|\| | |
|
| * | | Merge pull request #833 from pafcu/oneautocompleter | pafcu | 2015-01-08 | 2 | -23/+28 |
| |\ \ |
|
| | * | | Fix saved searches on network page, fix caching mith multiple autocompleters | Stefan Parviainen | 2015-01-08 | 1 | -22/+26 |
| | * | | Honor requested count in navbar search | Stefan Parviainen | 2015-01-08 | 1 | -1/+2 |
* | | | | Merge branch 'master' into trinidad | friendica | 2015-01-07 | 4 | -42/+22 |
|\| | | |
|
| * | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-07 | 1 | -34/+14 |
| |\| | |
|
| | * | | Return results from acl.php in standard form | Stefan Parviainen | 2015-01-07 | 1 | -20/+0 |
| | * | | Make nav search use textcomplete | Stefan Parviainen | 2015-01-07 | 1 | -14/+14 |
| * | | | syncing connections issue, incorrect return_url after deleting connection | friendica | 2015-01-07 | 2 | -6/+6 |
| * | | | don't allow admin to delete the sys channel from the channel manage page | friendica | 2015-01-06 | 1 | -2/+2 |
| |/ / |
|
* | | | begin the grand unification for 3.0. Start by splitting DAV into a web access... | friendica | 2015-01-06 | 2 | -27/+156 |
* | | | undo these bits of trinidad - we're going to do things differently | friendica | 2015-01-05 | 1 | -1/+1 |
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-04 | 1 | -1/+1 |
|\| | |
|
| * | | the last checkin removed hostname from the address for autocomplete searches.... | friendica | 2015-01-04 | 1 | -1/+1 |