Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-26 | 13 | -6250/+6984 |
|\ | |||||
| * | Merge pull request #940 from HaakonME/master | RedMatrix | 2015-03-27 | 2 | -6110/+6820 |
| |\ | | | | | | | Updated Norwegian bokmål translation | ||||
| | * | Updated Norwegian bokmål translation | Haakon Meland Eriksen | 2015-03-26 | 2 | -6110/+6820 |
| | | | |||||
| * | | whitespace | Mario Vavti | 2015-03-26 | 1 | -1/+1 |
| | | | |||||
| * | | do not move viewed content off the screen after collapsing a long post | Mario Vavti | 2015-03-26 | 1 | -2/+10 |
| |/ | |||||
| * | this might stop page scrolls while new updates drop in | Mario Vavti | 2015-03-26 | 1 | -1/+7 |
| | | |||||
| * | remove some vars from style.css | Mario Vavti | 2015-03-26 | 11 | -137/+147 |
| | | |||||
* | | provide ways to over-ride the datetime pickers | friendica | 2015-03-26 | 5 | -4/+10 |
|/ | |||||
* | item_check_service_class - the join is totally unnecessary | friendica | 2015-03-25 | 1 | -20/+20 |
| | |||||
* | since several prominent sites are interested in post expiration, this ↵ | friendica | 2015-03-25 | 1 | -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 setting | friendica | 2015-03-25 | 1 | -1/+1 |
| | |||||
* | admin config for default expiration | friendica | 2015-03-25 | 3 | -14/+15 |
| | |||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-25 | 1 | -1/+1 |
|\ | |||||
| * | make postgresql happy | Mario Vavti | 2015-03-25 | 1 | -1/+1 |
| | | |||||
* | | comanche: move 'webpage' declaration to the first parser pass so it is set ↵ | friendica | 2015-03-25 | 3 | -10/+11 |
|/ | | | | when content loads. | ||||
* | also allow service classes to set post expiration. These take priority over ↵ | friendica | 2015-03-24 | 4 | -15/+23 |
| | | | | the site default. | ||||
* | more work on expiration, make system limits useful - even in retrospect | friendica | 2015-03-24 | 3 | -11/+34 |
| | |||||
* | make the log message reflect what's really happening | friendica | 2015-03-24 | 1 | -1/+3 |
| | |||||
* | provide a site-wide expiration policy without loopholes - still need work to ↵ | friendica | 2015-03-24 | 3 | -12/+30 |
| | | | | reduce the impact of expiration queries. | ||||
* | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-24 | 4 | -405/+469 |
|\ | |||||
| * | Merge pull request #937 from tuscanhobbit/dev | Paolo T | 2015-03-24 | 2 | -404/+428 |
| |\ | | | | | | | Italian translation | ||||
| | * | Italian translation | Paolo Tacconi | 2015-03-24 | 2 | -404/+428 |
| | | | |||||
| | * | Merge pull request #8 from friendica/master | Paolo T | 2015-03-22 | 1707 | -191629/+21753 |
| | |\ | | | | | | | | | merging red master into nuvola.red | ||||
| * | \ | Merge pull request #936 from git-marijus/master | RedMatrix | 2015-03-24 | 2 | -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 Vavti | 2015-03-24 | 1 | -1/+35 |
| | | | | | |||||
| | * | | | this query can take quite a while if there were many updates but it has not ↵ | Mario Vavti | 2015-03-24 | 1 | -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 optimisation | friendica | 2015-03-24 | 1 | -2/+2 |
|/ / / | |||||
* | | | catche edge case of tag "@abcdef +1", which tags the first entry in your ↵ | friendica | 2015-03-24 | 3 | -10/+19 |
| | | | | | | | | | | | | abook, regardless of abcdef. This holds true for other similar patterns as well. | ||||
* | | | one step forward, one step back. | friendica | 2015-03-23 | 1 | -1/+1 |
| | | | |||||
* | | | improve performance of the zotfeed queries | friendica | 2015-03-23 | 4 | -17/+23 |
| | | | |||||
* | | | explicitly unset delegate session vars on logout | friendica | 2015-03-23 | 1 | -1/+2 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-23 | 3 | -3/+22 |
|\ \ \ | |||||
| * | | | sql in -> IN | Mario Vavti | 2015-03-23 | 1 | -1/+1 |
| | | | | |||||
| * | | | indicate new or updated items | Mario Vavti | 2015-03-23 | 3 | -3/+22 |
| | | | | |||||
* | | | | limit notification detail queries for items and events | friendica | 2015-03-23 | 4 | -6/+12 |
| | | | | |||||
* | | | | operation snakebite, cont. | friendica | 2015-03-22 | 3 | -9/+32 |
|/ / / | |||||
* | | | put a lower time limit on time travellers | friendica | 2015-03-22 | 1 | -3/+5 |
| | | | |||||
* | | | $simple_update isn't so simple any more. Make sure we don't re-itnroduce the ↵ | friendica | 2015-03-22 | 3 | -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 vote | friendica | 2015-03-22 | 1 | -1/+5 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-22 | 4 | -54/+86 |
|\ \ \ | |||||
| * \ \ | Merge pull request #935 from dawnbreak/master | RedMatrix | 2015-03-23 | 1 | -26/+50 |
| |\ \ \ | | |_|/ | |/| | | Two possible bugfixes in bb2diaspora.php. | ||||
| | * | | Two possible bugfixes in bb2diaspora.php. | Klaus Weidenbach | 2015-03-22 | 1 | -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.php | Mario Vavti | 2015-03-22 | 2 | -27/+35 |
| | | | | |||||
| * | | | do not override item_private here anymore | Mario Vavti | 2015-03-22 | 1 | -1/+1 |
| | | | | |||||
* | | | | provide visual feedback when deleting a like by liking it again. | friendica | 2015-03-22 | 5 | -8/+15 |
|/ / / | |||||
* | | | fix multiple vote issues | friendica | 2015-03-21 | 1 | -2/+3 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-21 | 7 | -159/+196 |
|\ \ \ | |||||
| * | | | Merge pull request #934 from dawnbreak/master | RedMatrix | 2015-03-22 | 3 | -155/+173 |
| |\| | | | | | | | | | | Bugfix und variable initialization. | ||||
| | * | | Fixed an exit of a loop in builtin_activity_puller(). | Klaus Weidenbach | 2015-03-21 | 1 | -128/+132 |
| | | | | | | | | | | | | | | | | There was a "$return", but I think it should be "return". | ||||
| | * | | Bugfix und variable initialization. | Klaus Weidenbach | 2015-03-21 | 2 | -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. |