aboutsummaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'upstream/master'habeascodice2014-10-072-13/+24
|\
| * add imagick version check when guessing mimetype. It probably isn't important...friendica2014-10-071-10/+21
| * log the recursive reshare from hell at logger_debug until we get through this...friendica2014-10-071-3/+3
* | xhabeascodice2014-10-071-0/+1
* | Merge remote branch 'upstream/master'habeascodice2014-10-077-335/+411
|\|
| * check the imagick version before using it.friendica2014-10-071-4/+16
| * add ability to skip broken imagemagick on shared hostingnostupidzone2014-10-071-6/+10
| * porting more widgets to bs nav-pillsmarijus2014-10-071-0/+2
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-10-062-324/+366
| |\
| | * Merge pull request #620 from dawnbreak/RedDAVRedMatrix2014-10-072-324/+366
| | |\
| | | * Moved RedBrowser class from reddav.php to it's own file.Klaus Weidenbach2014-10-062-324/+366
| * | | Make a best guess at how to pull the attribution from the recursive reshare f...friendica2014-10-061-0/+4
| |/ /
| * | found one bug trying to fetch the recursive reshare from hell. I still think ...friendica2014-10-061-2/+2
| * | SQL error - private message conversation lookupfriendica2014-10-061-1/+1
| * | shareable design elementsfriendica2014-10-061-0/+12
| |/
* | Merge remote branch 'upstream/master'habeascodice2014-10-0617-139/+442
|\|
| * attempt to deal with the diaspora recursive reshare from hell (Bob reshared N...friendica2014-10-051-10/+40
| * send dislike activities to diaspora as comments, also send likes and dislikes...friendica2014-10-051-13/+5
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-10-054-97/+229
| |\
| | * Merge pull request #616 from dawnbreak/docuRedMatrix2014-10-062-95/+227
| | |\
| | | * Some documentation for include/reddav.php and a bit code cleanup.Klaus Weidenbach2014-10-051-42/+153
| | | * Some documentation of include/auth.php.Klaus Weidenbach2014-10-051-53/+74
| | * | image/jpeg > image/pngJeroen2014-10-051-1/+1
| | * | Changed default avatars to PNG as agreed with Mike here: https://redmatrix.nl...Jeroen2014-10-051-1/+1
| | |/
| * / diaspora share not rendering issue - still have one remaining (the recursive ...friendica2014-10-051-1/+1
| |/
| * network page default optionfriendica2014-10-041-1/+4
| * That's a string, not an integerThomas Willingham2014-10-031-1/+1
| * Set timezone when creating a channel.Thomas Willingham2014-10-031-3/+4
| * Merge pull request #610 from tuscanhobbit/devRedMatrix2014-10-022-0/+80
| |\
| | * query for statistics are now executed by pollerPaolo Tacconi2014-10-022-0/+80
| * | issues with diaspora comment signatures on relayed comments that are relayed ...friendica2014-10-023-4/+20
| |/
| * only auto-follow the site recommendations if creating the first channel for a...friendica2014-10-011-1/+11
| * ability to pre-populate connections for new channels. e.g. "MySpace Tom"friendica2014-10-013-4/+11
| * that's why remove_obsolete_hublocs() isn't telling anybody when it does its t...friendica2014-09-301-3/+3
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-301-2/+4
| |\
| | * Merge pull request #608 from beardy-unixer/masterRedMatrix2014-10-011-2/+4
| | |\
| | | * Pluggable page templatesThomas Willingham2014-09-291-2/+4
| * | | allow site specific templates, css, js, whateverfriendica2014-09-301-0/+1
| |/ /
| * | allow custom role permissions and fix site timezone.friendica2014-09-292-1/+10
| * | implement a "powered-by" but leave it turned off until somebody with a good e...friendica2014-09-292-0/+20
* | | Merge remote branch 'upstream/master'habeascodice2014-09-291-1/+1
|\| |
| * | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-09-291-1/+1
| |\|
| * | Silence insanely noisy log - should probably stick this in a dloggerThomas Willingham2014-09-291-1/+1
* | | regex missing terminator charhabeascodice2014-09-291-1/+1
| |/ |/|
* | Merge remote branch 'upstream/master'habeascodice2014-09-283-106/+286
|\|
| * BBCode - $1 wrote doesn't make sense as a spoiler. $1 spoiler does.Thomas Willingham2014-09-281-1/+1
| * Merge https://github.com/friendica/red into pending_mergefriendica2014-09-271-105/+269
| |\
| | * Some documentation of include/config.php.Klaus Weidenbach2014-09-261-105/+269
| * | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-271-1/+1
| |\|
| * | some background work for import/export of things and liked things/profilesfriendica2014-09-271-0/+16
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-30 18:27:14 +0000