aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* doc updatesfriendica2014-10-0349-355/+1109
* issues with diaspora comment signatures on relayed comments that are relayed ...friendica2014-10-025-7/+21
* 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-014-5/+12
* 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-303-3/+13
|\
| * Merge pull request #608 from beardy-unixer/masterRedMatrix2014-10-011-2/+4
| |\
| | * Pluggable page templatesThomas Willingham2014-09-291-2/+4
| * | Merge pull request #609 from tuscanhobbit/devRedMatrix2014-10-011-1/+3
| |\ \
| | * | useless file: knownhubsPaolo Tacconi2014-09-301-22/+0
| | * | added directory status to siteinfoPaolo Tacconi2014-09-301-1/+3
| | * | Added mod returning a list of known hubs, for a lightweight hub crawlerPaolo Tacconi2014-09-301-0/+22
| * | | A...typo? Relic of some kind.Thomas Willingham2014-09-301-1/+0
| * | | Couple of site specific files missing from gitignoreThomas Willingham2014-09-301-0/+7
| |/ /
* / / allow site specific templates, css, js, whateverfriendica2014-09-302-1/+2
|/ /
* | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-293-0/+0
|\ \
| * | no spaces in file names as requestedJeroen2014-09-303-0/+0
* | | allow custom role permissions and fix site timezone.friendica2014-09-294-5/+16
* | | implement a "powered-by" but leave it turned off until somebody with a good e...friendica2014-09-296-1/+38
|/ /
* | Merge branch 'master' of https://github.com/friendica/redThomas Willingham2014-09-2913-1381/+2068
|\ \
| * | ok, last commit so far on the simple schemasJeroen2014-09-292-10/+10
| * | transp backJeroen2014-09-293-10/+10
| * | minor modification simple black on white schema.Jeroen2014-09-291-10/+10
| * | Added 3 new schemas, all named 'simple' in 3 variants. Please enjoy.Jeroen2014-09-293-0/+546
| |/
| * Merge pull request #607 from tuscanhobbit/devRedMatrix2014-09-291-2/+2
| |\
| | * Numbers shouldn't be stringsPaolo Tacconi2014-09-291-2/+2
| |/
| * Merge pull request #606 from tuscanhobbit/devPaolo T2014-09-292-1363/+1434
| |\
| | * Italian strings updatedPaolo Tacconi2014-09-292-1363/+1434
| |/
| * Merge pull request #605 from habeascodice/masterRedMatrix2014-09-293-2/+9
| |\
| | * Allows extra content to be inserted at end of profile_photo page. Needed for ...habeascodice2014-09-281-1/+3
| | * relevant now that site statistics are all the hotnesshabeascodice2014-09-281-0/+5
| | * Merge remote branch 'upstream/master'habeascodice2014-09-2812-135/+431
| | |\ | | |/ | |/|
| * | Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-281-2/+50
| |\ \
| | * \ Merge pull request #604 from tuscanhobbit/devRedMatrix2014-09-291-2/+50
| | |\ \
| | | * | added statistics to siteinfo jsontuscanhobbit2014-09-281-2/+50
| | | * | Rebase from upstreamPaolo Tacconi2014-09-2667-1246/+1444
| | | |\ \
| | | * \ \ Rebase from upstreamPaolo Tacconi2014-09-25123-2915/+4795
| | | |\ \ \
| | | * \ \ \ Merge pull request #3 from friendica/masterPaolo T2014-09-1841-205/+5638
| | | |\ \ \ \
| | | * \ \ \ \ Merge branch 'master' of https://github.com/friendica/redPaolo Tacconi2014-09-1533-640/+667
| | | |\ \ \ \ \
| | | * \ \ \ \ \ Merge pull request #2 from friendica/masterPaolo T2014-09-122-463/+506
| | | |\ \ \ \ \ \
| * | | | | | | | | some more work on photosmarijus2014-09-284-14/+29
| |/ / / / / / / /
| | | | | | | | * Typo in regex causes runtime errorhabeascodice2014-09-281-1/+1
* | | | | | | | | Silence insanely noisy log - should probably stick this in a dloggerThomas Willingham2014-09-291-1/+1
|/ / / / / / / /
* | | | | | | | BBCode - $1 wrote doesn't make sense as a spoiler. $1 spoiler does.Thomas Willingham2014-09-281-1/+1
* | | | | | | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-274-106/+338
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge https://github.com/friendica/red into pending_mergefriendica2014-09-271-105/+269
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge pull request #603 from dawnbreak/docuRedMatrix2014-09-271-105/+269
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | | * | | | | | | Some documentation of include/config.php.Klaus Weidenbach2014-09-261-105/+269
| | |/ / / / / / /
| * | | | | | | | provide backup copy of post for diaspora reshare and re-fetchfriendica2014-09-271-0/+52
| * | | | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-279-97/+88
| |\| | | | | | |