Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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) | ||||
* | | | Allow configuration of the display order of profile fields. This is an ↵ | redmatrix | 2016-03-01 | 1 | -0/+19 |
| |/ |/| | | | | | important piece of a more general profile configuration framework which will eventually be accessible via the admin page. | ||||
* | | Merge https://github.com/redmatrix/hubzilla into pending_merge | redmatrix | 2016-02-29 | 4 | -79/+80 |
|\| | |||||
| * | provide footer bbcode | Mario Vavti | 2016-02-29 | 2 | -5/+9 |
| | | |||||
| * | 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 | 1 | -41/+51 |
| | | |||||
| * | 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 | ||||
* | | abconfig | redmatrix | 2016-02-29 | 3 | -5/+88 |
|/ | |||||
* | 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-27 | 1 | -0/+3 |
|\ | |||||
| * | 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 | 1 | -0/+2 |
| | | | | | | | | this is not supported by the backend at the moment. |