Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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? | ||||
* | | | 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. | ||||
| * | | | Merge branch 'master' of https://github.com/friendica/red | Mario Vavti | 2015-03-21 | 6 | -407/+420 |
| |\| | | |||||
| | * | | Merge pull request #933 from dawnbreak/docu | RedMatrix | 2015-03-21 | 1 | -1/+2 |
| | |\ \ | | | | | | | | | | | Extend Doxygen configuration a bit to display more. | ||||
| | | * | | Extend Doxygen configuration a bit to display more. | Klaus Weidenbach | 2015-03-21 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add view of \license information in Doxygen information and add an overview page for \fixme which is used in source code. We have Bug List, Fixme List, Todo List and Deprecated List. Do we have some other tags we use that we could collect and display? | ||||
| * | | | | fix acl for if we have an cid in /network and make $bang better visible | Mario Vavti | 2015-03-21 | 3 | -3/+21 |
| | | | | | |||||
* | | | | | add loadtime search to channel and fix it for home. display and search need ↵ | friendica | 2015-03-21 | 7 | -10/+55 |
| |/ / / |/| | | | | | | | | | | | further investigation | ||||
* | | | | change permission roles for things like channel admin to make them more ↵ | friendica | 2015-03-20 | 1 | -27/+27 |
| |/ / |/| | | | | | | | | easily manually settable from the connections edit page. | ||||
* | | | set to empty string so it doesn't get mis-handled as a null | friendica | 2015-03-20 | 1 | -0/+2 |
| | | | |||||
* | | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-20 | 15 | -235/+342 |
|\| | | |||||
| * | | some tabs title statuseditor restructuring | Mario Vavti | 2015-03-21 | 3 | -12/+25 |
| | | | |||||
| * | | need the cloudpath before creating the object | Mario Vavti | 2015-03-20 | 1 | -4/+3 |
| | | | |||||
| * | | some cleanup | Mario Vavti | 2015-03-20 | 1 | -13/+8 |
| | | | |||||
| * | | possible improvement regarding deletion | Mario Vavti | 2015-03-20 | 2 | -31/+46 |
| | | | |||||
| * | | remove unused vars | Mario Vavti | 2015-03-20 | 1 | -2/+0 |
| | | | |||||
| * | | remove more $vars from style.css | Mario Vavti | 2015-03-20 | 10 | -189/+276 |
| | | | |||||
* | | | config to hide version tag from siteinfo - on my site it's meaningless. | friendica | 2015-03-20 | 4 | -379/+389 |
|/ / | |||||
* | | call parse_url from rpost and add the result to the content body if invoked ↵ | friendica | 2015-03-19 | 1 | -0/+5 |
| | | | | | | | | with a url argument | ||||
* | | Explicitly force link for 'All Collections' on the network page to gid=0 so ↵ | friendica | 2015-03-19 | 1 | -1/+1 |
| | | | | | | | | it can be used with a default page over-ride for gid. | ||||
* | | Merge https://github.com/friendica/red into pending_merge | friendica | 2015-03-19 | 14 | -201/+183 |
|\ \ | |||||
| * | | there are no vars to replace in converse_center.css | Mario Vavti | 2015-03-19 | 1 | -1/+0 |
| | | | |||||
| * | | update schema doco a little. needs some more... | Mario Vavti | 2015-03-19 | 2 | -9/+12 |
| | | | |||||
| * | | remove more unused $vars | Mario Vavti | 2015-03-19 | 2 | -21/+0 |
| | | |