aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-221-4/+2
|\
| * wrong keyzotlabs2017-10-221-4/+2
| |
* | do not show seen notifys in notifications - show them in mod notifications ↵Mario Vavti2017-10-224-37/+47
| | | | | | | | instead. Update notifications count also on notifications updates
* | Merge remote-tracking branch 'mike/master' into devMario Vavti2017-10-208-53/+171
|\|
| * register workflow was getting over-ridden in include/securityzotlabs2017-10-192-5/+6
| |
| * typozotlabs2017-10-191-1/+1
| |
| * table structure for pseudo or proxy channels (pchan)zotlabs2017-10-196-51/+165
| |
* | Merge pull request #879 from redmatrix/anaqreon-patch-1git-marijus2017-10-201-1/+5
|\ \ | |/ |/| Display different info message if using invite code
| * Display different info message if using invite codeAndrew Manning2017-10-191-1/+5
|/
* changelogMario Vavti2017-10-201-0/+111
|
* stringsMario Vavti2017-10-191-1380/+1689
|
* versionMario Vavti2017-10-191-1/+1
|
* redirect to be moderated items to /moderate and change the conv link to ↵Mario Vavti2017-10-193-6/+27
| | | | partent mid in /modrate
* fix issue #837 - w2w posts not removed in contact_remove()Mario Vavti2017-10-191-1/+2
|
* remove redundant jsMario Vavti2017-10-181-19/+16
|
* streamline the notifications js and change notification icon to ↵Mario Vavti2017-10-183-58/+21
| | | | exclamation-triangle if we have personal notifications
* update notifications if a notification area remains openMario Vavti2017-10-181-0/+7
|
* don't translate 'guest:' since it is part of a urlzotlabs2017-10-161-1/+1
|
* ensure guests hve a unique (non-existent) url so that network discovery on ↵zotlabs2017-10-161-1/+1
| | | | remote servers doesn't come up mis-attributing the token. Future work should probably provide an actual page at this location describing it as a guest account of 'xyz'.
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-161-1/+1
|\
| * fix typos in commentFelix Wolfsteller2017-10-161-1/+1
| |
* | mod_register - don't re-use the password, force them to type it in twice ↵zotlabs2017-10-161-3/+3
| | | | | | | | each time unless their browser saves passwords.
* | regression in zot site info after zot6 workzotlabs2017-10-161-4/+6
|/
* documentation updates. I've been sitting on these for quite some time ↵zotlabs2017-10-152-1/+13
| | | | waiting for the current documentation work to complete; but if I leave this any longer I may forget the changes that I need to make. The last time there was a major documentation update all my intervening changes were lost, so hopefully I won't lose these and have to do them over again.
* was unable to make the modal login dialog work on the channel page with a ↵zotlabs2017-10-143-11/+44
| | | | cover photo. So for mod_channel, send login to the login page instead of the modal popup.
* template not hiddenzotlabs2017-10-131-1/+1
|
* create an actual logout module instead of relying on internal variableszotlabs2017-10-122-5/+16
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-121-3/+19
|\
| * remove redundant classesMario Vavti2017-10-121-2/+2
| |
| * missing login and register linksMario Vavti2017-10-121-1/+17
| |
* | sort out the notification idszotlabs2017-10-124-15/+22
| |
* | typozotlabs2017-10-111-1/+2
| |
* | add local_channel as a comanche condition variablezotlabs2017-10-111-0/+4
| |
* | Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-1111-46/+76
|\|
| * z-index issue and some icons. rename notifications-btn-1 to notifications-btnMario Vavti2017-10-114-6/+10
| |
| * only show pubs notifications if discovery_tab != disabledMario Vavti2017-10-112-15/+19
| |
| * move affinity slider lower on screens < 767px to not collide with the page ↵Mario Vavti2017-10-112-3/+13
| | | | | | | | menu button
| * remove region nav entry in network.pdl - it is not neededMario Vavti2017-10-111-2/+0
| |
| * nav_set_selected() for apps and apporder. restrict apporder to ↵Mario Vavti2017-10-112-19/+26
| | | | | | | | local_channel() and whitespace
| * bring nav pinned apps to navbar_defaultMario Vavti2017-10-112-1/+8
| |
* | the template is needed for the old-style notificationszotlabs2017-10-111-0/+3
|/
* bring back some nav stuff (notifications) for alternate navbars; still some ↵zotlabs2017-10-111-0/+40
| | | | things missing as the notification dropdowns aren't fully functional.
* for federated forums we need to keep track of what protocols are available ↵zotlabs2017-10-101-0/+16
| | | | 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.
* on failed auth due to unverified email, tell the person why and remind them ↵zotlabs2017-10-101-2/+5
| | | | to check their email.
* re-order the navbar preferences - 1. profile_uid, 2. local_channel, 3, site, ↵zotlabs2017-10-101-2/+4
| | | | 4 'default'
* rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection ↵zotlabs2017-10-104-4/+4
| | | | code is consistent
* re-implement single deliveryzotlabs2017-10-102-3/+29
|
* Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_mergezotlabs2017-10-1014-277/+83
|\
| * css fixesMario Vavti2017-10-103-4/+7
| |
| * versionMario Vavti2017-10-101-1/+1
| |