aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-08-015-29/+31
|\
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-318-31/+26
| |\
| * | typozotlabs2017-07-301-1/+1
| | |
| * | modify connection edit display for channels with no address/webbiezotlabs2017-07-304-15/+18
| | |
| * | ensure we can work around the $is_http var in include/follow - this is left ↵zotlabs2017-07-301-14/+13
| | | | | | | | | | | | over from when the only non-webfinger connections we could make were RSS/Atom feeds.
* | | correct the logic for configs in app requirementgit-marijus2017-08-012-7/+26
| |/ |/|
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into devMario Vavti2017-08-017-31/+25
|\ \
| * | improve file_activity() a littlegit-marijus2017-07-313-29/+9
| | |
| * | db update to add index for item.obj_typegit-marijus2017-07-314-2/+16
| |/
* / less badge more iconMario Vavti2017-08-011-0/+1
|/
* Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-312-3/+16
|\
| * provide a better "is_commentable" default for OStatus conversations that ↵zotlabs2017-07-301-1/+12
| | | | | | | | were fetched on the fly
| * add options flag to bb_to_markdown so we can distinguish between diaspora ↵zotlabs2017-07-301-2/+4
| | | | | | | | | | | | use and other use and therefore filter and adjust content selectively
| * Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-298-21/+40
| |\
* | | disable file notifications on initial upload for now - it can behave funky ↵git-marijus2017-07-312-4/+4
| | | | | | | | | | | | when uploading multiple small files at once
* | | implement system configs as app requirement and add the pubstream appgit-marijus2017-07-312-4/+16
| | |
* | | fix a bug where if multiple channels uploaded the same file to the same ↵git-marijus2017-07-301-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-marijus2017-07-302-2/+4
| | | | | | | | | | | | and go to created folder after successfully creating one
* | | another syntax errorgit-marijus2017-07-301-1/+1
| | |
* | | do not include ACTIVITY_OBJ_FILE obj_type in the ping/something querygit-marijus2017-07-301-2/+5
| | |
* | | no need for jquery heregit-marijus2017-07-302-2/+8
| | |
* | | Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-301-1/+1
|\| | | |/ |/|
| * missing quotes on string in network update_unseenzotlabs2017-07-291-1/+1
| |
* | implement file notification on initial upload and rename ↵git-marijus2017-07-295-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 versagit-marijus2017-07-293-2/+14
|/
* make pubs notification available on small screensgit-marijus2017-07-291-2/+2
|
* provide public stream notification also for not authenticated viewersgit-marijus2017-07-292-3/+8
|
* switch back to filter by ACTIVITY_OBJ_FILE for marking items read in ↵git-marijus2017-07-291-2/+2
| | | | /network since item_notshown is also used for likes
* fix notifications - item_notshown is set for likes, etc.zotlabs2017-07-291-2/+3
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-2811-17/+110
|\
| * filter by item_notshown instead of obj_typegit-marijus2017-07-282-5/+4
| |
| * do not show obj_type ACTIVITY_OBJ_FILE under activity notifications and do ↵git-marijus2017-07-282-3/+6
| | | | | | | | not mark those read in /network
| * initial notifications support for new shared files and new (since initial ↵git-marijus2017-07-289-11/+102
| | | | | | | | site load) pubstream activity
| * version 2.7git-marijus2017-07-281-1/+1
| |
| * default to static updates if not local channelgit-marijus2017-07-272-2/+2
| |
| * remove borders from navbar togglergit-marijus2017-07-271-1/+1
| |
| * Merge remote-tracking branch 'mike/master' into devgit-marijus2017-07-2712-220/+512
| |\
* | | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-262-3/+3
|\| | | |/ |/|
| * move the active app code to include/nav.php - it is only relevant theregit-marijus2017-07-262-3/+3
| |
* | issue with OStatus comments being propagated downstreamzotlabs2017-07-261-0/+15
| |
* | remove activitypub components from corezotlabs2017-07-261-182/+0
| |
* | more work on signature algorithm choicezotlabs2017-07-261-12/+16
| |
* | improve the formatting of shares when converting from bbcode to markdownzotlabs2017-07-261-0/+69
| |
* | start to implement the code needed for verifying variable signature algorithmszotlabs2017-07-251-15/+31
| |
* | consolidate duplicated codezotlabs2017-07-251-208/+59
| |
* | sync key changes to cloneszotlabs2017-07-252-6/+111
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-07-2521-46/+61
|\|
| * version 2.5.10git-marijus2017-07-251-1/+1
| |
| * make local channel (not our own) nav menus appear similar to what we are ↵git-marijus2017-07-252-14/+14
| | | | | | | | used from remote channels
| * add text-dark class to cat tagsinputgit-marijus2017-07-221-1/+1
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-28 19:17:06 +0000