Commit Graph

  • ee307729fc Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-11 15:14:18 -07:00
  • 48d2b3afa8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-11 15:13:57 -07:00
  • 491856fa79 the template is needed for the old-style notifications zotlabs 2017-10-11 15:12:49 -07:00
  • 56a675f713 z-index issue and some icons. rename notifications-btn-1 to notifications-btn Mario Vavti 2017-10-11 21:32:23 +02:00
  • 05c8d4819d only show pubs notifications if discovery_tab != disabled Mario Vavti 2017-10-11 14:26:18 +02:00
  • c8d5390512 move affinity slider lower on screens < 767px to not collide with the page menu button Mario Vavti 2017-10-11 13:18:18 +02:00
  • f3cf708c85 remove region nav entry in network.pdl - it is not needed Mario Vavti 2017-10-11 12:42:16 +02:00
  • 24d1d752fe nav_set_selected() for apps and apporder. restrict apporder to local_channel() and whitespace Mario Vavti 2017-10-11 11:58:09 +02:00
  • ba55400f14 bring nav pinned apps to navbar_default Mario Vavti 2017-10-11 11:49:03 +02:00
  • 0c5918f290 bring back some nav stuff (notifications) for alternate navbars; still some things missing as the notification dropdowns aren't fully functional. zotlabs 2017-10-11 01:21:00 -07:00
  • 0216dc733d fix typos in comment Felix Wolfsteller 2017-10-11 09:13:59 +02:00
  • ff8ee6fb22 for federated forums we need to keep track of what protocols are available to red/hubzilla channels to determine which posts need to be mangled for transport to individual networks - based on what networks the author can communicate with. We probably need this for all xchans and hublocs but at some point it becomes increasingly difficult to scrape this information and map out a compatibility matrix. It's also doubtful anybody will use this system because we basically have to forge comments between network sites involving different protocols and this is going to look like crap to anybody that isn't on red/Hubzilla. Eventually they have to fix their protocols for this to work correctly, but nobody seems to believe me that their networks are basically anti-federation, so we need something like this to highlight their walled garden specifications and the resulting federation problems in a form they can't really argue with. zotlabs 2017-10-10 22:02:22 -07:00
  • 1a7ccc462b on failed auth due to unverified email, tell the person why and remind them to check their email. zotlabs 2017-10-10 19:45:11 -07:00
  • 769da564e2 re-order the navbar preferences - 1. profile_uid, 2. local_channel, 3, site, 4 'default' zotlabs 2017-10-10 19:22:24 -07:00
  • 09b4660c7d rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection code is consistent zotlabs 2017-10-10 18:50:01 -07:00
  • 69394c1680 re-implement single delivery zotlabs 2017-10-10 18:40:02 -07:00
  • 4203d43c58 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-10 16:06:09 -07:00
  • f273815d8f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-10 16:05:56 -07:00
  • 6a2c5e0731 pdledit usability improvements zotlabs 2017-10-10 16:05:10 -07:00
  • 07ae431950 css fixes Mario Vavti 2017-10-10 20:02:42 +02:00
  • 0c4a1fb9be version Mario Vavti 2017-10-10 19:28:11 +02:00
  • e6f1fb3d95 remove notifications code from nav and go live with new notifications Mario Vavti 2017-10-10 16:51:35 +02:00
  • 030d703a05 remove left_align mode Mario Vavti 2017-10-10 16:03:59 +02:00
  • edc262f5af Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-10-10 12:09:32 +02:00
  • 41cf846ee3 new notification fixes Mario Vavti 2017-10-10 12:08:51 +02:00
  • 335536bbbf more custom navbar work zotlabs 2017-10-09 20:19:03 -07:00
  • 89aa9a80c4 typo zotlabs 2017-10-09 15:51:30 -07:00
  • d636ff586d Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-09 15:15:02 -07:00
  • 8797049144 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-09 15:14:44 -07:00
  • 623dfa1384 purify user-supplied filenames in some cases. Probably not needed but it's the right thing to do. zotlabs 2017-10-09 15:13:25 -07:00
  • cc1ffff7cd feed untranslated appnames to nav_set_selected() and query for the active app directly to get app details Mario Vavti 2017-10-09 21:22:57 +02:00
  • 5698462588 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-10-09 17:49:55 +02:00
  • f99c007187 new notification changes - use sticky_kit instead of position fixed Mario Vavti 2017-10-09 17:49:15 +02:00
  • 54a0690323 more new notifications fixes Mario Vavti 2017-10-09 13:35:58 +02:00
  • 23812e5b48 ability to pin apps to the navbar when using named navbars zotlabs 2017-10-08 19:43:03 -07:00
  • c37908f344 check write_storage permission in /display zotlabs 2017-10-08 17:22:38 -07:00
  • 4011dd18f0 alternate navbar layouts zotlabs 2017-10-08 16:48:24 -07:00
  • 52b1ea10a1 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-08 15:10:44 -07:00
  • 09009d4b32 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-08 15:10:28 -07:00
  • ec173e7eb2 more fixes Mario Vavti 2017-10-08 22:47:43 +02:00
  • bcf4cb519a new notification fixes Mario Vavti 2017-10-08 22:21:19 +02:00
  • 27bc8294ae Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-08 12:43:50 -07:00
  • 5cc6c6c1e9 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-08 12:42:54 -07:00
  • 991db280be experimental new notifications - needs pconfig experimental_notif set to 1 for your channel to work. Mario Vavti 2017-10-08 17:19:29 +02:00
  • 6f709a6f57 navbar controls now functionally hidden with too low z-index when cover_photo is showing and navbar doesn't have class fixed-top zotlabs 2017-10-07 23:44:27 -07:00
  • 71c206fdb9 pubstream single view fixes Mario Vavti 2017-10-07 16:40:43 +02:00
  • 4c0e8a61ae provide single post view for pubstream and rewrite llink to point to /pubstream/?f=&mid=some_mid instead of /display/some_mid for pubs notifications Mario Vavti 2017-10-07 15:40:34 +02:00
  • dc2c6d00fe fix filestorage spinner Mario Vavti 2017-10-07 12:34:43 +02:00
  • e7c8012794 no need to move $modrated check up Mario Vavti 2017-10-06 22:25:53 +02:00
  • 9bd30eb8bf to find out if a comment is to be moderated we need to look at the actual comment not at its parent Mario Vavti 2017-10-06 21:32:06 +02:00
  • b883b9c983 enable anonymous comments also in /display Mario Vavti 2017-10-06 21:30:44 +02:00
  • 5468ebbb43 Revert "mod display: if we have a local channel we should still be allowed to see sys channel items" Mario Vavti 2017-10-06 21:05:37 +02:00
  • 27f8320353 mod display: if we have a local channel we should still be allowed to see sys channel items Mario Vavti 2017-10-06 16:51:39 +02:00
  • e15307747f it is not your public stream -> just public stream Mario Vavti 2017-10-06 16:48:25 +02:00
  • f427b4a325 introduce public stream notifications Mario Vavti 2017-10-06 16:46:27 +02:00
  • a6835f4e71 changes to encryption encapsulation for zot6 (backward compatible) zotlabs 2017-10-05 23:01:42 -07:00
  • 052ed1f88b typo zotlabs 2017-10-05 22:01:45 -07:00
  • 34a0ec4089 Add JSalmon signing library for Zot6. See https://macgirvin.com/wiki/mike/Zot%2BVI/Encryption/Signatures zotlabs 2017-10-05 20:09:21 -07:00
  • 2ed77b5986 add admin app - the site admin link probably does not belong in the 'usermenu' and this is a first step to straigtening out that historical mistake. zotlabs 2017-10-05 19:51:00 -07:00
  • d70e6f273b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-05 19:24:16 -07:00
  • d2e22d8c2f Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-05 19:24:03 -07:00
  • 7c501ef60f update some old spinners which were causing js issues zotlabs 2017-10-05 19:20:39 -07:00
  • a0eb628526 Experimental alternate channel_menu navigation. To use, "util/config system.channel_menu 1" zotlabs 2017-10-05 16:59:33 -07:00
  • 0ddc3e4af2 fix wrong logic for enable/disable pubstream notifications Mario Vavti 2017-10-05 21:42:25 +02:00
  • 5be9477f21 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-10-05 11:25:39 +02:00
  • 4ab21edba8 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-04 19:37:50 -07:00
  • 2862baeee1 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-04 19:37:35 -07:00
  • 15b9a67c01 redirect loop with rmagic and owa zotlabs 2017-10-04 18:51:37 -07:00
  • 80ca99fe5b wiki double encoding html entities zotlabs 2017-10-04 16:37:14 -07:00
  • 6f88d5e92b introduce shared files notifications Mario Vavti 2017-10-04 22:11:18 +02:00
  • 295ed07d40 bring back notifications for account approvals Mario Vavti 2017-10-04 13:37:17 +02:00
  • d6b1eff70e ensure we have an observer hash zotlabs 2017-10-03 17:05:32 -07:00
  • 7fb02752de hubzilla issue #868 zotlabs 2017-10-03 17:03:24 -07:00
  • d88d4b3c3a wrong param zotlabs 2017-10-03 15:43:51 -07:00
  • 58155864cb urlencode hashes from mod_acl zotlabs 2017-10-03 15:36:56 -07:00
  • 9cf9217686 don't use chanlink_url() for feed mentions zotlabs 2017-10-03 15:27:26 -07:00
  • fa93114804 some basic work on mod common Mario Vavti 2017-10-03 11:37:45 +02:00
  • 66511d8f07 move common connections widget to left aside Mario Vavti 2017-10-03 10:53:08 +02:00
  • f52e5d90b0 Merge remote-tracking branch 'mike/master' into dev Mario Vavti 2017-10-03 09:40:51 +02:00
  • f571b753b6 import: special handling required for channel photo in the xchan record when not seizing 'primary' zotlabs 2017-10-02 20:27:04 -07:00
  • 40e747ecde remove server role selection details from install documentation, no longer needed zotlabs 2017-10-02 18:46:24 -07:00
  • 9e24b28376 Hubzilla issue #866 allow navbar to be used when cover photo is displayed - also scroll cover photo on keyup event. zotlabs 2017-10-02 17:57:17 -07:00
  • 5abdee73ee Clone sync deletions to comments (which belong to you) on wall posts (which do not). zotlabs 2017-10-02 16:26:33 -07:00
  • 2feb6795b0 fix community tags not preserved on post edit. issue #865 Mario Vavti 2017-10-02 12:54:25 +02:00
  • c200808fbb fix community tags not preserved on post edit. issue #865 Mario Vavti 2017-10-02 12:54:25 +02:00
  • 1f8b705a6a whitespace Mario Vavti 2017-10-02 12:16:53 +02:00
  • a3c2ef4084 wiki: show save button and commit input field in all tabs if there is unsaved content. fix #853 Mario Vavti 2017-10-02 12:11:52 +02:00
  • 9dcbef4cb1 profile photo propagation issue if the local xchan_photo_[l|m|s] fields were changed from the /photo/profile/l/n form to photo/[hash] form by a clone operation. zotlabs 2017-10-01 18:22:55 -07:00
  • 8bd4e004ff Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge zotlabs 2017-10-01 17:05:20 -07:00
  • 47b2959486 Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-10-01 17:04:47 -07:00
  • f70d27b793 Merge pull request #863 from mjfriaza/dev git-marijus 2017-10-01 22:49:41 +02:00
  • 7c845aafa2 card_edit: fix lockstate and current permissions not handed over to editor Mario Vavti 2017-10-01 22:46:35 +02:00
  • 16b57a2b28 Fixed the Spanish translation Manuel Jiménez Friaza 2017-10-01 13:12:09 +02:00
  • 89457c8390 fix profile edit dropdown for multiple profiles Mario Vavti 2017-10-01 10:24:33 +02:00
  • ea4d1b5101 use imagick converter for large photos zotlabs 2017-09-30 15:17:47 -07:00
  • dd38fad9ee Update administrator_guide.md Andrew Manning 2017-09-30 09:44:40 -04:00
  • c61853ff0b Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge zotlabs 2017-09-28 14:24:41 -07:00
  • bdecb61bfa remove double remote login button and slightly change appearence Mario Vavti 2017-09-28 11:31:36 +02:00
  • c9231785ab Merge pull request #860 from waitman/patch-2 git-marijus 2017-09-28 11:02:23 +02:00
  • f79d5ec18e Merge pull request #861 from waitman/patch-3 git-marijus 2017-09-28 11:01:46 +02:00