Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | revup | redmatrix | 2016-03-01 | 1 | -1/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-29 | 9 | -92/+9774 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | provide footer bbcode | Mario Vavti | 2016-02-29 | 3 | -5/+14 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unused variable | Mario Vavti | 2016-02-29 | 1 | -4/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | simplify profile edit button(s) and make it useful for multiple profiles | Mario Vavti | 2016-02-29 | 3 | -53/+72 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | update es-es. tested it and it works now. Don't know what happened earlier. | jeroenpraat | 2016-02-29 | 2 | -1342/+1326 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | fix deletion of files from filesystem | Mario Vavti | 2016-02-29 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | do not process update activity if there is no item to update and simplify ↵ | Mario Vavti | 2016-02-29 | 1 | -28/+19 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | code a little | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | revert es-es update. something went wrong. later today I will examine what. | jeroenpraat | 2016-02-29 | 2 | -84/+9767 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | abconfig | redmatrix | 2016-02-29 | 10 | -10/+187 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | revup | redmatrix | 2016-02-29 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | build_sync_packet - no need to sleep after the last sync delivery. | redmatrix | 2016-02-28 | 1 | -1/+5 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | stop the PHP warnings from Thomas's buggered sitekey | redmatrix | 2016-02-28 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-28 | 2 | -9767/+84 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | update es-es strings | jeroenpraat | 2016-02-28 | 2 | -9767/+84 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* / | | | | | | | | | | | | | | | | | | | | | | | | | | revup | redmatrix | 2016-02-28 | 1 | -1/+1 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | I haven't investigated 'why', but the addition of the router class in ↵ | redmatrix | 2016-02-27 | 1 | -0/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | https://github.com/redmatrix/hubzilla/commit/1db3409f36f408bfc49816e1fab3df4b53b8f19e resulted in the setup global variable $install_wizard_pass to not get initiated at the global level when the setup module file was included. This corrects the situation and makes install work but without explaining why the variable wasn't instantiated in the first place. This may be important - if any other modules use global variables internally. I don't believe that any do, but the behaviour needs to be resolved or documented. | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-27 | 6 | -2697/+2670 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge pull request #302 from phellmes/de20160227 | redmatrix | 2016-02-28 | 2 | -1342/+1326 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Update DE translation strings | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | Update DE translation strings | phellmes | 2016-02-27 | 2 | -1342/+1326 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-02-27 | 2 | -1355/+1339 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | update NL strings | jeroenpraat | 2016-02-27 | 2 | -1355/+1339 | |
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * / / / / / / / / / / / / / / / / / / / / / / / / / | missing include | Mario Vavti | 2016-02-27 | 1 | -0/+1 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | / | make attach_delete() return and comment out album rename functionality since ↵ | Mario Vavti | 2016-02-27 | 2 | -0/+4 | |
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this is not supported by the backend at the moment. | |||||
* / | | | | | | | | | | | | | | | | | | | | | | | | z_fetch_url and z_post_url returning false | redmatrix | 2016-02-27 | 2 | -3/+3 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-26 | 6 | -57/+39 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | fix link to photo album and make sure that small photos are not overwritten ↵ | Mario Vavti | 2016-02-26 | 2 | -4/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | by body text. | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | several photo item template fixes | Mario Vavti | 2016-02-26 | 3 | -19/+25 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | some improvement for file activity | Mario Vavti | 2016-02-26 | 1 | -7/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-02-26 | 4 | -6/+22 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | get rid of duplicate function | Mario Vavti | 2016-02-26 | 1 | -27/+2 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | turn timezone aware birthdays into a feature for those who want an ↵ | redmatrix | 2016-02-26 | 5 | -1081/+1068 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uncluttered calendar - at the expense of possibly sending somebody's birthday greeting on the wrong day if they are in a different timezone. | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | | | small improvements to profile like activity | redmatrix | 2016-02-25 | 2 | -4/+10 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | this reverts ea54987ca4c36 | redmatrix | 2016-02-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-25 | 8 | -10/+18 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | revert f62ec4132ed571288737423de386054a4cc8b0d5 - allow one self to be added ↵ | Mario Vavti | 2016-02-25 | 2 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to a privacy group. | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | in update_birthdays() we should probably set adjust to 0 instead of 1 since ↵ | Mario Vavti | 2016-02-25 | 1 | -1/+1 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a birthday is more a kind of a global holiday | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | provide an edit button for the profile page | Mario Vavti | 2016-02-25 | 2 | -4/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | Merge pull request #299 from git-marijus/master | redmatrix | 2016-02-26 | 3 | -2/+6 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | we have got a button for events in the nav. no need for it in the tab… | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | we have got a button for events in the nav. no need for it in the tabs if we ↵ | Mario Vavti | 2016-02-25 | 3 | -2/+6 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are local. | |||||
* / / / / / / / / / / / / / / / / / / / / / / / / | backtrace openssl_verify errors so that we can find bad keys - as there is ↵ | redmatrix | 2016-02-25 | 3 | -5/+21 | |
|/ / / / / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | very little relevant context available at this level. | |||||
* | | | | | | | | | | | | | | | | | | | | | | / | when creating an event from a post in our stream, if the original post was ↵ | redmatrix | 2016-02-25 | 5 | -5/+16 | |
| |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | private, set the event permissions to "just me". If it was a public event, set the event permissions to the channel default permissions. | |||||
* | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-24 | 1 | -6/+6 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-02-25 | 9 | -9/+46 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | | another dutch update | jeroenpraat | 2016-02-25 | 1 | -6/+6 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | | issue #216 - calendar sharing | redmatrix | 2016-02-24 | 8 | -10/+425 | |
| |/ / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | | | | | | | | | | | schema change to support channel move (a completely different operation than ↵ | redmatrix | 2016-02-24 | 5 | -4/+23 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | channel clone) | |||||
* | | | | | | | | | | | | | | | | | | | | | | | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-24 | 4 | -9/+6 | |
|\| | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | interim dutch string update | jeroenpraat | 2016-02-25 | 1 | -3/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-02-25 | 1 | -5/+1 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ |