repo.or.cz
/
sgn.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge branch 'topic/general_changes'
2016-06-14
n
ickmorales
if field trial
u
pload has
a
ccession
s
that are not
i
n
.
.
.
commit
|
commitdiff
|
tree
2016-06-13
n
ickmora
l
es
create CR
D
t
rial
w
ith a single a
c
cession
.
closes #
4
98
commit
|
commitdiff
|
tree
2016-06-13
n
i
c
k
m
orales
refactored creat
e
and uploa
d
trial dialogues into
their
.
.
.
commit
|
commitdiff
|
tree
2016-06-13
nickmo
r
ales
a
dded new
cassba
s
e image
commit
|
commitdiff
|
tree
2016-06-02
nickmorales
c
a
n m
a
n
u
ally open
t
rials in a
new tab
.
double click
.
.
.
commit
|
commitdiff
|
tree
2016-06-02
Nick
Morales
Merge
p
u
ll request #519 from solgen
o
mics/topic/cale
n
dar
commit
|
commitdiff
|
tree
2016-06-02
ni
c
kmo
r
ales
Merge branc
h
'master' into topic/
c
alendar
commit
|
commitdiff
|
tree
2016-06-02
nickmorales
cos
m
eti
c
changes
commit
|
commitdiff
|
tree
2016-06-01
nickmorale
s
added jstree theme and legend for briefcase
.
closes
.
.
.
commit
|
commitdiff
|
tree
2016-06-01
nick
m
o
rales
tests pas
s
commit
|
commitdiff
|
tree
2016-06-01
nickmora
l
es
m
e
rge master
commit
|
commitdiff
|
tree
2016-05-31
n
i
c
k
morales
BrAPI
study POS
T
call
commit
|
commitdiff
|
tree
2016-05-31
ni
c
kmor
a
les
fieldbook creat
i
o
n h
a
s spinning wh
e
el a
n
d poin
t
s to
.
.
.
commit
|
commitdiff
|
tree
2016-05-31
Nick Morales
Merge
p
ull request #
5
1
1
fr
o
m solgen
o
mi
c
s/topi
c
/tria
l
_fo
l
ders
commit
|
commitdiff
|
tree
2016-05-31
nickmorale
s
tests pass
commit
|
commitdiff
|
tree
2016-05-31
n
ickmorales
Merg
e
br
a
nch '
m
a
ster'
i
nto topic/trial_folders
commit
|
commitdiff
|
tree
2016-05-26
nick
m
o
ra
l
es
f
ix
e
s autocompl
e
te dropdown for
add crosses c
l
oses
.
.
.
commit
|
commitdiff
|
tree
2016-05-20
nickmorales
Merg
e
bra
n
ch 'master' of https:
/
/gi
t
hub
.
co
m
/solgenomics/sgn
commit
|
commitdiff
|
tree
2016-05-20
n
i
ckm
o
rales
spreadshe
e
t
creation
commit
|
commitdiff
|
tree
2016-05-19
nickmorale
s
fix to te
s
t
commit
|
commitdiff
|
tree
2016-05-19
Ni
c
k Morales
M
e
rge
p
ul
l
request #468 f
r
om solge
n
omics/topic/timestamp_phe
.
.
.
commit
|
commitdiff
|
tree
2016-05-19
n
i
c
k
morales
tests p
a
ss
commit
|
commitdiff
|
tree
2016-05-18
nick
m
orales
fix to t
r
ial test for uploading phenotypes wit
h
out
.
.
.
commit
|
commitdiff
|
tree
2016-05-18
nickm
o
ra
l
es
Merge branch 'm
a
ster' into
topic/ti
m
estamp_phenotype_upload
commit
|
commitdiff
|
tree
2016-05-18
n
i
c
k
morales
fix to bree
d
er
s
earch te
s
t
commit
|
commitdiff
|
tree
2016-05-18
nickmorales
m
erge master c
o
nflict
commit
|
commitdiff
|
tree
2016-05-10
nickmorales
t
ests pass
commit
|
commitdiff
|
tree
2016-05-10
nickmorales
forc
e
d
ordering of a
r
ra
y
of ha
s
hes
.
closes #4
6
2
commit
|
commitdiff
|
tree
2016-05-05
n
ickmorales
cros
s
trials and genotyping
trials show up in trial
.
.
.
commit
|
commitdiff
|
tree
2016-05-04
nickmor
a
les
test for dele
t
ing
folder
commit
|
commitdiff
|
tree
2016-05-04
n
ickmorale
s
better f
o
lder deletion
commit
|
commitdiff
|
tree
2016-05-04
nickmorales
Mer
g
e
branch 'master' into topic/tri
a
l_folders
commit
|
commitdiff
|
tree
2016-05-04
nickmora
l
es
phen
o
t
y
pe download wil
l
print 0
v
alues, while leaving
.
.
.
commit
|
commitdiff
|
tree
2016-05-03
nickmo
r
ales
de
l
ete
folder
commit
|
commitdiff
|
tree
2016-05-03
nickmorales
fo
l
der sel
e
nium test
commit
|
commitdiff
|
tree
2016-05-02
ni
c
kmorales
move multiple trials int
o
a
fo
l
d
e
r at on
c
e
commit
|
commitdiff
|
tree
2016-05-02
nickmoral
e
s
manage trial tree with
s
earch
.
closes #467
commit
|
commitdiff
|
tree
2016-05-02
nickmorale
s
tm
p
fil
e
for trial tree tha
t
is relative to si
t
e
commit
|
commitdiff
|
tree
2016-05-02
nickmorales
t
mp fi
l
e for jstree html m
a
kes things faste
r
commit
|
commitdiff
|
tree
2016-04-29
n
i
c
kmorales
updated
phe
n
o
type upload
u
n
it fixtu
r
e test
commit
|
commitdiff
|
tree
2016-04-29
nic
k
morales
f
i
eld
b
ook p
h
enotype upload with
timestamp
commit
|
commitdiff
|
tree
2016-04-29
ni
c
kmorale
s
datacollector phenot
y
pe upload
with tim
e
s
tam
p
opt
i
on
commit
|
commitdiff
|
tree
2016-04-29
nickm
o
rales
spre
a
dsheet phenotype upload with timestamp option
commit
|
commitdiff
|
tree
2016-04-27
nickmorales
tests pass
commit
|
commitdiff
|
tree
2016-04-26
ni
c
kmorale
s
datacollector f
i
le f
o
rmat informatio
n
commit
|
commitdiff
|
tree
2016-04-26
n
ic
k
m
o
rales
downlo
a
d datacollec
t
or spread
s
heet includes timestamp
commit
|
commitdiff
|
tree
2016-04-26
nic
k
mor
a
les
upload
phen
o
type with timestamp for datacol
l
ector
commit
|
commitdiff
|
tree
2016-04-26
nickmorales
upload pheno
t
ype with
t
imestamp for
s
preadsheet an
d
.
.
.
commit
|
commitdiff
|
tree
2016-04-26
nickmorales
phen
o
ty
p
e upload fie
l
d
bo
o
k with t
i
mestamp info
commit
|
commitdiff
|
tree
2016-04-25
n
i
ckmorales
timesta
m
p fr
o
m
f
ieldbo
o
k parsing
commit
|
commitdiff
|
tree
2016-04-25
nickmorales
in
i
t
t
i
me
s
ta
m
p phen
o
type
u
pload
commit
|
commitdiff
|
tree
2016-04-25
ni
c
kmorales
ch
a
nge trial and folder names
commit
|
commitdiff
|
tree
2016-04-25
nickmorales
t
e
sts pass with some is
s
u
es
commit
|
commitdiff
|
tree
2016-04-25
nickmo
r
ales
consolidated un
i
t
fixture folder t
e
sts
commit
|
commitdiff
|
tree
2016-04-25
n
ickmor
a
les
Merge branch 'mas
t
er' in
t
o topic/trial_folders
commit
|
commitdiff
|
tree
2016-04-25
nickmorales
selenium test for folders
commit
|
commitdiff
|
tree
2016-04-25
nickmora
l
es
unit fixture test for folders
commit
|
commitdiff
|
tree
2016-04-25
ni
c
kmorales
problem
w
i
th list delete eleme
n
t sele
n
ium t
e
st
commit
|
commitdiff
|
tree
2016-04-21
nickmora
l
es
Merge branc
h
'
master' into
topic/t
r
ial_folders
commit
|
commitdiff
|
tree
2016-04-21
n
i
ckm
o
rales
f
ol
d
ers ca
n
be moved
around com
p
lexly
commit
|
commitdiff
|
tree
2016-04-20
nickmorales
folder u
n
it fixture
t
est
commit
|
commitdiff
|
tree
2016-04-20
nic
k
mo
r
ales
clea
n
up commented out
c
o
de
commit
|
commitdiff
|
tree
2016-04-20
nickmo
r
ales
Merg
e
branch
'master' into topic/t
r
ial_folders
commit
|
commitdiff
|
tree
2016-04-20
nickmorales
folder u
n
it
fixture test
commit
|
commitdiff
|
tree
2016-04-20
nickmorales
folder unit fixture test start
commit
|
commitdiff
|
tree
2016-04-19
nic
k
mor
a
les
on
t
r
i
altree
d
ownload only sh
o
ws for trials
commit
|
commitdiff
|
tree
2016-04-19
nick
m
orales
set trial in folder
dialog form is res
p
onsiv
e
to t
h
e
.
.
.
commit
|
commitdiff
|
tree
2016-04-19
nickmora
l
es
p
a
rent folder se
l
e
c
t on new fo
l
der dial
o
g
is r
e
sponsive
.
.
.
commit
|
commitdiff
|
tree
2016-04-18
nick
m
orale
s
a
d
d new fo
l
der from trialtree and trial pages
commit
|
commitdiff
|
tree
2016-04-12
ni
c
kmorales
removed dnd from trialtree for
now since
its not used
commit
|
commitdiff
|
tree
2016-04-12
nickm
o
r
ales
c
o
mm
e
nted out
dumper
commit
|
commitdiff
|
tree
2016-04-12
nickmorales
add trial to
folder fro
m
manage
page, folder page,
.
.
.
commit
|
commitdiff
|
tree
2016-04-11
ni
c
kmorales
f
o
lde
r
dtail page show
s
basi
c
info
commit
|
commitdiff
|
tree
2016-04-07
nickmorales
w
orking on tri
a
l folder pag
e
commit
|
commitdiff
|
tree
2016-04-07
ni
c
k
m
o
r
al
e
s
removed unused js
t
ree
p
lu
g
ins
commit
|
commitdiff
|
tree
2016-04-07
nickmo
r
ales
s
ilenced some printing to
S
T
DERR
commit
|
commitdiff
|
tree
2016-04-06
n
i
ck
m
orales
me
r
ged
m
aster into topic/trial_fol
d
ers
commit
|
commitdiff
|
tree
2016-04-05
n
ickmorales
changed icon
d
isplay
.
different type
s
are b
r
ee
d
i
n
g_progra
m
.
.
.
commit
|
commitdiff
|
tree
2016-04-14
nickmorales
brapi pre fix maps calls
commit
|
commitdiff
|
tree
2016-04-14
nickmoral
e
s
br
a
pi
c
hanges
commit
|
commitdiff
|
tree
2016-04-13
nickmor
a
les
all
e
le
m
atr
i
x call fi
x
commit
|
commitdiff
|
tree
2016-04-13
nickmorales
fix
t
o map p
o
sitions call to take into a
c
count po
p
u
l
ations
commit
|
commitdiff
|
tree
2016-04-13
nickmora
l
es
fix to
/
m
aps call t
o
take into account
d
i
ff
e
r
ent pop
u
lations
.
.
.
commit
|
commitdiff
|
tree
2016-04-13
nickmoral
e
s
fix map a
n
d markerprofiles call
commit
|
commitdiff
|
tree
2016-04-13
nic
k
morales
fix to mark
e
r
profiles calls
commit
|
commitdiff
|
tree
2016-04-12
nickm
o
r
ales
som
e
fixes to
genotypeprops c
a
lls
commit
|
commitdiff
|
tree
2016-04-12
nickmo
r
ales
changed page to
c
urr
e
ntP
a
ge
commit
|
commitdiff
|
tree
2016-04-12
n
i
ckm
o
rales
placed data k
e
y bac
k
in
result
commit
|
commitdiff
|
tree
2016-04-12
nic
k
morales
Merge bra
n
ch
'
t
opi
c
/br
e
eding_api'
commit
|
commitdiff
|
tree
2016-04-12
nickmoral
e
s
working on maps call
commit
|
commitdiff
|
tree
2016-04-11
nickm
o
rales
for
m
atting on
a
llelematrix ca
l
l
commit
|
commitdiff
|
tree
2016-04-11
nickmor
a
les
allelematrix call
commit
|
commitdiff
|
tree
2016-04-11
nickmorales
removed a
u
thentication on
m
arkerprof
i
les methods
call
commit
|
commitdiff
|
tree
2016-04-11
nickmora
l
es
modifica
t
ion to maps
call for flapjack
commit
|
commitdiff
|
tree
2016-04-05
n
i
c
kmorales
M
erge branch '
t
o
pic/man
a
ge_phenotype_uploads'
commit
|
commitdiff
|
tree
2016-04-05
nic
k
moral
e
s
comment
e
d out
dumpers
commit
|
commitdiff
|
tree
2016-04-05
nickmoral
e
s
nice
file viewer for vi
e
wing up
l
oaded files
.
t
abs
sho
w
.
.
.
commit
|
commitdiff
|
tree
2016-04-04
n
i
ckmorales
c
a
n d
o
wnload fi
l
es
f
rom manage p
h
enot
y
pes
.
closes #
4
2
2
commit
|
commitdiff
|
tree
2016-04-04
ni
c
k
m
orales
link
s
t
o
calendar show
w
h
e
n
dates
c
hange
d
from trial
.
.
.
commit
|
commitdiff
|
tree
2016-04-01
n
i
ckmorales
typo
i
n hida
p
linking
commit
|
commitdiff
|
tree
next