Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-26 | 1 | -2/+15 |
|\ | |||||
| * | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-22 | 1 | -0/+1 |
| |\ | |||||
| * | | rewrite the webfinger discovery logic | redmatrix | 2016-03-22 | 1 | -2/+15 |
| | | | |||||
* | | | move link to /locs to settings menu if we have more than one location and ↵ | Mario Vavti | 2016-03-26 | 2 | -8/+7 |
| |/ |/| | | | | | some template work on locs | ||||
* | | Add a link to /locs to channel manager | Mario Vavti | 2016-03-22 | 1 | -0/+1 |
|/ | |||||
* | whip mod manage into shape | Mario Vavti | 2016-03-22 | 1 | -8/+3 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-20 | 1 | -9/+6 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-20 | 1 | -2/+2 |
| |\ | |||||
| * | | fix #328 by using a seperate query instead of group_concat | Mario Vavti | 2016-03-20 | 1 | -9/+6 |
| | | | |||||
* | | | rework salmon - important, update addons also if you have enabled gnusoc addon | redmatrix | 2016-03-20 | 1 | -2/+2 |
| |/ |/| | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-20 | 1 | -1/+3 |
|\| | |||||
| * | add fixme | Mario Vavti | 2016-03-20 | 1 | -1/+3 |
| | | |||||
* | | issue #330 - permit archived connections in ACLs. If they are to be blocked ↵ | redmatrix | 2016-03-20 | 1 | -2/+2 |
|/ | | | | for delivery (or some other purpose) this should probably happen in the delivery mechanism (or other related sub-system) rather than the permissions mechanism, although currently we still attempt direct delivery to archived connections. Technically "archived" means merely that we won't 'poll' the connection according to the current definition. | ||||
* | add use as cover photo link to photos view | Mario Vavti | 2016-03-18 | 1 | -0/+1 |
| | |||||
* | some work on profile listing | Mario Vavti | 2016-03-17 | 1 | -13/+12 |
| | |||||
* | bring more structure to profiles edit | Mario Vavti | 2016-03-17 | 1 | -18/+23 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-16 | 1 | -39/+19 |
|\ | |||||
| * | move buttons to dropdown menu and some cleanup | Mario Vavti | 2016-03-16 | 1 | -3/+2 |
| | | |||||
| * | still more janitor work on profiles | Mario Vavti | 2016-03-16 | 1 | -36/+17 |
| | | |||||
* | | lots of work on federated channel discovery | redmatrix | 2016-03-16 | 1 | -2/+4 |
|/ | |||||
* | even more janitor work on profiles | Mario Vavti | 2016-03-15 | 1 | -6/+3 |
| | |||||
* | some re-working of webfinger and hcard parsing which will be necessary going ↵ | redmatrix | 2016-03-14 | 1 | -7/+24 |
| | | | | forward. | ||||
* | more janitor work on profiles | Mario Vavti | 2016-03-13 | 1 | -15/+9 |
| | |||||
* | some janitor work on profiles | Mario Vavti | 2016-03-12 | 1 | -17/+12 |
| | |||||
* | remove superfluous return | Mario Vavti | 2016-03-11 | 1 | -1/+0 |
| | |||||
* | handle UNO move channel operation | redmatrix | 2016-03-09 | 1 | -11/+9 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-09 | 1 | -3/+48 |
|\ | |||||
| * | Issue #316 make /display updates work. Basically copy and paste what we do ↵ | Mario Vavti | 2016-03-09 | 1 | -3/+48 |
| | | | | | | | | on load and add $simple_update to the query. | ||||
* | | work on implementing account/channel move (as opposed to clone) | redmatrix | 2016-03-09 | 1 | -0/+2 |
|/ | |||||
* | a bit of page cleanup for edit profiles | redmatrix | 2016-03-07 | 1 | -21/+21 |
| | |||||
* | issue #313 | redmatrix | 2016-03-07 | 1 | -1/+13 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-04 | 1 | -0/+1 |
|\ | |||||
| * | add cover photo upload link to edit profile | Mario Vavti | 2016-03-04 | 1 | -0/+1 |
| | | |||||
* | | issues #306 and #307 | redmatrix | 2016-03-04 | 1 | -4/+10 |
|/ | |||||
* | remove the markdown feature. Do not re-enable unless you are willing to ↵ | redmatrix | 2016-03-03 | 1 | -9/+22 |
| | | | | support it. | ||||
* | rename the menu entry and page to 'Profile Fields' to maintain consistency | redmatrix | 2016-03-02 | 1 | -1/+1 |
| | |||||
* | UI cleanup for admin profile field management page | redmatrix | 2016-03-02 | 1 | -2/+2 |
| | |||||
* | profile field admin page (functional only: still needs a lot of HTML/CSS ↵ | redmatrix | 2016-03-01 | 1 | -17/+104 |
| | | | | cleanup) | ||||
* | abconfig | redmatrix | 2016-02-29 | 3 | -1/+29 |
| | |||||
* | 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-26 | 1 | -1/+1 |
|\ | |||||
| * | several photo item template fixes | Mario Vavti | 2016-02-26 | 1 | -1/+1 |
| | | |||||
* | | small improvements to profile like activity | redmatrix | 2016-02-25 | 1 | -2/+9 |
|/ | |||||
* | revert f62ec4132ed571288737423de386054a4cc8b0d5 - allow one self to be added ↵ | Mario Vavti | 2016-02-25 | 1 | -2/+2 |
| | | | | to a privacy group. | ||||
* | we have got a button for events in the nav. no need for it in the tabs if we ↵ | Mario Vavti | 2016-02-25 | 1 | -0/+3 |
| | | | | are local. | ||||
* | when creating an event from a post in our stream, if the original post was ↵ | redmatrix | 2016-02-25 | 2 | -2/+2 |
| | | | | private, set the event permissions to "just me". If it was a public event, set the event permissions to the channel default permissions. | ||||
* | issue #216 - calendar sharing | redmatrix | 2016-02-24 | 2 | -0/+350 |
| | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-24 | 1 | -0/+1 |
|\ | |||||
| * | fix TOS | jeroenpraat | 2016-02-25 | 1 | -0/+1 |
| | | |||||
* | | add 'requires' field to plugin info to list other dependent plugins/addons ↵ | redmatrix | 2016-02-24 | 2 | -4/+2 |
|/ | | | | and disable if dependencies are not installed/enabled |