| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-24 | 2 | -19/+8 |
|\ |
|
| * | Merge pull request #849 from anaqreon/doco | git-marijus | 2017-08-24 | 1 | -1/+4 |
| |\ |
|
| | * | Merge remote-tracking branch 'upstream/dev' into doco | Andrew Manning | 2017-08-24 | 11 | -24/+508 |
| | |\ |
|
| | * | | Added language selector menu for Help pages | Andrew Manning | 2017-08-24 | 1 | -1/+4 |
| * | | | ditch discover tab in favour of the public stream app | git-marijus | 2017-08-24 | 1 | -18/+4 |
| | |/
| |/| |
|
* | | | fix title of edit card which showed up as 'edit block' due to copy/paste | zotlabs | 2017-08-24 | 1 | -1/+1 |
* | | | cards - change placeholdertext, separate from button text | zotlabs | 2017-08-24 | 1 | -0/+2 |
* | | | make cards searchable | zotlabs | 2017-08-24 | 1 | -11/+13 |
* | | | fix permalinks for card comments (send to parent url) | zotlabs | 2017-08-24 | 1 | -0/+11 |
|/ / |
|
* | | last remaining task in tasklist was not removed from view when 'completed' | zotlabs | 2017-08-23 | 1 | -1/+2 |
* | | cards: make page load after comment post | zotlabs | 2017-08-23 | 1 | -37/+33 |
* | | partial support (unfinished) for ajax loading cards with liveupdate; page sti... | zotlabs | 2017-08-23 | 2 | -3/+41 |
* | | oembed provider cleanup, add oembed to cards | zotlabs | 2017-08-23 | 6 | -14/+139 |
* | | add new conv_sort option | zotlabs | 2017-08-23 | 1 | -1/+1 |
* | | fix permalink for cards | zotlabs | 2017-08-23 | 1 | -0/+4 |
* | | cards: acl support | zotlabs | 2017-08-23 | 1 | -0/+1 |
* | | add category support to main page | zotlabs | 2017-08-23 | 1 | -0/+3 |
* | | several card enhancements | zotlabs | 2017-08-23 | 2 | -32/+157 |
* | | cards feature | zotlabs | 2017-08-23 | 1 | -0/+189 |
* | | remove debugging | zotlabs | 2017-08-21 | 1 | -4/+4 |
* | | more work on oembed from /display | zotlabs | 2017-08-21 | 3 | -8/+10 |
|/ |
|
* | stream_perms_xchans wasn't working which has effects in mod_display and there... | zotlabs | 2017-08-21 | 1 | -21/+43 |
* | some issues with message-ids and urlencoding (again) | zotlabs | 2017-08-20 | 1 | -2/+1 |
* | a few file activities were not getting synced | zotlabs | 2017-08-20 | 2 | -1/+21 |
* | issue with oembed of a shared item, which wraps in another share. | zotlabs | 2017-08-20 | 1 | -10/+20 |
* | more work on mod_display | zotlabs | 2017-08-19 | 1 | -1/+2 |
* | better error reporting on mod_display | zotlabs | 2017-08-19 | 1 | -7/+5 |
* | move ap_probe to pubcrawl addon | zotlabs | 2017-08-16 | 1 | -42/+0 |
* | more work on activitypub httpsignature verification | zotlabs | 2017-08-14 | 1 | -1/+4 |
* | new content type | zotlabs | 2017-08-14 | 1 | -2/+2 |
* | create cdav principal also on client access and remove redundant pconfig chec... | Mario Vavti | 2017-08-10 | 1 | -0/+9 |
* | merge red/master into dev | Mario Vavti | 2017-08-10 | 1 | -1/+1 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | git-marijus | 2017-08-06 | 2 | -0/+89 |
|\ |
|
| * | allow channel address to be changed | zotlabs | 2017-08-04 | 2 | -0/+89 |
* | | consolidate disable_discover_tab config if it was not yet set to either 1 or ... | git-marijus | 2017-08-06 | 4 | -6/+8 |
|/ |
|
* | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-08-03 | 4 | -14/+27 |
|\ |
|
| * | minor activitypub rendering stuff | zotlabs | 2017-08-02 | 1 | -1/+1 |
| * | plugin hook for update_unseen | zotlabs | 2017-08-01 | 3 | -13/+26 |
* | | missing observer hash | git-marijus | 2017-08-03 | 1 | -1/+1 |
* | | return preview also if we have no attachment | git-marijus | 2017-08-03 | 1 | -1/+1 |
|/ |
|
* | do not show pubs notifications for items with ACTIVITY_OBJ_FILE obj_type | git-marijus | 2017-08-01 | 1 | -1/+3 |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-31 | 2 | -9/+6 |
|\ |
|
| * | improve file_activity() a little | git-marijus | 2017-07-31 | 2 | -9/+6 |
* | | modify connection edit display for channels with no address/webbie | zotlabs | 2017-07-30 | 1 | -1/+2 |
|/ |
|
* | ltrim $display_path in attach_store() to be consistent with attach_mkdir() an... | git-marijus | 2017-07-30 | 1 | -0/+2 |
* | another syntax error | git-marijus | 2017-07-30 | 1 | -1/+1 |
* | do not include ACTIVITY_OBJ_FILE obj_type in the ping/something query | git-marijus | 2017-07-30 | 1 | -2/+5 |
* | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-30 | 1 | -1/+1 |
|\ |
|
| * | missing quotes on string in network update_unseen | zotlabs | 2017-07-29 | 1 | -1/+1 |
* | | implement file notification on initial upload and rename get_parent_cloudpath... | git-marijus | 2017-07-29 | 2 | -11/+9 |
|/ |
|