aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge from upstreamtuscanhobbit2014-10-0124-1380/+2063
|\
| * that's why remove_obsolete_hublocs() isn't telling anybody when it does its ↵friendica2014-09-301-3/+3
| | | | | | | | thing, I forgot to uncomment the bit that tells everybody after I tested it. I needed extensive testing to make sure we didn't accidentally wipe out all hublocs everywhere. Testing went fine so I just assumed it was all working as planned; but went back today to find out why I wasn't told of a recent change.
| * 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 templates
| | | * Pluggable page templatesThomas Willingham2014-09-291-2/+4
| | | |
| | * | Merge pull request #609 from tuscanhobbit/devRedMatrix2014-10-011-1/+3
| | |\ \ | | | | | | | | | | Dev
| | | * | 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 ↵friendica2014-09-296-1/+38
| |/ / | | | | | | | | | eye for layout can figure out where best to put it.
| * | 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 strings
| | | * Numbers shouldn't be stringsPaolo Tacconi2014-09-291-2/+2
| | |/
| | * Merge pull request #606 from tuscanhobbit/devPaolo T2014-09-292-1363/+1434
| | |\ | | | | | | | | Italian strings updated
| | | * Italian strings updatedPaolo Tacconi2014-09-292-1363/+1434
| | |/
| | * Merge pull request #605 from habeascodice/masterRedMatrix2014-09-293-2/+9
| | |\ | | | | | | | | 2 minor bug-fixes, a line of docu, and a call_hooks() hook
| | | * Allows extra content to be inserted at end of profile_photo page. Needed for ↵habeascodice2014-09-281-1/+3
| | | | | | | | | | | | | | | | openclipatar addon.
| | | * relevant now that site statistics are all the hotnesshabeascodice2014-09-281-0/+5
| | | |
| | | * Merge remote branch 'upstream/master'habeascodice2014-09-2812-135/+431
| | | |\ | | | |/ | | |/|
| | | * 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
| | | | | | | | | | | | | | | | if we need it - we're getting literally hundreds of thousands of these.
* | | | Merge from upstreamtuscanhobbit2014-09-2814-156/+453
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of https://github.com/friendica/redmarijus2014-09-281-2/+50
| |\ \ \
| | * \ \ Merge pull request #604 from tuscanhobbit/devRedMatrix2014-09-291-2/+50
| | |\ \ \ | | | |/ / | | |/| | Statistics copied into siteinfo/json
| | | * | added statistics to siteinfo jsontuscanhobbit2014-09-281-2/+50
| | | | |
| * | | | some more work on photosmarijus2014-09-284-14/+29
| |/ / /
| * | | 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 for include/config.php.
| | | | * | Some documentation of include/config.php.Klaus Weidenbach2014-09-261-105/+269
| | | |/ / | | | | | | | | | | | | | | | | | | | | I hope my guesses are not completely wrong, anyway please take look not that I tell complete bullshit.
| | * | | 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
| | |\| |
| | * | | some background work for import/export of things and liked things/profilesfriendica2014-09-272-1/+17
| | | | |
| * | | | more css shiftingmarijus2014-09-273-16/+17
| | |/ / | |/| |
| * | | upload first but not inside another {{if}}marijus2014-09-261-1/+1
| | | |
| * | | upload should be firstmarijus2014-09-261-3/+3
| | | |
| * | | fix blockquotemarijus2014-09-264-16/+17
| | | |
| * | | So much so, in fact, that I didn't even notice the typo.Thomas Willingham2014-09-261-1/+1
| | | |
| * | | Minor doco. Add some clarity - that had me scratching my head.Thomas Willingham2014-09-261-1/+1
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-23 19:52:50 +0000