Commit Graph
18547 Commits
Author SHA1 Message Date
Mario Vavti dd2a5e6b28 Merge branch 'dev' into wip-app-bin 2017-02-03 09:24:09 +01:00
zotlabs 7e1e9ac94a rename bb2diaspora.php to markdown.php 2017-02-02 19:12:48 -08:00
zotlabs 29daf1ecee unused since 2012 2017-02-02 18:16:44 -08:00
zotlabs c62df39ce3 move firefox social api configuration to plugin 2017-02-02 17:23:58 -08:00
zotlabs a91e7cbe8d move rsd service to twitter_api plugin 2017-02-02 15:25:35 -08:00
zotlabs 159f02ba07 build_pagehead hook added 2017-02-02 14:52:14 -08:00
zotlabs 2daafe80a5 move opensearch to plugins 2017-02-02 14:49:51 -08:00
Mario Vavti 028b2a655d whitespace cleanup 2017-02-02 20:39:06 +01:00
Mario Vavti fd52cefe09 provide separate collased menus for apps and notifications 2017-02-02 20:10:35 +01:00
Mario Vavti 0e0dee43ab Merge branch 'dev' into wip-app-bin 2017-02-02 14:27:13 +01:00
Mario Vavti e2ee565f05 cherry-pick nav-login changes 2017-02-02 14:24:19 +01:00
Mario Vavti 63e06578c4 use bootstrap dropdown for login 2017-02-02 14:19:23 +01:00
Mario Vavti a1f03015ec move channel manager up in the menu 2017-02-02 11:35:42 +01:00
Mario Vavti 8220a6584c remove apps from usermenu 2017-02-02 11:19:06 +01:00
Mario Vavti d4b51c491f do not use style in template 2017-02-02 10:59:20 +01:00
Mario Vavti 3f66d9f8cd do not use data-toggle on the badge and use fixed with for icons 2017-02-02 10:54:44 +01:00
Mario Vavti 852073fc68 dropdown menus should be restricted in height in normal view but not in collapsed view 2017-02-02 10:33:23 +01:00
Mario Vavti 17082cda3c remove badge hover effect 2017-02-02 10:15:05 +01:00
Mario Vavti 7ffa98118f really fix badge positions 2017-02-02 10:12:56 +01:00
Mario Vavti c3bada3c32 resolve merge conflict 2017-02-02 09:38:07 +01:00
zotlabs 23303391e0 move dreamhost hack to plugin 2017-02-01 22:45:03 -08:00
zotlabs 8ac8acc49c drug dealers have users 2017-02-01 18:18:41 -08:00
zotlabs 94290102b6 tested extensible permissions by adding wiki permissions. Discovered a couple of issues that needed attention in the process. 2017-02-01 18:05:02 -08:00
zotlabsandGitHub f94c244b9f Merge pull request #664 from anaqreon/doco
Doco updates
2017-02-02 12:52:09 +11:00
Andrew Manning ec823196e0 Remove old tags and mentions doco pages 2017-02-01 20:47:03 -05:00
Andrew Manning 957647bf06 Remove dead links 2017-02-01 20:43:47 -05:00
Andrew Manning df5524979d Integrate tags and mentions page doco into member guide. Fix bug when loading page with section link. Change URL when scrolling to stay current with viewed section to facilitate easy help page link sharing. 2017-02-01 20:39:27 -05:00
Andrew Manning 0ae3e50bd4 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-02-01 20:07:38 -05:00
zotlabs db710cd2df fix a few style issues with nav login panel 2017-02-01 14:45:52 -08:00
Andrew Manning 61407ad6c8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-02-01 17:08:46 -05:00
Mario Vavti 2e0180ba55 Merge branch 'dev' into wip-app-bin 2017-02-01 22:36:25 +01:00
Mario Vavti d476b7477b fix notifications badge positioning and rendering of submenus in collapsed mode 2017-02-01 22:24:37 +01:00
zotlabs ec037abf92 bookmarks missing from tags and mentions doc 2017-02-01 11:29:18 -08:00
Mario Vavti 1a56045b42 nav dropdown-menu overrides 2017-02-01 13:08:41 +01:00
Mario Vavti bf820beb79 remove experimental_app_bin config conditional 2017-02-01 12:59:56 +01:00
Mario Vavti cde7a3f66c more work on app-bin 2017-02-01 12:52:19 +01:00
zotlabs 4f99d641c5 superfluous whitespace cleanup 2017-01-31 17:32:52 -08:00
zotlabs f4aca35a88 move diaspora account import to the diaspora plugin 2017-01-31 16:01:47 -08:00
zotlabs 732065bf13 channel export - use a selected list of functional data categories to export; this allows one to export single data sets instead of always exporting everything we know about 2017-01-31 15:28:25 -08:00
Andrew Manning d3d540a28b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-01-31 17:36:42 -05:00
Mario Vavti a6cbebe03c hide featured app category in the app category widget 2017-01-31 12:53:33 +01:00
Mario Vavti e1b54b6843 fix typos 2017-01-31 09:43:58 +01:00
zotlabs aadbd5a92d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge 2017-01-30 15:05:10 -08:00
zotlabs 7b065365e0 consolidate hubloc storage 2017-01-30 15:01:22 -08:00
Mario Vavti d0827dbb3c provide a feature/unfeature app button 2017-01-30 15:17:46 +01:00
Andrew Manning fab103524a Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-01-30 06:03:53 -05:00
zotlabsandGitHub 15be542e56 Merge pull request #662 from anaqreon/affinity-settings
Affinity settings
2017-01-30 18:04:53 +11:00
zotlabs eebea70019 queue optimisations for sites that have lingered in the queue for more than a couple of days. 2017-01-29 17:16:06 -08:00
Andrew Manning b58d56826b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev 2017-01-29 20:02:34 -05:00
Andrew Manning e770768b79 Link to Guest Access Tokens doco in context help. 2017-01-29 20:02:31 -05:00