Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
Choose a Base Repository
hypothesis/h
40a/h
AFDudley/h
BigBlueHat/h
BinaryStars/h
CCH543/h
Cinemacloud/h
Ericgood/h
FTG-003/h
Forethinker/h
GratefulTony/h
HGldJ1966/h
JJediny/h
John-Williams/h
Laurian/h
LittleFancy/h
MattyQ/h
Mishkin2015/h
RichardLitt/h
Staffan1/h
SteelWagstaff/h
TowerBR/h
VanyTang/h
abigailricarte/h
ackermann/h
alecchap/h
alesarrett/h
alexsegura/h
almereyda/h
alon/h
andzi/h
angelicxsoul/h
ansmoh/h
apurvajalit/h
arjunvasan/h
asdevor/h
bZichett/h
badgettrg/Webmarks
balmas/h
balupton/h
bbarker/h
bennlich/h
benthor/h
blakewest/h
bogste/h
bradparks/h
brittanystoroz/h
buiquangchien/h
cdchapman/h
charblanc/h
chowsamihq/h
chr7stos/Webmarks
chrber/h
chrismPssina/h
christinaphamAD/h
cmbirk/h
codeaudit/h
coolcool21/h
cove/h
csillag/h
danjimilk/h
dannyhope/h
daredream/h
davidmcclure/h
dennisplucinik/h
dezynetechnologies/h
diegodlh/h
djcun95/h
donsequitur/h
edsu/h
eiro10/h
emckean/h
ercchy/h
eshellman/h
fangang123/h
fchasen/h
fcrimins/h
fhirsch/h
ficolo/h
fragkopoulos/h
gauravkeerthi/h
geass/h
gergely-ujvari/h
gitter-badger/h
gnott/h
gobengo/h
gorinovic/h
gus3000/h
hashin/h
helemaalbigt/h
hmstepanek/h
hwasiti/h
hylhero/h
hyperstudio/h
iHDeveloper/h
imeysam/h
jackspaceBerkeley/h
jarey/h
jasdeep/h
jason790/h
jasonzou/j
jazahn/h
jccr/h
jean/h
jeka57/h
jeremydean/h
jermnelson/h
jibe-b/h
jnishiyama/h
jojksd/h
jpadilla/h
jtremback/h
judell/h
juli-so/h
kabacs/h
karissa/h
kaushikvijay/h
kaydoh/h
kill4uk/h
klopiinas/h
klrkdekira/h
koulihong311/h
krassif/h
krstnkngs/h
leoqmp/h
linhua55/h
lucadealfaro/h
lyspooner/h
lyzadanger/h
m1yag1/h
magee/h
mambocab/h
manunymous/h
maraino/h
mari-ja/h
markbarratt/h
martinq/h
mbbaig/h
mcarv63/h
meawoppl/h
meflyup/h
metasj/h
mgasner/h
mgax/h
mollycr/h
mrchrisadams/h
mrienstra/h
mshavlovsky/h
muddasani/h
nagyist/hyphothesis-h
nagyistoce/hypothesis-h
nanxio/h
neozhangthe1/h
ningyifan/h
nkingsley/h
nlholdem/h
nlisgo/h
noscripter/h
nshkuro/h
odnodn/h
oliversauter/h
openbizgit/h
opengovfoundation/h
openstax/hypothesis-server
ouroboros8/h
pablomarti/h
pamo/h
philipn/h
philschatz/h
pinballwonder/h
plainspace/h
raowl/h
rickyhan/h
rmoorman/h
rmtsukuru/h
robertknight/h
rowhit/h
rsarxiv/h
saakaifoundry/h
samrose/h
scharf/h
shepazu/h
sherah/h
shofheinz/h
soapdog/h
ssin122/test-h
st-fresh/h
stuk88/h
sylvanmist/h
tetratorus/h
tilgovi/h
tomnar/h
trivenews/h
truthadjustr/h
utngz/h
voidfiles/h
wenchen/h
yargevad/h
yumatch/h
zshen777/h
Nothing to show
Choose a Head Repository
hypothesis/h
40a/h
AFDudley/h
BigBlueHat/h
BinaryStars/h
CCH543/h
Cinemacloud/h
Ericgood/h
FTG-003/h
Forethinker/h
GratefulTony/h
HGldJ1966/h
JJediny/h
John-Williams/h
Laurian/h
LittleFancy/h
MattyQ/h
Mishkin2015/h
RichardLitt/h
Staffan1/h
SteelWagstaff/h
TowerBR/h
VanyTang/h
abigailricarte/h
ackermann/h
alecchap/h
alesarrett/h
alexsegura/h
almereyda/h
alon/h
andzi/h
angelicxsoul/h
ansmoh/h
apurvajalit/h
arjunvasan/h
asdevor/h
bZichett/h
badgettrg/Webmarks
balmas/h
balupton/h
bbarker/h
bennlich/h
benthor/h
blakewest/h
bogste/h
bradparks/h
brittanystoroz/h
buiquangchien/h
cdchapman/h
charblanc/h
chowsamihq/h
chr7stos/Webmarks
chrber/h
chrismPssina/h
christinaphamAD/h
cmbirk/h
codeaudit/h
coolcool21/h
cove/h
csillag/h
danjimilk/h
dannyhope/h
daredream/h
davidmcclure/h
dennisplucinik/h
dezynetechnologies/h
diegodlh/h
djcun95/h
donsequitur/h
edsu/h
eiro10/h
emckean/h
ercchy/h
eshellman/h
fangang123/h
fchasen/h
fcrimins/h
fhirsch/h
ficolo/h
fragkopoulos/h
gauravkeerthi/h
geass/h
gergely-ujvari/h
gitter-badger/h
gnott/h
gobengo/h
gorinovic/h
gus3000/h
hashin/h
helemaalbigt/h
hmstepanek/h
hwasiti/h
hylhero/h
hyperstudio/h
iHDeveloper/h
imeysam/h
jackspaceBerkeley/h
jarey/h
jasdeep/h
jason790/h
jasonzou/j
jazahn/h
jccr/h
jean/h
jeka57/h
jeremydean/h
jermnelson/h
jibe-b/h
jnishiyama/h
jojksd/h
jpadilla/h
jtremback/h
judell/h
juli-so/h
kabacs/h
karissa/h
kaushikvijay/h
kaydoh/h
kill4uk/h
klopiinas/h
klrkdekira/h
koulihong311/h
krassif/h
krstnkngs/h
leoqmp/h
linhua55/h
lucadealfaro/h
lyspooner/h
lyzadanger/h
m1yag1/h
magee/h
mambocab/h
manunymous/h
maraino/h
mari-ja/h
markbarratt/h
martinq/h
mbbaig/h
mcarv63/h
meawoppl/h
meflyup/h
metasj/h
mgasner/h
mgax/h
mollycr/h
mrchrisadams/h
mrienstra/h
mshavlovsky/h
muddasani/h
nagyist/hyphothesis-h
nagyistoce/hypothesis-h
nanxio/h
neozhangthe1/h
ningyifan/h
nkingsley/h
nlholdem/h
nlisgo/h
noscripter/h
nshkuro/h
odnodn/h
oliversauter/h
openbizgit/h
opengovfoundation/h
openstax/hypothesis-server
ouroboros8/h
pablomarti/h
pamo/h
philipn/h
philschatz/h
pinballwonder/h
plainspace/h
raowl/h
rickyhan/h
rmoorman/h
rmtsukuru/h
robertknight/h
rowhit/h
rsarxiv/h
saakaifoundry/h
samrose/h
scharf/h
shepazu/h
sherah/h
shofheinz/h
soapdog/h
ssin122/test-h
st-fresh/h
stuk88/h
sylvanmist/h
tetratorus/h
tilgovi/h
tomnar/h
trivenews/h
truthadjustr/h
utngz/h
voidfiles/h
wenchen/h
yargevad/h
yumatch/h
zshen777/h
Nothing to show
  • 1 commit
  • 5 files changed
  • 0 commit comments
  • 1 contributor
Commits on May 27, 2015
@@ -16,12 +16,16 @@ module.exports = ['$timeout', 'crossframe', 'via', '$rootScope', (
$timeout (-> elem.find('#via').focus().select()), 0, false
scope.shareGroup = false
scope.nameofgroup = $rootScope.socialview.name
## Make this a via link.
scope.shareGroupLink = 'https://hypothes.is/g/102498/' + $rootScope.socialview.name
scope.shareGroupLink = via.url + '?groupid=34213&name=' + $rootScope.socialview.name + e?
scope.$watch (-> $rootScope.socialview.name), (socialview) ->
if socialview != 'All'
scope.nameofgroup = $rootScope.socialview.name
if socialview != 'All' and socialview != 'Public' and socialview != 'Only Me'
console.log socialview
scope.shareGroup = true
scope.shareGroupLink = 'https://hypothes.is/g/102498/' + $rootScope.socialview.name
scope.shareGroupLink = via.url + '?groupid=34213&name=' + $rootScope.socialview.name + e?
else
scope.shareGroup = false
@@ -186,6 +186,12 @@ html {
}
}
.privacy {
.dropdown-menu {
left: -50px !important;
}
}
.dropdown-menu {
background: $white;
border: solid 1px $gray-lighter;
@@ -11,7 +11,7 @@
<i class="h-icon-border-color" ng-show="vm.isHighlight() && !vm.editing"></i>
<i class="h-icon-insert-comment" title="General comment" ng-show="vm.isComment()"></i>
<i class="h-icon-lock" title="This annotation is visible only to you." ng-show="vm.isPrivate() && !vm.editing"></i>
<span class="small" ng-show="!vm.isPrivate()">to&nbsp;<a ng-href="{{vm.baseURI}}/stream" target="_blank" class="annotation-timestamp" ng-show="!vm.isPrivate() && !vm.editing && groupAnno"><i class="h-icon-group" title="{{groupAnno}}"></i>{{groupAnno}}</a></span>
<span class="small" ng-show="!vm.isPrivate() && !vm.editing">to&nbsp;<a ng-href="{{vm.baseURI}}/stream" target="_blank" class="annotation-timestamp" ng-show="!vm.isPrivate() && !vm.editing && groupAnno"><i class="h-icon-group" title="{{groupAnno}}"></i>{{groupAnno}}</a></span>
<span class="small annotation-timestamp" ng-show="!vm.isPrivate() && !vm.editing && !groupAnno" style="margin-left:-3px"><i class="h-icon-public" title="Public annotation" ng-show="!vm.isPrivate() && !vm.editing && !groupAnno"></i> Public</span>
<span class="annotation-citation"
ng-if="!vm.embedded"
@@ -24,7 +24,7 @@
title="Share via email"
class="h-icon-mail"></a>
</p>
<p style="margin-top: 1em;" ng-show="shareGroup">Share the link below to invite others to contribute annotations to this page:</p>
<p style="margin-top: 1em;" ng-show="shareGroup">Share the link below to invite others to contribute annotations to the <strong>{{nameofgroup}}</strong> group on this page:</p>
<p ng-show="shareGroup"><input id="via" class="form-input" type="text" ng-value="shareGroupLink" readonly></input></p>
<p ng-show="shareGroup" class="share-links">
<a href="//twitter.com/intent/tweet?url={{shareGroupLink}}"
View
@@ -32,7 +32,7 @@
<section class="help-page-section">
<h2 id="getting-started" class="help-page-heading">Welcome to the Groups Prototype!</h2>
<p>For the sake of this demo let's pretend that someone you want to annotate with gave you the following Hypothesis group link:
<a href="#">https://hypothes.is/g/102498/DEMOGROUP</a></p>
<a href="#">https://via.hypothes.is/?groupid=34213&name=DEMOGROUP/https://groups2.dokku.hypothes.is/</a></p>
<p>You clicked on it and have been taken to this page.</p>
<p>Please complete the following tasks.</p>
<ol>

No commit comments for this range