aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #852 from mrjive/mastermrjive2015-01-150-0/+0
|\
| * Merge pull request #1 from friendica/mastermrjive2015-01-062895-102490/+663457
| |\
* | | provide correct permissions role default for old-timers that didn't have any ...friendica2015-01-141-1/+4
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-145-1/+105
|\ \ \
| * \ \ Merge pull request #850 from einervonvielen/tocRedMatrix2015-01-155-1/+105
| |\ \ \
| | * \ \ 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
| | * | | | TestEiner von Vielen2015-01-134-0/+198
* | | | | | correct some activity object types (for comments), also fix a foreach warning...friendica2015-01-142-16/+28
|/ / / / /
* | | | | ignore bbcode open tag (left bracket) in hash and mention tag regexes and tur...friendica2015-01-141-2/+2
* | | | | some back-end code to support location activity objects. Work in progress.friendica2015-01-142-0/+2
* | | | | federate consensus items (in network only). Work in progress.friendica2015-01-142-1/+8
* | | | | honor disable_discover_tab in mod/home - it isn't a tab here but basically bl...friendica2015-01-142-1/+6
| |/ / / |/| | |
* | | | check mentions against the appropriate xchan_url and not a hard-coded /channe...friendica2015-01-131-4/+4
* | | | now that's useful...friendica2015-01-131-2/+8
* | | | provide a setting to control ALLOWCODE permissions at the channel level - it ...friendica2015-01-134-9/+9
* | | | revert recent 3.0 changes to mod/cloud so we can work on this completely in a...friendica2015-01-131-30/+19
* | | | Merge branch 'pafcu-moretagging'friendica2015-01-139-17/+32
|\ \ \ \
| * | | | Merge branch 'moretagging' of git://github.com/pafcu/red into pafcu-moretaggingfriendica2015-01-139-17/+32
|/| | | |
| * | | | Allow tags in event description and locationStefan Parviainen2015-01-131-0/+4
| * | | | Allow tags in mail, many profile fields, and admin infoStefan Parviainen2015-01-138-17/+27
* | | | | hide friends broken, add parameter for item search by verbfriendica2015-01-137-2/+9
* | | | | uninitialised theme parent in mod/cloudfriendica2015-01-121-1/+1
* | | | | theme toggle issue when viewing mod/cloud of another channelfriendica2015-01-123-18/+9
* | | | | document the pros and cons of the not-yet written hassle-free connection auto...friendica2015-01-121-0/+9
* | | | | don't wipe out the item body of a linked item to a photo when doing a normal ...friendica2015-01-121-7/+18
* | | | | change deletion behaviour of linked photo items. Previously deleting the visi...friendica2015-01-122-29/+13
| |/ / / |/| | |
* | | | Merge https://github.com/friendica/red into pending_mergefriendica2015-01-126-116/+98
|\ \ \ \
| * | | | Merge pull request #844 from pafcu/moretaggingpafcu2015-01-125-116/+96
| |\| | |
| | * | | Refactor mention code to make it more reusableStefan Parviainen2015-01-125-116/+96
| * | | | Merge pull request #842 from pafcu/masterpafcu2015-01-121-0/+2
| |\| | |
| | * | | Possibly fix issue with readmore.js collapseStefan Parviainen2015-01-121-0/+2
| |/ / /
* / / / double perms msgfriendica2015-01-122-2/+2
|/ / /
* | | another attempt to explain default permissions on connedit pagefriendica2015-01-114-18/+46
* | | remove extraneous debug file left over from postgres work.friendica2015-01-111-1/+0
* | | that was not intended to be merged with master yet. Put it under a definefriendica2015-01-111-2/+36
* | | optionally use openssl encryption functions (higher performance over mcrypt, ...friendica2015-01-111-2/+2
* | | allow the use of openssl cryptofriendica2015-01-111-0/+6
* | | basic backend work for creating consensus itemsfriendica2015-01-115-27/+84
* | | Merge branch 'master' into trinidadfriendica2015-01-1112-153/+33
|\ \ \
| * \ \ Merge https://github.com/friendica/red into pending_mergefriendica2015-01-1111-152/+32
| |\ \ \
| | * \ \ Merge pull request #840 from cvogeley/masterRedMatrix2015-01-1211-152/+32
| | |\ \ \
| | | * | | CorrectionChristian Vogeley2015-01-111-1/+1
| | | * | | CorrectionChristian Vogeley2015-01-111-1/+1
| | | * | | CorrectionChristian Vogeley2015-01-113-4/+3
| | | * | | corrcetionChristian Vogeley2015-01-111-1/+1
| | | * | | CorrectChristian Vogeley2015-01-111-19/+18
| | | * | | Revert "put back in"Christian Vogeley2015-01-111-18/+0
| | | * | | Revert "put back in"Christian Vogeley2015-01-111-4/+0
| | | * | | put back inChristian Vogeley2015-01-111-0/+4
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-26 17:08:50 +0000