aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|\ \ \
| * | | sql in -> INMario Vavti2015-03-231-1/+1
| | | |
| * | | indicate new or updated itemsMario Vavti2015-03-233-3/+22
| | | |
* | | | limit notification detail queries for items and eventsfriendica2015-03-234-6/+12
| | | |
* | | | operation snakebite, cont.friendica2015-03-223-9/+32
|/ / /
* | | put a lower time limit on time travellersfriendica2015-03-221-3/+5
| | |
* | | $simple_update isn't so simple any more. Make sure we don't re-itnroduce the ↵friendica2015-03-223-14/+12
| | | | | | | | | | | | bug that session['loadtime'] was created to fix. It's questionable whether we still need to even look for item_unseen but I won't make that call today. We can also eliminate the restriction on not doing live updates from the discover tab since we aren't relying completely on item_unseen (which can only be set by the owner and won't work on a page with virtual owners).
* | | allow complete undo of a vote, not just a change of votefriendica2015-03-221-1/+5
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-224-54/+86
|\ \ \
| * \ \ Merge pull request #935 from dawnbreak/masterRedMatrix2015-03-231-26/+50
| |\ \ \ | | |_|/ | |/| | Two possible bugfixes in bb2diaspora.php.
| | * | Two possible bugfixes in bb2diaspora.php.Klaus Weidenbach2015-03-221-26/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have found two suspicious parts and tried to correct them. I have no diaspora enabled hubs and I am also not sure what influence these two changes will have: $unset($item['author']) ==> unset($item['author']); if(cnt) ==> if($cnt) Before merging can someone with diaspora contacts test this.
| * | | move the maintenance part to include/sharedwithme.phpMario Vavti2015-03-222-27/+35
| | | |
| * | | do not override item_private here anymoreMario Vavti2015-03-221-1/+1
| | | |
* | | | provide visual feedback when deleting a like by liking it again.friendica2015-03-225-8/+15
|/ / /
* | | fix multiple vote issuesfriendica2015-03-211-2/+3
| | |
* | | Merge https://github.com/friendica/red into pending_mergefriendica2015-03-217-159/+196
|\ \ \
| * | | Merge pull request #934 from dawnbreak/masterRedMatrix2015-03-223-155/+173
| |\| | | | | | | | | | Bugfix und variable initialization.
| | * | Fixed an exit of a loop in builtin_activity_puller().Klaus Weidenbach2015-03-211-128/+132
| | | | | | | | | | | | | | | | There was a "$return", but I think it should be "return".
| | * | Bugfix und variable initialization.Klaus Weidenbach2015-03-212-27/+41
| | | | | | | | | | | | | | | | | | | | Fixed a wrong perm_is_allowed() parameter, commented some other places where we use variables that are not set and should not work.