Commit Graph

19693 Commits

Author SHA1 Message Date
git-marijus 3faca10efc fix a bug where if multiple channels uploaded the same file to the same 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 2017-07-31 02:54:27 +02:00
git-marijus 280f52f007 close the apps-menu if the notifications-menu is open and vice versa 2017-07-31 02:52:36 +02:00
git-marijus 11cdd0033d no need for jquery here 2017-07-30 10:46:37 +02:00
git-marijus 222113ee57 version 2.6RC 2017-07-28 10:21:08 +02:00
git-marijus 53570de5a3 remove borders from navbar toggler 2017-07-27 20:47:49 +02:00
zotlabs 1376e59d00 improve the formatting of shares when converting from bbcode to markdown 2017-07-27 20:34:28 +02:00
zotlabs d623228cf6 suppress fopen errors from dav 2017-07-27 20:31:27 +02:00
zotlabs 75d63684b8 remove activitypub components from core 2017-07-27 20:29:24 +02:00
zotlabs d3d184192d issue with OStatus comments being propagated downstream 2017-07-27 11:31:22 +02:00
git-marijus e71cdf02a8 move the active app code to include/nav.php - it is only relevant there 2017-07-26 21:42:07 +02:00
git-marijus caf077cbf8 version 2.5.10 2017-07-25 20:07:16 +02:00
git-marijus 5cc8837fb6 make local channel (not our own) nav menus appear similar to what we are used from remote channels 2017-07-25 20:06:01 +02:00
git-marijus 72ed290ccd add text-dark class to cat tagsinput 2017-07-22 16:23:41 +02:00
git-marijus 16067db718 show the right conversation active and do not show any conversation active if we compose a new one 2017-07-22 12:46:02 +02:00
git-marijus 363d872326 Merge remote-tracking branch 'mike/master' into dev 2017-07-22 12:08:47 +02:00
git-marijus f4a4d70149 indicate the selected channel in the dropdown menu and minor css fixes 2017-07-22 12:01:13 +02:00
git-marijus 4335e49381 more nav_set_selected 2017-07-22 11:04:18 +02:00
zotlabs 992f8272d3 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-07-21 16:20:50 -07:00
git-marijus 27678a523c more nav_set_selected apps 2017-07-21 22:36:47 +02:00
git-marijus 1bdcfe5219 provide a mechanism to mark apps active in the bin 2017-07-21 10:32:21 +02:00
zotlabs 89d21c0873 begin the tedious process of mapping activities between AS1, zot, and AS2 2017-07-20 22:55:04 -07:00
zotlabs 23e2b3be09 allow wildcard tag searches in search module also 2017-07-20 18:30:48 -07:00
zotlabs a346399fe6 allow wildcard tag and category searches 2017-07-20 18:11:47 -07:00
git-marijus 8e5c56dcc2 more css fixes 2017-07-20 12:03:54 +02:00
git-marijus 77b58ec02f css fix 2017-07-20 11:56:46 +02:00
zotlabs ceeb9836b9 implement update_feed_item 2017-07-19 20:31:11 -07:00
zotlabs df7f0eb9a4 hubzilla issue #832 2017-07-19 18:32:16 -07:00
zotlabs 6103c30184 provide optional salmon signatures for AP entities 2017-07-18 21:16:18 -07:00
zotlabs b52a968c74 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge 2017-07-18 19:16:47 -07:00
zotlabs 82aa87c190 ability to use a portion of the message-id to display a message wasn't honoured in all cases. 2017-07-18 17:02:50 -07:00
zotlabs 1af844e474 related to hubzilla issue #831 - system.last_expire_day was not being set correctly, causing cron_daily to run more frequently than desired. 2017-07-18 16:14:01 -07:00
git-marijus 229f95d555 some fixes for the bs-default schema 2017-07-18 15:45:45 +02:00
git-marijus ac6ebeee47 Merge remote-tracking branch 'mike/master' into dev 2017-07-18 14:26:08 +02:00
git-marijus 08c0d78296 issue #827 provide backward compatibility for album links generated in earlier times before the ambiguity of photo album names was solved. This may provide incorrect results if two or more photo albums with the same basename exist in different directories of the file tree; but there is no easy way to solve that ambiguity - which is why the link format changed. 2017-07-18 13:56:09 +02:00
zotlabs 9daa3b85c8 some corrections to AS encoding based on the current spec (some of this work was completed long before the spec settled). 2017-07-17 22:52:19 -07:00
zotlabs d8c93c0d13 activitypub, cont. 2017-07-17 22:17:40 -07:00
zotlabs 42abc2201c Merge branch 'bug827' 2017-07-17 20:00:07 -07:00
zotlabs 27257de995 fix typo 2017-07-17 19:57:25 -07:00
zotlabs 15e836b7dd provide content-type matching ability for activitypub 2017-07-17 19:53:03 -07:00
zotlabs 0d062251b6 fix for bug 827 to provide partial backward compatibility with album names in photo items from < hubzilla 2.4
this will only work part of the time - which is why the behaviour was changed
2017-07-17 19:42:30 -07:00
zotlabs ecb1515e5d activitystreams converters updated to recent spec 2017-07-17 19:28:27 -07:00
git-marijus 4728e72d18 some love for the installer 2017-07-17 16:19:19 +02:00
zotlabs c352047228 mis-attributed profile photo when Mastodon comment author has no profile photo 2017-07-16 22:51:36 -07:00
zotlabs 1aedf22228 initial activitystreams2 parser 2017-07-16 22:28:28 -07:00
git-marijus 5408264559 Merge remote-tracking branch 'mike/master' into dev 2017-07-16 21:02:28 +02:00
git-marijus bd17dc52f2 fix photo item comments 2017-07-16 16:25:52 +02:00
git-marijus ce3be598bb fix album link 2017-07-16 15:59:19 +02:00
zotlabs e891199a23 deal with mastodon privacy scopes - mark private and block commenting since we refuse to send private activities through the public OStatus connector. 2017-07-15 15:49:10 -07:00
zotlabs b1d4e97699 incorrect follow url in webfinger 2017-07-14 14:03:56 -07:00
Mario Vavti 16dcaaa3a8 version 2017-07-14 16:37:39 +02:00