| Commit message (Expand) | Author | Age | Files | Lines |
* | ignore bbcode open tag (left bracket) in hash and mention tag regexes and tur... | friendica | 2015-01-14 | 1 | -2/+2 |
* | 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 bl... | friendica | 2015-01-14 | 2 | -1/+6 |
* | check mentions against the appropriate xchan_url and not a hard-coded /channe... | friendica | 2015-01-13 | 1 | -4/+4 |
* | 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 |
* | 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 '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 |
|/| |
|
| * | 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 |
* | | theme toggle issue when viewing mod/cloud of another channel | friendica | 2015-01-12 | 3 | -18/+9 |
* | | document the pros and cons of the not-yet written hassle-free connection auto... | friendica | 2015-01-12 | 1 | -0/+9 |
* | | don't wipe out the item body of a linked item to a photo when doing a normal ... | friendica | 2015-01-12 | 1 | -7/+18 |
* | | change deletion behaviour of linked photo items. Previously deleting the visi... | friendica | 2015-01-12 | 2 | -29/+13 |
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-12 | 6 | -116/+98 |
|\ \ |
|
| * | | Merge pull request #844 from pafcu/moretagging | pafcu | 2015-01-12 | 5 | -116/+96 |
| |\| |
|
| | * | Refactor mention code to make it more reusable | Stefan Parviainen | 2015-01-12 | 5 | -116/+96 |
| * | | Merge pull request #842 from pafcu/master | pafcu | 2015-01-12 | 1 | -0/+2 |
| |\| |
|
| | * | Possibly fix issue with readmore.js collapse | Stefan Parviainen | 2015-01-12 | 1 | -0/+2 |
| |/ |
|
* / | double perms msg | friendica | 2015-01-12 | 2 | -2/+2 |
|/ |
|
* | another attempt to explain default permissions on connedit page | friendica | 2015-01-11 | 4 | -18/+46 |
* | 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 |
* | optionally use openssl encryption functions (higher performance over mcrypt, ... | friendica | 2015-01-11 | 1 | -2/+2 |
* | allow the use of openssl crypto | friendica | 2015-01-11 | 1 | -0/+6 |
* | basic backend work for creating consensus items | friendica | 2015-01-11 | 5 | -27/+84 |
* | Merge branch 'master' into trinidad | friendica | 2015-01-11 | 12 | -153/+33 |
|\ |
|
| * | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-01-11 | 11 | -152/+32 |
| |\ |
|
| | * | Merge pull request #840 from cvogeley/master | RedMatrix | 2015-01-12 | 11 | -152/+32 |
| | |\ |
|
| | | * | Correction | Christian Vogeley | 2015-01-11 | 1 | -1/+1 |
| | | * | Correction | Christian Vogeley | 2015-01-11 | 1 | -1/+1 |
| | | * | Correction | Christian Vogeley | 2015-01-11 | 3 | -4/+3 |
| | | * | corrcetion | Christian Vogeley | 2015-01-11 | 1 | -1/+1 |
| | | * | Correct | Christian Vogeley | 2015-01-11 | 1 | -19/+18 |
| | | * | Revert "put back in" | Christian Vogeley | 2015-01-11 | 1 | -18/+0 |
| | | * | Revert "put back in" | Christian Vogeley | 2015-01-11 | 1 | -4/+0 |
| | | * | put back in | Christian Vogeley | 2015-01-11 | 1 | -0/+4 |
| | | * | put back in | Christian Vogeley | 2015-01-11 | 1 | -0/+18 |
| | | * | . | Christian Vogeley | 2015-01-11 | 1 | -0/+131 |
| | | * | . | Christian Vogeley | 2015-01-11 | 1 | -1/+1 |
| | | * | fix accidentally removed file | Christian Vogeley | 2015-01-11 | 1 | -0/+446 |
| | | * | Merge remote-tracking branch 'upstream/master' | Christian Vogeley | 2015-01-11 | 1714 | -40293/+538358 |
| | | |\
| | | |/
| | |/| |
|
| | | * | Fix for issue #763 Error creating new channel within the limits of the | Christian Vogeley | 2015-01-11 | 3 | -2/+28 |
| | | * | merge | Christian Vogeley | 2014-12-27 | 7 | -757/+18 |
| * | | | revup | friendica | 2015-01-11 | 1 | -1/+1 |
| |/ / |
|
* | | | Merge branch 'master' into trinidad | friendica | 2015-01-10 | 2 | -2/+5 |
|\| | |
|