aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Context help for cards2.8Andrew Manning2017-10-251-0/+20
|
* Merge branch '2.8RC'Mario2017-10-25310-7107/+20133
|\
| * bump version and update changelogMario2017-10-252-2/+2
| |
| * version RC1Mario2017-10-241-1/+1
| |
| * comment out statistics link in mod pubsites until we have something ↵Mario Vavti2017-10-241-2/+2
| | | | | | | | functional again
| * Update composer autoload cache.Klaus Weidenbach2017-10-242-4/+26
| |
| * Portfolio widget - CSS updateHaakon Meland Eriksen2017-10-243-1/+50
| |
| * add hcard to webfingerMario2017-10-241-1/+7
| |
| * acl encoding issueszotlabs2017-10-242-3/+3
| |
| * hubzilla issue #885zotlabs2017-10-231-0/+8
| |
| * 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
| * Update DE translation stringsphellmes2017-10-222-1462/+1830
| |
| * Fixed the Spanish translationManuel Jiménez Friaza2017-10-222-1460/+1828
| |
| * changelogMario Vavti2017-10-201-0/+111
| |
| * register workflow was getting over-ridden in include/securityzotlabs2017-10-202-2/+6
| |
| * Display different info message if using invite codeAndrew Manning2017-10-201-1/+5
| |
| * Merge branch '2.8RC' of https://github.com/redmatrix/hubzilla into 2.8RCMario Vavti2017-10-191-1/+1
| |\
| | * versionMario2017-10-191-1/+1
| | |
| * | stringsMario Vavti2017-10-191-1380/+1689
| |/
| * 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.