Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'mike/master' into dev | Mario Vavti | 2017-08-24 | 4 | -1/+19 |
|\ | |||||
| * | add tasklist and notes to cards page | zotlabs | 2017-08-23 | 1 | -1/+4 |
| | | |||||
| * | cards: make likes reload page | zotlabs | 2017-08-23 | 2 | -2/+3 |
| | | |||||
| * | partial support (unfinished) for ajax loading cards with liveupdate; page ↵ | zotlabs | 2017-08-23 | 1 | -0/+1 |
| | | | | | | | | still functions even though this isn't finished | ||||
| * | apply autotime to all autotime classed elements when static loading a page | zotlabs | 2017-08-23 | 1 | -2/+1 |
| | | |||||
| * | add autotime to cards | zotlabs | 2017-08-23 | 1 | -0/+4 |
| | | |||||
| * | several card enhancements | zotlabs | 2017-08-23 | 1 | -2/+2 |
| | | |||||
| * | cards feature | zotlabs | 2017-08-23 | 3 | -2/+12 |
| | | |||||
* | | Repaired and extended support for help page translations including table of ↵ | Andrew Manning | 2017-08-23 | 2 | -18/+74 |
|/ | | | | contents files at the top level. Moved help module javascript to mod_help.js. | ||||
* | script html tags in js file | zotlabs | 2017-08-19 | 1 | -2/+0 |
| | |||||
* | put unseen network count in page title; hubzilla issue #843 | zotlabs | 2017-08-15 | 1 | -1/+6 |
| | |||||
* | contact_slider.tpl didn't get updated with one of the bootstrap changes ↵ | zotlabs | 2017-08-13 | 1 | -3/+3 |
| | | | | where 'in' was renamed to 'show' | ||||
* | minor js and css changes | git-marijus | 2017-08-12 | 2 | -7/+13 |
| | |||||
* | only show upload button to those with write_storage permission | zotlabs | 2017-08-08 | 1 | -0/+2 |
| | |||||
* | support upload of files and attachments into comments. This has some ↵ | zotlabs | 2017-08-08 | 4 | -0/+48 |
| | | | | 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. | ||||
* | remove some no longer used images/icons | zotlabs | 2017-08-07 | 11 | -0/+0 |
| | |||||
* | 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 | 1 | -0/+8 |
|\ \ | | | | | | | 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 | 8 | -30/+34 |
| |\| | |||||
| * | | Fix CSS for help page content list in sidebar. | www-data | 2017-08-03 | 1 | -0/+8 |
| | | | |||||
* | | | allow channel address to be changed | zotlabs | 2017-08-04 | 1 | -0/+20 |
| | | | |||||
* | | | auto preview mail on media insertion also | zotlabs | 2017-08-03 | 1 | -0/+3 |
| |/ |/| | |||||
* | | Merge remote-tracking branch 'mike/master' into dev | git-marijus | 2017-08-03 | 5 | -2/+7 |
|\ \ | |||||
| * | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-08-02 | 2 | -2291/+2341 |
| |\| | |||||
| * | | 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 | 4 | -544/+2 |
| |\ \ | |||||
| * | | | auto preview when inserting a media item or embed into a post. Since this ↵ | zotlabs | 2017-08-01 | 4 | -2/+5 |
| | | | | | | | | | | | | | | | | 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. | ||||
* | | | | 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 |
| |_|/ |/| | | |||||
* | | | 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 |
| | | | |||||
* | | | use small line-height only for larger screens | git-marijus | 2017-08-01 | 1 | -1/+1 |
| | | | |||||
* | | | remove blugrid schema until somebody cares to fix it | Mario Vavti | 2017-08-01 | 2 | -543/+0 |
| |/ |/| | |||||
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge | zotlabs | 2017-07-31 | 1 | -0/+1 |
|\ \ | |||||
| * | | less badge more icon | Mario Vavti | 2017-08-01 | 1 | -0/+1 |
| | | | |||||
* | | | modify connection edit display for channels with no address/webbie | zotlabs | 2017-07-30 | 1 | -1/+1 |
|/ / | |||||
* | | disable file notifications on initial upload for now - it can behave funky ↵ | git-marijus | 2017-07-31 | 1 | -1/+1 |
| | | | | | | | | when uploading multiple small files at once | ||||
* | | no need for jquery here | git-marijus | 2017-07-30 | 2 | -2/+8 |
| | | |||||
* | | implement file notification on initial upload and rename ↵ | git-marijus | 2017-07-29 | 1 | -0/+1 |
| | | | | | | | | 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 |
| | | |||||
* | | initial notifications support for new shared files and new (since initial ↵ | git-marijus | 2017-07-28 | 4 | -2/+38 |
| | | | | | | | | site load) pubstream activity | ||||
* | | remove borders from navbar toggler | git-marijus | 2017-07-27 | 1 | -1/+1 |
| | | |||||
* | | make local channel (not our own) nav menus appear similar to what we are ↵ | git-marijus | 2017-07-25 | 1 | -6/+5 |
| | | | | | | | | used from remote channels | ||||
* | | add text-dark class to cat tagsinput | git-marijus | 2017-07-22 | 1 | -1/+1 |
| | | |||||
* | | show the right conversation active and do not show any conversation active ↵ | git-marijus | 2017-07-22 | 1 | -1/+1 |
| | | | | | | | | if we compose a new one | ||||
* | | indicate the selected channel in the dropdown menu and minor css fixes | git-marijus | 2017-07-22 | 3 | -16/+4 |
| | |