Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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. | ||||
* | | | | | 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 |
| | | | |