aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* regex missing terminator charhabeascodice2014-09-291-1/+1
|
* 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
| |/ / / / / / /
| * | | | | | | 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
| | |/ / / / / / / | |/| | | | | | |
* / | | | | | | | Typo in regex causes runtime errorhabeascodice2014-09-281-1/+1
|/ / / / / / / /
* | | | | | | | 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
| | | | |
* | | | | make it the defaultfriendica2014-09-241-21/+20
| | | | |
* | | | | one step closerfriendica2014-09-241-1/+3
| | | | |
* | | | | more testingfriendica2014-09-241-3/+18
| | | | |
* | | | | just an experiment - don't do anything with this until I'm finished with it.friendica2014-09-242-1/+10
| | | | |
* | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-231-632/+721
|\ \ \ \ \
| * \ \ \ \ Merge pull request #601 from solstag/masterRedMatrix2014-09-241-632/+721
| |\ \ \ \ \ | | | | | | | | | | | | | | update pt-br translation
| | * | | | | update pt-br translationAlexandre Hannud Abdo2014-09-221-632/+721
| | | | | | |
* | | | | | | fix url mismatches of a single trailing slash for feed author/owner ↵friendica2014-09-234-15/+10
|/ / / / / / | | | | | | | | | | | | | | | | | | comparisons; update diaspora_compat
* | | | | | Merge https://github.com/friendica/red into pending_mergefriendica2014-09-231-3/+8
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #602 from zzottel/masterzzottel2014-09-231-3/+8
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | update German main help page
| | * | | | | | update German main help pagezottel2014-09-231-3/+8
| |/ / / / / /
* / / / / / / diaspora private mail seems to work now - but there's an obfuscation leak ↵friendica2014-09-233-11/+14
|/ / / / / / | | | | | | | | | | | | | | | | | | via the conversation structure that needs to be dealt with.
* | | | | | d* little fixesfriendica2014-09-231-10/+4
| | | | | |
* | | | | | d* PM cont.friendica2014-09-233-4/+11
| | | | | |
* | | | | | more work on d* private messagesfriendica2014-09-233-9/+78
| | | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 01:23:30 +0000