Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-26 | 3 | -252/+252 | |
| |\ \ \ | ||||||
| * | | | | move link to /locs to settings menu if we have more than one location and ↵ | Mario Vavti | 2016-03-26 | 1 | -6/+14 | |
| | | | | | | | | | | | | | | | | | | | | some template work on locs | |||||
* | | | | | issue #319 part 2 | redmatrix | 2016-03-26 | 1 | -9/+11 | |
| |/ / / |/| | | | ||||||
* | | | | add hook to allow plugins to perform a follow activity from an activityfeed | redmatrix | 2016-03-23 | 1 | -4/+14 | |
| |_|/ |/| | | ||||||
* | | | atom specifies a uri or iri for the id. message_id isn't suitable here. | redmatrix | 2016-03-23 | 2 | -4/+5 | |
| | | | ||||||
* | | | rewrite the webfinger discovery logic | redmatrix | 2016-03-22 | 2 | -244/+233 | |
|/ / | ||||||
* | | update network_to_name (reserve DFRN for future use) | redmatrix | 2016-03-21 | 1 | -10/+12 | |
| | | ||||||
* | | attempting to work with braindead lighttpd gnusocial servers | redmatrix | 2016-03-21 | 1 | -2/+20 | |
| | | ||||||
* | | more federation work | redmatrix | 2016-03-20 | 2 | -32/+28 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-20 | 1 | -0/+16 | |
|\ \ | ||||||
| * | | fix #328 by using a seperate query instead of group_concat | Mario Vavti | 2016-03-20 | 1 | -0/+16 | |
| | | | ||||||
* | | | rework salmon - important, update addons also if you have enabled gnusoc addon | redmatrix | 2016-03-20 | 1 | -196/+0 | |
|/ / | ||||||
* / | make the admin side menu extensible and provide a hook for a channel "move" ↵ | redmatrix | 2016-03-19 | 2 | -5/+16 | |
|/ | | | | operation that federation plugins might use to re-establish connections after a channel move. | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-17 | 1 | -1/+9 | |
|\ | ||||||
| * | See issue https://github.com/redmatrix/hubzilla-addons/issues/17 (UNO: ↵ | jeroenpraat | 2016-03-17 | 1 | -1/+9 | |
| | | | | | | | | enable the Diaspora protocol for all channels (if addon is enabled) - I had to do this during channel creation and not in the addon itself, or else the member can't change this after the channel is created. Tested it on UNO and normal Hubzilla. If this is not the right place for this, please move it. If not wanted at all, please discuss. | |||||
* | | no xchan here if using zot protocol | redmatrix | 2016-03-17 | 2 | -2/+4 | |
|/ | ||||||
* | typo | redmatrix | 2016-03-16 | 1 | -1/+1 | |
| | ||||||
* | more federation backend | redmatrix | 2016-03-16 | 2 | -7/+4 | |
| | ||||||
* | lots of work on federated channel discovery | redmatrix | 2016-03-16 | 3 | -65/+283 | |
| | ||||||
* | more federation backend work | redmatrix | 2016-03-15 | 1 | -4/+39 | |
| | ||||||
* | some heavy lifting porting the old salmon code | redmatrix | 2016-03-15 | 1 | -0/+201 | |
| | ||||||
* | federation work | redmatrix | 2016-03-14 | 2 | -10/+25 | |
| | ||||||
* | some re-working of webfinger and hcard parsing which will be necessary going ↵ | redmatrix | 2016-03-14 | 1 | -10/+33 | |
| | | | | forward. | |||||
* | issue #320 - regression, after removing channel attached to an authenticated ↵ | redmatrix | 2016-03-12 | 3 | -30/+34 | |
| | | | | session the session was not completely cleared. | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-12 | 1 | -1/+11 | |
|\ | ||||||
| * | some janitor work on profiles | Mario Vavti | 2016-03-12 | 1 | -1/+11 | |
| | | ||||||
* | | some minor cleanups | redmatrix | 2016-03-10 | 2 | -2/+2 | |
|/ | ||||||
* | UNO: Hide bookmark tools in items (#^ and in menu) | jeroenpraat | 2016-03-10 | 2 | -1/+6 | |
| | ||||||
* | handle UNO move channel operation | redmatrix | 2016-03-09 | 2 | -4/+65 | |
| | ||||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-09 | 1 | -1/+1 | |
|\ | ||||||
| * | Issue #316 make /display updates work. Basically copy and paste what we do ↵ | Mario Vavti | 2016-03-09 | 1 | -1/+1 | |
| | | | | | | | | on load and add $simple_update to the query. | |||||
* | | work on implementing account/channel move (as opposed to clone) | redmatrix | 2016-03-09 | 5 | -25/+28 | |
|/ | ||||||
* | isue #315 | redmatrix | 2016-03-08 | 1 | -0/+3 | |
| | ||||||
* | add syslog loglevels to dba functions | redmatrix | 2016-03-07 | 2 | -8/+8 | |
| | ||||||
* | a bit of page cleanup for edit profiles | redmatrix | 2016-03-07 | 2 | -7/+7 | |
| | ||||||
* | Also make it clear with (mouse) hover text that you must click on the cover ↵ | jeroenpraat | 2016-03-06 | 1 | -0/+1 | |
| | | | | photo to show the channel/more | |||||
* | Merge https://github.com/redmatrix/hubzilla into pending_merge1.3 | redmatrix | 2016-03-03 | 1 | -2/+22 | |
|\ | ||||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-03 | 3 | -3/+1 | |
| |\ | ||||||
| * | | move cover-photo to template, add the ability to define a title and subtitle ↵ | Mario Vavti | 2016-03-03 | 1 | -2/+22 | |
| | | | | | | | | | | | | (defaults to channel name and addres), move js from redbasic.js to template. | |||||
* | | | remove the markdown feature. Do not re-enable unless you are willing to ↵ | redmatrix | 2016-03-03 | 1 | -1/+1 | |
| |/ |/| | | | | | support it. | |||||
* | | rename the menu entry and page to 'Profile Fields' to maintain consistency | redmatrix | 2016-03-02 | 1 | -1/+1 | |
| | | ||||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-02 | 1 | -2/+2 | |
|\| | ||||||
| * | Merge branch 'master' of https://github.com/redmatrix/hubzilla | Mario Vavti | 2016-03-02 | 2 | -1/+20 | |
| |\ | ||||||
| * | | a simple cover-photo implementation for redbasic default template | Mario Vavti | 2016-03-02 | 1 | -2/+2 | |
| | | | ||||||
* | | | issue #305 | redmatrix | 2016-03-02 | 2 | -2/+0 | |
| |/ |/| | ||||||
* | | sort out the with and howlong dependencies | redmatrix | 2016-03-01 | 1 | -2/+2 | |
| | | ||||||
* | | profile field admin page (functional only: still needs a lot of HTML/CSS ↵ | redmatrix | 2016-03-01 | 1 | -2/+2 | |
| | | | | | | | | cleanup) | |||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-03-01 | 1 | -1/+1 | |
|\ \ | ||||||
| * | | Merge branch 'master' of https://github.com/redmatrix/hubzilla | jeroenpraat | 2016-03-01 | 3 | -5/+88 | |
| |\| | ||||||
| * | | Small fix for deleted forum channels showing in the forum widget (had this ↵ | jeroenpraat | 2016-03-01 | 1 | -1/+1 | |
| | | | | | | | | | | | | after migration from RM on 1 or 2 channels) |