| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge pull request #834 from mjfriaza/dev | git-marijus | 2017-08-02 | 2 | -2291/+2341 |
| |\ | | | | | Updated the Spanish translation | ||||
| | * | Updated the Spanish translation | Manuel Jiménez Friaza | 2017-08-02 | 2 | -2291/+2341 |
| | | | |||||
| * | | css fix | git-marijus | 2017-08-02 | 1 | -0/+1 |
| | | | |||||
| * | | do not show pubs notifications for items with ACTIVITY_OBJ_FILE obj_type | git-marijus | 2017-08-01 | 1 | -1/+3 |
| | | | |||||
| * | | finally fix recursive attachments permissions | git-marijus | 2017-08-01 | 1 | -54/+79 |
| | | | |||||
| * | | use small line-height only for larger screens | git-marijus | 2017-08-01 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-08-01 | 1 | -6813/+6724 |
| |\ \ | |||||
| | * | | strings | Mario Vavti | 2017-08-01 | 1 | -6813/+6724 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-08-01 | 2 | -7/+26 |
| | |\ \ | |||||
| | * \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-08-01 | 1 | -0/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-07-31 | 5 | -29/+31 |
| | |\ \ \ \ | |||||
| * | | | | | | remove blugrid schema until somebody cares to fix it | Mario Vavti | 2017-08-01 | 2 | -543/+0 |
| | |_|_|/ / |/| | | | | |||||
| * | | | | | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-08-01 | 5 | -29/+31 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-31 | 8 | -31/+26 |
| | |\ \ \ \ \ | | |_|/ / / | |/| | / / | | | |/ / | | |/| | | |||||
| | * | | | | typo | zotlabs | 2017-07-30 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | modify connection edit display for channels with no address/webbie | zotlabs | 2017-07-30 | 4 | -15/+18 |
| | | | | | | |||||
| | * | | | | ensure we can work around the $is_http var in include/follow - this is left ↵ | zotlabs | 2017-07-30 | 1 | -14/+13 |
| | | | | | | | | | | | | | | | | | | | | | over from when the only non-webfinger connections we could make were RSS/Atom feeds. | ||||
| * | | | | | correct the logic for configs in app requirement | git-marijus | 2017-08-01 | 2 | -7/+26 |
| | |/ / / |/| | | | |||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | Mario Vavti | 2017-08-01 | 7 | -31/+25 |
| |\ \ \ \ | | |/ / | |/| | | |||||
| | * | | | improve file_activity() a little | git-marijus | 2017-07-31 | 3 | -29/+9 |
| | | | | | |||||
| | * | | | db update to add index for item.obj_type | git-marijus | 2017-07-31 | 4 | -2/+16 |
| | |/ / | |||||
| * / / | less badge more icon | Mario Vavti | 2017-08-01 | 1 | -0/+1 |
| |/ / | |||||
| * | | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-31 | 2 | -3/+16 |
| |\ \ | |||||
| | * | | provide a better "is_commentable" default for OStatus conversations that ↵ | zotlabs | 2017-07-30 | 1 | -1/+12 |
| | | | | | | | | | | | | | were fetched on the fly | ||||
| | * | | add options flag to bb_to_markdown so we can distinguish between diaspora ↵ | zotlabs | 2017-07-30 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | | | use and other use and therefore filter and adjust content selectively | ||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-29 | 8 | -21/+40 |
| | |\ \ | |||||
| * | | | | disable file notifications on initial upload for now - it can behave funky ↵ | git-marijus | 2017-07-31 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | | when uploading multiple small files at once | ||||
| * | | | | implement system configs as app requirement and add the pubstream app | git-marijus | 2017-07-31 | 2 | -4/+16 |
| | | | | | |||||
| * | | | | fix a bug where if multiple channels uploaded the same file to the same ↵ | git-marijus | 2017-07-30 | 1 | -2/+4 |
| | | | | | | | | | | | | | | | | | folder, the uploaded file would end up with an incremental number added to the filename for each upload even if the file did not exist yet in the channels folder | ||||
| * | | | | ltrim $display_path in attach_store() to be consistent with attach_mkdir() ↵ | git-marijus | 2017-07-30 | 2 | -2/+4 |
| | | | | | | | | | | | | | | | | | and go to created folder after successfully creating one | ||||
| * | | | | 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 |
| | | | | | |||||
| * | | | | no need for jquery here | git-marijus | 2017-07-30 | 2 | -2/+8 |
| | | | | | |||||
| * | | | | 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 ↵ | git-marijus | 2017-07-29 | 5 | -19/+26 |
| | | | | | | | | | | | | | get_parent_cloudpath() to get_cloud_url() which now includes the filename | ||||
| * | | | close the apps-menu if the notifications-menu is open and vice versa | git-marijus | 2017-07-29 | 3 | -2/+14 |
| |/ / | |||||
| * | | make pubs notification available on small screens | git-marijus | 2017-07-29 | 1 | -2/+2 |
| | | | |||||
| * | | provide public stream notification also for not authenticated viewers | git-marijus | 2017-07-29 | 2 | -3/+8 |
| | | | |||||
| * | | switch back to filter by ACTIVITY_OBJ_FILE for marking items read in ↵ | git-marijus | 2017-07-29 | 1 | -2/+2 |
| | | | | | | | | | /network since item_notshown is also used for likes | ||||
| * | | fix notifications - item_notshown is set for likes, etc. | zotlabs | 2017-07-29 | 1 | -2/+3 |
| | | | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-28 | 11 | -17/+110 |
| |\ \ | |||||
| | * | | filter by item_notshown instead of obj_type | git-marijus | 2017-07-28 | 2 | -5/+4 |
| | | | | |||||
| | * | | do not show obj_type ACTIVITY_OBJ_FILE under activity notifications and do ↵ | git-marijus | 2017-07-28 | 2 | -3/+6 |
| | | | | | | | | | | | | | not mark those read in /network | ||||
| | * | | initial notifications support for new shared files and new (since initial ↵ | git-marijus | 2017-07-28 | 9 | -11/+102 |
| | | | | | | | | | | | | | site load) pubstream activity | ||||
| | * | | version 2.7 | git-marijus | 2017-07-28 | 1 | -1/+1 |
| | | | | |||||
| | * | | default to static updates if not local channel | git-marijus | 2017-07-27 | 2 | -2/+2 |
| | | | | |||||
| | * | | remove borders from navbar toggler | git-marijus | 2017-07-27 | 1 | -1/+1 |
| | | | | |||||
| | * | | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-07-27 | 12 | -220/+512 |
| | |\ \ | |||||
| * | | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-26 | 2 | -3/+3 |
| |\| | | | |/ / |/| | | |||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |