Mario Vavti
|
c80f4feb62
|
Merge remote-tracking branch 'mike/master' into dev
|
2017-10-20 10:08:57 +02:00 |
|
git-marijus
|
2d06e86b5b
|
Merge pull request #879 from redmatrix/anaqreon-patch-1
Display different info message if using invite code
|
2017-10-20 10:04:03 +02:00 |
|
zotlabs
|
400441d56b
|
register workflow was getting over-ridden in include/security
|
2017-10-19 18:48:11 -07:00 |
|
zotlabs
|
7d92e9026e
|
typo
|
2017-10-19 18:48:01 -07:00 |
|
Andrew Manning
|
42416aad22
|
Display different info message if using invite code
|
2017-10-19 21:09:12 -04:00 |
|
zotlabs
|
9d51318c53
|
table structure for pseudo or proxy channels (pchan)
|
2017-10-19 17:24:11 -07:00 |
|
zotlabs
|
cdb1bc9be6
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-19 16:27:24 -07:00 |
|
Mario Vavti
|
52183f8bf8
|
changelog
|
2017-10-20 00:09:54 +02:00 |
|
Mario Vavti
|
c2714262b3
|
strings
|
2017-10-19 12:07:42 +02:00 |
|
Mario Vavti
|
a58f386831
|
version
|
2017-10-19 11:50:52 +02:00 |
|
Mario Vavti
|
f3c374b6ff
|
redirect to be moderated items to /moderate and change the conv link to partent mid in /modrate
|
2017-10-19 11:20:09 +02:00 |
|
Mario Vavti
|
21b2c0afa3
|
fix issue #837 - w2w posts not removed in contact_remove()
|
2017-10-19 10:21:47 +02:00 |
|
Mario Vavti
|
ca4c725d57
|
remove redundant js
|
2017-10-18 12:28:56 +02:00 |
|
Mario Vavti
|
fe1aa90304
|
streamline the notifications js and change notification icon to exclamation-triangle if we have personal notifications
|
2017-10-18 11:38:45 +02:00 |
|
zotlabs
|
656ec585b2
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-17 21:24:07 -07:00 |
|
Mario Vavti
|
64a49eb54a
|
update notifications if a notification area remains open
|
2017-10-18 00:25:00 +02:00 |
|
zotlabs
|
b106b53d05
|
don't translate 'guest:' since it is part of a url
|
2017-10-16 23:01:00 -07:00 |
|
zotlabs
|
a791809a84
|
ensure guests hve a unique (non-existent) url so that network discovery on 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'.
|
2017-10-16 22:31:38 -07:00 |
|
zotlabs
|
71c3a0a197
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-16 18:20:42 -07:00 |
|
zotlabs
|
9497c6c0f7
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-16 18:20:17 -07:00 |
|
zotlabs
|
18279234fd
|
mod_register - don't re-use the password, force them to type it in twice each time unless their browser saves passwords.
|
2017-10-16 15:55:41 -07:00 |
|
zotlabs
|
4dd05dc4e8
|
regression in zot site info after zot6 work
|
2017-10-16 15:23:17 -07:00 |
|
zotlabs
|
cf7481da53
|
regression in zot site info after zot6 work
|
2017-10-16 15:20:45 -07:00 |
|
Felix Wolfsteller
|
b8a9390f49
|
fix typos in comment
|
2017-10-16 21:33:14 +02:00 |
|
zotlabs
|
a33562144b
|
documentation updates. I've been sitting on these for quite some time 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.
|
2017-10-15 17:39:14 -07:00 |
|
zotlabs
|
9b94ad2ffe
|
was unable to make the modal login dialog work on the channel page with a cover photo. So for mod_channel, send login to the login page instead of the modal popup.
|
2017-10-14 01:17:47 -07:00 |
|
zotlabs
|
70b39e829b
|
template not hidden
|
2017-10-13 13:06:54 -07:00 |
|
zotlabs
|
29a29f277e
|
create an actual logout module instead of relying on internal variables
|
2017-10-12 22:10:42 -07:00 |
|
zotlabs
|
e5f1bcacc8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-12 12:00:55 -07:00 |
|
zotlabs
|
ccbc532c1a
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-12 12:00:38 -07:00 |
|
zotlabs
|
e6c166a182
|
sort out the notification ids
|
2017-10-12 11:36:25 -07:00 |
|
Mario Vavti
|
26bd532bc5
|
remove redundant classes
|
2017-10-12 15:57:16 +02:00 |
|
Mario Vavti
|
c89b2ac3b7
|
missing login and register links
|
2017-10-12 15:54:01 +02:00 |
|
zotlabs
|
6acd96fd33
|
typo
|
2017-10-11 17:52:03 -07:00 |
|
zotlabs
|
a652e546cc
|
add local_channel as a comanche condition variable
|
2017-10-11 15:19:06 -07:00 |
|
zotlabs
|
ee307729fc
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
|
2017-10-11 15:14:18 -07:00 |
|
zotlabs
|
48d2b3afa8
|
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
|
2017-10-11 15:13:57 -07:00 |
|
zotlabs
|
491856fa79
|
the template is needed for the old-style notifications
|
2017-10-11 15:12:49 -07:00 |
|
Mario Vavti
|
56a675f713
|
z-index issue and some icons. rename notifications-btn-1 to notifications-btn
|
2017-10-11 21:32:23 +02:00 |
|
Mario Vavti
|
05c8d4819d
|
only show pubs notifications if discovery_tab != disabled
|
2017-10-11 14:26:18 +02:00 |
|
Mario Vavti
|
c8d5390512
|
move affinity slider lower on screens < 767px to not collide with the page menu button
|
2017-10-11 13:18:18 +02:00 |
|
Mario Vavti
|
f3cf708c85
|
remove region nav entry in network.pdl - it is not needed
|
2017-10-11 12:42:16 +02:00 |
|
Mario Vavti
|
24d1d752fe
|
nav_set_selected() for apps and apporder. restrict apporder to local_channel() and whitespace
|
2017-10-11 11:58:09 +02:00 |
|
Mario Vavti
|
ba55400f14
|
bring nav pinned apps to navbar_default
|
2017-10-11 11:49:03 +02:00 |
|
zotlabs
|
0c5918f290
|
bring back some nav stuff (notifications) for alternate navbars; still some things missing as the notification dropdowns aren't fully functional.
|
2017-10-11 01:29:25 -07:00 |
|
zotlabs
|
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.
|
2017-10-10 22:02:22 -07:00 |
|
zotlabs
|
1a7ccc462b
|
on failed auth due to unverified email, tell the person why and remind them to check their email.
|
2017-10-10 19:45:11 -07:00 |
|
zotlabs
|
769da564e2
|
re-order the navbar preferences - 1. profile_uid, 2. local_channel, 3, site, 4 'default'
|
2017-10-10 19:22:24 -07:00 |
|
zotlabs
|
09b4660c7d
|
rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection code is consistent
|
2017-10-10 18:50:01 -07:00 |
|
zotlabs
|
69394c1680
|
re-implement single delivery
|
2017-10-10 18:40:02 -07:00 |
|