| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | git-marijus | 2017-08-10 | 9 | -20/+22 |
| |\ | |||||
| | * | merge red/master into dev | Mario Vavti | 2017-08-10 | 9 | -20/+22 |
| | | | |||||
| * | | update changelog | git-marijus | 2017-08-09 | 1 | -0/+1 |
| |/ | |||||
| * | App::get_channel() does not return the right channel if we are not looking ↵ | git-marijus | 2017-08-09 | 1 | -7/+1 |
| | | | | | at our own channel. fix issue #841 | ||||
| * | only show upload button to those with write_storage permission | zotlabs | 2017-08-08 | 2 | -0/+3 |
| | | |||||
| * | support upload of files and attachments into comments. This has some ↵ | zotlabs | 2017-08-08 | 5 | -0/+49 |
| | | | | | repercussions when it comes to post permissions since the commenter will not know the distribution of the post. Basically the files will be uploaded with the commenter's default ACL. Most of the time this will do the right thing. | ||||
| * | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-08 | 1 | -1/+95 |
| |\ | |||||
| | * | changelog | git-marijus | 2017-08-08 | 1 | -1/+95 |
| | | | |||||
| * | | remove some no longer used images/icons | zotlabs | 2017-08-07 | 11 | -0/+0 |
| |/ | |||||
| * | ostatus feed was missing comments | zotlabs | 2017-08-06 | 2 | -9/+5 |
| | | |||||
| * | Merge pull request #838 from phellmes/dev | git-marijus | 2017-08-06 | 2 | -2361/+2411 |
| |\ | | | | | Update DE translation strings (also for 2.6RC) | ||||
| | * | Update DE translation strings | phellmes | 2017-08-05 | 2 | -2361/+2411 |
| | | | |||||
| * | | Merge pull request #839 from anaqreon/doco | git-marijus | 2017-08-06 | 2 | -0/+9 |
| |\ \ | | | | | | | Fix CSS for help page content list in sidebar. | ||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into doco | Andrew Manning | 2017-08-05 | 20 | -52/+81 |
| | |\| | |||||
| | * | | Fix CSS for help page content list in sidebar. | www-data | 2017-08-03 | 2 | -0/+9 |
| | | | | |||||
| * | | | make config requirements in apps more universal - provide key and value | git-marijus | 2017-08-06 | 2 | -8/+6 |
| | | | | |||||
| * | | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev | git-marijus | 2017-08-06 | 5 | -0/+198 |
| |\ \ \ | |||||
| | * | | | allow channel address to be changed | zotlabs | 2017-08-04 | 4 | -0/+195 |
| | | | | | |||||
| | * | | | auto preview mail on media insertion also | zotlabs | 2017-08-03 | 1 | -0/+3 |
| | | |/ | |/| | |||||
| * / | | consolidate disable_discover_tab config if it was not yet set to either 1 or ↵ | git-marijus | 2017-08-06 | 7 | -12/+15 |
| |/ / | | | | | | | 0 in DB | ||||
| * | | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-08-03 | 15 | -22/+52 |
| |\ \ | |||||
| | * | | some bb-to-markdown issues | zotlabs | 2017-08-03 | 1 | -5/+2 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-02 | 2 | -2291/+2341 |
| | |\| | |||||
| | * | | minor activitypub rendering stuff | zotlabs | 2017-08-02 | 2 | -2/+2 |
| | | | | |||||
| | * | | plugin hook for update_unseen | zotlabs | 2017-08-01 | 5 | -13/+38 |
| | | | | |||||
| | * | | add auto post preview to 'select photo from albums' | zotlabs | 2017-08-01 | 1 | -0/+1 |
| | | | | |||||
| | * | | auto preview comments also on media/link add | zotlabs | 2017-08-01 | 1 | -0/+1 |
| | | | | |||||
| | * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-01 | 9 | -7419/+6834 |
| | |\ \ | |||||
| | * | | | auto preview when inserting a media item or embed into a post. Since this ↵ | zotlabs | 2017-08-01 | 6 | -2/+8 |
| | | | | | | | | | | | | | | | | | unanticipated action could be alarming (some might think the post was actually submitted), also provide a visible preview indicator within the previewed content. Remove the css for the old striped background image which hasn't been available for previewed content for a year or two. | ||||
| * | | | | missing observer hash | git-marijus | 2017-08-03 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | fix issue #836 - missing opening form tag | git-marijus | 2017-08-03 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | fix attachment upload for private mail | git-marijus | 2017-08-03 | 2 | -28/+26 |
| | | | | | |||||
| * | | | | return preview also if we have no attachment | git-marijus | 2017-08-03 | 1 | -1/+1 |
| | |_|/ |/| | | |||||
| * | | | 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. | ||||
 |
index : volse-hubzilla.git | |
| Volse Hubzilla -- soft fork of main Hubzilla core for Volse | Harald Eilertsen |
| aboutsummaryrefslogtreecommitdiffstats |