aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-2932-2892/+2897
|\
| * Merge pull request #944 from dawnbreak/docuRedMatrix2015-03-3031-2834/+2832
| |\ | | | | | | Correcting reported Doxygen syntax warnings.
| | * Correcting reported Doxygen syntax warnings.Klaus Weidenbach2015-03-2931-2834/+2832
| | | | | | | | | | | | | | | | | | | | | Fixed wrong Doxygen syntax and add some of the available FIXME to Doxygen documentation. Updated Doxygen configuration to add also all capital letter tags. Adding some more Doxygen documentation.
| * | Merge pull request #943 from dawnbreak/masterRedMatrix2015-03-301-58/+65
| |\ \ | | |/ | |/| Fixed two wrong variable usages in event.php.
| | * Fixed two wrong variable usages in event.php.Klaus Weidenbach2015-03-291-58/+65
| |/ | | | | | | I just checked the code, not the functionality.
* / fix os_mkdirfriendica2015-03-295-4/+8
|/
* remove bogus grouping from fix for #938friendica2015-03-281-2/+2
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-281-0/+1
|\
| * Make sure long words (channel addresses, homepages) on the vcard are not on ↵jeroenpraat2015-03-291-0/+1
| | | | | | | | top of the content to the right.
* | issue #938friendica2015-03-281-2/+8
|/
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-289-35/+53
|\
| * some colorbox stylingMario Vavti2015-03-271-5/+11
| |
| * Move bootstrap dependencies (tagsinput) to theme redbasic (we only have it ↵Mario Vavti2015-03-279-30/+42
| | | | | | | | there). Comment out some most probably deprecated js includes. Some css cleanup.
* | issue #941friendica2015-03-283-591/+672
|/
* adjust category auto-complete background color (blue) to match the blue we ↵friendica2015-03-261-0/+3
| | | | use for buttons. It was a completely unrelated shade of blue and looked out of place.
* minor tweak on event formfriendica2015-03-261-1/+2
|
* bring event form into line with other formsfriendica2015-03-261-3/+9
|
* add channel_lastpost timestamp to help optimise some outrageously expensive ↵friendica2015-03-266-3/+27
| | | | queries.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-2613-6250/+6984
|\
| * Merge pull request #940 from HaakonME/masterRedMatrix2015-03-272-6110/+6820
| |\ | | | | | | Updated Norwegian bokmål translation
| | * Updated Norwegian bokmål translationHaakon Meland Eriksen2015-03-262-6110/+6820
| | |
| * | whitespaceMario Vavti2015-03-261-1/+1
| | |
| * | do not move viewed content off the screen after collapsing a long postMario Vavti2015-03-261-2/+10
| |/
| * this might stop page scrolls while new updates drop inMario Vavti2015-03-261-1/+7
| |
| * remove some vars from style.cssMario Vavti2015-03-2611-137/+147
| |
* | provide ways to over-ride the datetime pickersfriendica2015-03-265-4/+10
|/
* item_check_service_class - the join is totally unnecessaryfriendica2015-03-251-20/+20
|
* since several prominent sites are interested in post expiration, this ↵friendica2015-03-251-1/+0
| | | | reduces the usefulness of having an archive widget n the matrix page (which wasn't horribly useful anway). So remove it from the default mod_network.pdl
* improve description of that settingfriendica2015-03-251-1/+1
|
* admin config for default expirationfriendica2015-03-253-14/+15
|
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-251-1/+1
|\
| * make postgresql happyMario Vavti2015-03-251-1/+1
| |
* | comanche: move 'webpage' declaration to the first parser pass so it is set ↵friendica2015-03-253-10/+11
|/ | | | when content loads.
* also allow service classes to set post expiration. These take priority over ↵friendica2015-03-244-15/+23
| | | | the site default.
* more work on expiration, make system limits useful - even in retrospectfriendica2015-03-243-11/+34
|
* make the log message reflect what's really happeningfriendica2015-03-241-1/+3
|
* provide a site-wide expiration policy without loopholes - still need work to ↵friendica2015-03-243-12/+30
| | | | reduce the impact of expiration queries.
* Merge https://github.com/friendica/red into pending_mergefriendica2015-03-244-405/+469
|\
| * Merge pull request #937 from tuscanhobbit/devPaolo T2015-03-242-404/+428
| |\ | | | | | | Italian translation
| | * Italian translationPaolo Tacconi2015-03-242-404/+428
| | |
| | * Merge pull request #8 from friendica/masterPaolo T2015-03-221707-191629/+21753
| | |\ | | | | | | | | merging red master into nuvola.red
| * | \ Merge pull request #936 from git-marijus/masterRedMatrix2015-03-242-1/+41
| |\ \ \ | | | | | | | | | | this query can take quite a while if there were many updates but it has ...
| | * | | we only need item mid. some documentation.Mario Vavti2015-03-241-1/+35
| | | | |
| | * | | this query can take quite a while if there were many updates but it has not ↵Mario Vavti2015-03-241-0/+6
| |/ / / | | | | | | | | | | | | been called for a long time (eg nobody called mod sharedwithme). might be a good idea to have this in the poller to clean up on a regular basis and call it once more in mod sharedwithme. what do you think?
* / / / sql errors on postgres with yestderday's optimisationfriendica2015-03-241-2/+2
|/ / /
* | | catche edge case of tag "@abcdef +1", which tags the first entry in your ↵friendica2015-03-243-10/+19
| | | | | | | | | | | | abook, regardless of abcdef. This holds true for other similar patterns as well.
* | | one step forward, one step back.friendica2015-03-231-1/+1
| | |
* | | improve performance of the zotfeed queriesfriendica2015-03-234-17/+23
| | |
* | | explicitly unset delegate session vars on logoutfriendica2015-03-231-1/+2
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-233-3/+22
|\ \ \