aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Couple of site specific files missing from gitignoreThomas Willingham2014-09-301-0/+7
|
* 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
| | |\ | | |/ | |/|
| * | 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
| | | | |
| | | * | 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 from upstream
| | | * \ \ \ \ 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
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | IT localization updated
| * | | | | | | | | 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
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | if we need it - we're getting literally hundreds of thousands of these.
* | | | | | | | 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
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | move some css to the right placemarijus2014-09-263-12/+13
| | | | | | |
* | | | | | | some more work on photos - work in progressmarijus2014-09-266-84/+73
|/ / / / / /
* | | | | | doc updates, clean up buttons on PM edit template to match other edit buttonsfriendica2014-09-2655-1147/+1274
| | | | | |
* | | | | | optionally include wall items (posts) in import/exportfriendica2014-09-256-9/+90
| | | | | |
* | | | | | TypoThomas Willingham2014-09-251-1/+1
| |_|_|_|/ |/| | | |
* | | | | constrain viewsrc colorbox to 80% of the current page size. It gets messy ↵friendica2014-09-241-1/+1
| | | | | | | | | | | | | | | | | | | | scrolling to the right for days to find the close button.
* | | | | if no rss/atom element author, use feed level contactfriendica2014-09-241-7/+11
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-03 22:37:52 +0000