repo.or.cz
/
e_cidadania.git
/
search
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
first
·
prev
·
next
Merge pull request #173 from tssavita/master
2013-03-06
Oscar
C
arb
a
llal
Merge
p
u
ll re
q
uest #1
7
3 from tss
a
vita/master
commit
|
commitdiff
|
tree
2013-03-06
Oscar Carb
a
llal
Merge pull request #
1
72 from VishrutMeht
a
/master
commit
|
commitdiff
|
tree
2013-03-05
O
scar Carballal
.
.
.
Moved tr
a
vis file and upd
a
ted it for th
e
new location
commit
|
commitdiff
|
tree
2013-03-05
Oscar
Carb
a
l
lal
.
.
.
M
o
ved travis f
i
le to project root
commit
|
commitdiff
|
tree
2013-03-05
Oscar Ca
r
balla
l
.
.
.
Added Travis CI file and remo
v
ed django f
r
om requir
e
men
t
s
.
.
.
commit
|
commitdiff
|
tree
2013-03-04
Oscar C
a
rballal
Me
r
ge pull request #1
7
1 from
VishrutMeht
a
/ma
s
ter
commit
|
commitdiff
|
tree
2013-02-27
Osc
a
r Carbal
l
al
.
.
.
Minor fixes and fixed #11 wron
g
vote va
l
i
da
t
i
on
.
It
.
.
.
commit
|
commitdiff
|
tree
2013-02-26
Oscar C
a
r
balla
l
.
.
.
Fixed bug in over
v
iew
tab t
h
at didn't w
o
rk
.
F
i
xed list
.
.
.
commit
|
commitdiff
|
tree
2013-02-26
Osca
r
Carbal
l
al
.
.
.
M
i
nor
c
hecks aro
u
nd
t
ic
k
et
#
1
8
commit
|
commitdiff
|
tree
2013-02-26
Oscar Carballal
.
.
.
Fixed #19 replacing
url by get_absolut
e
_url
m
etho
d
commit
|
commitdiff
|
tree
2013-02-26
O
scar C
a
rballal
.
.
.
Fix
#
2
8 change queryset
s
for propos
a
ls a
n
d
proposalsets
commit
|
commitdiff
|
tree
2013-02-26
Oscar
C
a
r
ballal
.
.
.
Modified v
i
ew for edit debnat
e
and added edit funtio
n
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Osc
a
r Car
b
allal
.
.
.
Fix
e
d
#24 Included has_space_permission in the impor
t
s
commit
|
commitdiff
|
tree
2013-02-25
Oscar C
a
rba
l
l
a
l
.
.
.
Fixed #12 Validation for PDF uploads
.
Relo
c
a
t
e
d a
n
d
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Oscar Carballal
.
.
.
Fixed #7: Proposalset list show
s
a
l
l
sets
.
Fixed old
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Osc
a
r C
a
rballal
Merg
e
pull
request #170 from piyushbans
a
l/maste
r
commit
|
commitdiff
|
tree
2013-02-25
Oscar Carba
l
lal
.
.
.
Fixed git merge errors
commit
|
commitdiff
|
tree
2013-02-25
Osc
a
r
C
ar
b
allal
.
.
.
Merge branch '
m
a
s
ter' of git://githu
b
.
com/c
i
dadania
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Oscar Carballal
.
.
.
Support vot
e
s mo
d
ification
commit
|
commitdiff
|
tree
2013-02-25
Oscar
C
arballal
Merg
e
pull request #169 fr
o
m
piyushba
n
s
a
l/master
commit
|
commitdiff
|
tree
2013-02-21
Oscar Carballal
M
e
rge p
u
ll request #
1
68
from piyushbansal
/
ma
s
ter
commit
|
commitdiff
|
tree
2013-02-20
Oscar Carballal
.
.
.
Merge branch 'master' of gi
t
://githu
b
.
co
m
/c
i
dadania
.
.
.
commit
|
commitdiff
|
tree
2013-02-20
Oscar
Carballal
.
.
.
Fixe
d
permission
c
hecks
.
Repla
c
ed edit per
m
issio
n
name
.
.
.
commit
|
commitdiff
|
tree
2013-02-19
Oscar Carballal
M
e
rge
p
ull
reque
s
t
#
167
f
rom piy
u
shb
a
nsal/master
commit
|
commitdiff
|
tree
2013-02-19
Os
c
ar Car
b
allal
.
.
.
Fi
x
#
10 Remove numeric proposal ti
t
le
commit
|
commitdiff
|
tree
2013-02-19
Os
c
ar
C
arbal
l
al
.
.
.
Hi
d
e the latitude and longi
t
u
d
e f
o
rm fields from independent
.
.
.
commit
|
commitdiff
|
tree
2013-02-19
Oscar Carballal
.
.
.
Fixed
s
ome errors in the propo
s
als views
.
commit
|
commitdiff
|
tree
2013-02-19
Os
c
ar C
a
r
ballal
M
e
rge pull re
q
u
e
st #166 from pi
y
u
shba
n
sal/
m
aster
commit
|
commitdiff
|
tree
2013-02-18
O
sca
r
Carballal
.
.
.
Fixed #17 N
o
w the user can delete notes
.
Fixed err
o
r
.
.
.
commit
|
commitdiff
|
tree
2013-02-18
Oscar
Carballal
.
.
.
Fix
#16: Changed
V
iew
,
edit and r
e
m
ove strin
g
s
f
rom
.
.
.
commit
|
commitdiff
|
tree
2013-02-18
Osca
r
Carbal
l
al
.
.
.
Me
r
ge
b
ranch 'mas
t
er'
of git:/
/
github
.
com/cidad
a
nia
.
.
.
commit
|
commitdiff
|
tree
2013-02-16
O
s
c
ar
Car
b
a
l
lal
Merge pull r
e
quest
#16
5
f
ro
m
piyushbansal/master
commit
|
commitdiff
|
tree
2013-02-15
Osc
a
r
Carb
a
llal
.
.
.
Fixed double per
m
ission validation in debate creation
commit
|
commitdiff
|
tree
2013-02-15
Oscar C
a
rballal
.
.
.
Fixed req
u
est
refer
r
als in
p
roposal views
commit
|
commitdiff
|
tree
2013-02-15
O
s
car Carballal
.
.
.
Fixed bad reference to
reque
s
t in proposals delete
.
.
.
commit
|
commitdiff
|
tree
2013-02-14
Osc
a
r
C
a
rbal
l
al
.
.
.
Updated the boot
s
t
rap script
a
nd fi
x
ed some permission
.
.
.
commit
|
commitdiff
|
tree
2013-02-13
Oscar Carballal
.
.
.
Mi
n
or bug fixes
commit
|
commitdiff
|
tree
2013-01-30
Osc
a
r
C
a
rballal
.
.
.
Adde
d
some f
i
l
e
s for t
h
e server
commit
|
commitdiff
|
tree
2013-01-08
Os
c
ar Carbal
l
al
.
.
.
Updated documentati
o
n
commit
|
commitdiff
|
tree
2013-01-08
Oscar Carballal
.
.
.
Updated l
a
nguage
c
atalogs
commit
|
commitdiff
|
tree
2013-01-08
Os
c
ar Ca
r
bal
l
al
.
.
.
Added
"E
x
plore
"
vie
w
and URL, remov
e
d 4
5
px separation
.
.
.
commit
|
commitdiff
|
tree
2013-01-07
Oscar Carballa
l
.
.
.
Solv
e
d
bug in polls queryset and added n
e
w topba
r
m
e
nu
commit
|
commitdiff
|
tree
2013-01-07
Oscar
C
arballa
l
.
.
.
A
d
ded beta and debug icons to master
commit
|
commitdiff
|
tree
2013-01-07
Os
c
a
r C
a
rballal
.
.
.
Fixed wr
o
ng call
s
to has_all_permissi
o
ns method and
.
.
.
commit
|
commitdiff
|
tree
2013-01-04
Osc
a
r Carball
a
l
.
.
.
Fix #
1
59
.
Replaced the addi
n
g stan
t
eme
n
t for a ne
w
.
.
.
commit
|
commitdiff
|
tree
2013-01-01
Os
c
ar Carbal
l
al
.
.
.
U
ncomm
e
nt the au
t
om
a
tic permissions for new
users
commit
|
commitdiff
|
tree
2012-12-31
Oscar Carball
a
l
.
.
.
Change
d
version
t
o 0
.
1
.
8 beta
commit
|
commitdiff
|
tree
2012-12-31
O
s
car C
a
rballal
.
.
.
Regenerat
e
d language
c
atalogs
commit
|
commitdiff
|
tree
2012-12-31
Oscar
C
arb
a
llal
.
.
.
A
d
ded fi
l
e m
i
ssi
n
g in the l
a
st
co
m
m
i
t
.
Main v
o
t
i
n
g
.
.
.
commit
|
commitdiff
|
tree
2012-12-31
Oscar Carb
a
ll
a
l
.
.
.
Fixed v
o
t
i
ng
m
o
du
l
e
.
A
dded token val
i
dation
.
Fixed
.
.
.
commit
|
commitdiff
|
tree
2012-12-30
Oscar Ca
r
ballal
.
.
.
i
F
ixed datepicker showing in dat
e
fields
commit
|
commitdiff
|
tree
2012-12-30
Oscar Carballal
Me
r
ge pu
l
l request #158 from Tamar
a
Atan
a
soska/master
commit
|
commitdiff
|
tree
2012-12-28
Os
c
a
r
Carballal
Merge
p
u
l
l reques
t
#157 from TamaraAtanas
o
s
k
a
/ma
s
ter
commit
|
commitdiff
|
tree
2012-12-28
Oscar Ca
r
ballal
Merge pull requ
e
st #
1
56 from TamaraAtanaso
s
ka/mas
t
er
commit
|
commitdiff
|
tree
2012-12-28
Os
c
ar Carba
l
lal
.
.
.
Minor changes
commit
|
commitdiff
|
tree
2012-12-28
Oscar Car
b
al
l
al
.
.
.
Cleaned imports
commit
|
commitdiff
|
tree
2012-12-28
O
s
car Carball
a
l
.
.
.
Ad
d
ed start_date and
end_date to the
p
ol
l
form and
.
.
.
commit
|
commitdiff
|
tree
2012-12-28
Oscar Carb
a
ll
a
l
.
.
.
Added start and end
d
ates to polls
.
1
commit
|
commitdiff
|
tree
2012-12-27
Oscar C
a
rballal
.
.
.
R
edirect user
that
a
lready voted to the resu
l
ts
.
Remove
.
.
.
commit
|
commitdiff
|
tree
2012-12-27
Oscar Carballal
.
.
.
Fixed list URL e
r
ror and some minor templat
e
e
rrors
.
.
.
commit
|
commitdiff
|
tree
2012-12-27
Oscar Ca
r
ba
l
lal
.
.
.
Fix
e
d
v
ote count on poll res
u
lts
commit
|
commitdiff
|
tree
2012-12-27
O
s
c
a
r
Ca
r
b
allal
.
.
.
Seve
r
a
l
chan
g
es in the data mode
l
s, t
e
mpaltes and
f
unct
i
ons
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
Oscar Car
b
all
a
l
.
.
.
Sol
v
e
d
m
ino
r
i
s
su
e
s
i
n
pol
l
functio
n
s and space index
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
O
s
car Carballal
.
.
.
Rena
m
ed function views and fixed URLs
.
Fixed t
h
e None
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
Os
c
ar Ca
r
ba
l
l
al
.
.
.
Modifie
d
vo
t
ing v
i
ew
.
Added s
a
me mechanism as in proposal
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
Osc
a
r Carballal
.
.
.
Fixed typ
o
in template titl
e
commit
|
commitdiff
|
tree
2012-12-25
Osc
a
r
C
a
rba
l
lal
Merge pull r
e
quest #155 from SantiMunin/master
commit
|
commitdiff
|
tree
2012-12-24
O
s
car Carballal
.
.
.
S
w
itched to new views an
d
f
i
xed u
r
ls
commit
|
commitdiff
|
tree
2012-12-24
O
scar Carbal
l
al
.
.
.
Mi
n
or changes
commit
|
commitdiff
|
tree
2012-12-21
O
s
car Carballal
.
.
.
A
dded some re
l
ated names
and fixed typos b
e
f
or
e
testing
.
.
.
commit
|
commitdiff
|
tree
2012-12-21
Osca
r
Carballal
.
.
.
Mino
r
fi
x
e
s
commit
|
commitdiff
|
tree
2012-12-21
Oscar Carba
l
l
al
.
.
.
U
p
dated model files
and a
d
ded
some
pre-v
i
ews
commit
|
commitdiff
|
tree
2012-12-20
O
scar Carballal
.
.
.
R
e
built URLs for
v
o
ti
n
g module and splitted
v
i
e
ws
commit
|
commitdiff
|
tree
2012-12-20
Osca
r
Carballal
.
.
.
Started
d
e
v
el
o
p
ing sp
l
itted views for
v
ot
i
n
g
module
commit
|
commitdiff
|
tree
2012-12-20
Osca
r
Carballal
.
.
.
Sol
v
ed OpenLayers
markers bug
s
, deleted code fr
o
m proposal_t
.
.
.
commit
|
commitdiff
|
tree
2012-12-20
Osc
a
r
Carballal
.
.
.
Removed caching in
b
ase
.
html du
e
t
o
so
m
e errors refreshing
.
.
.
commit
|
commitdiff
|
tree
2012-12-20
Oscar Carba
l
l
a
l
.
.
.
Changed con
t
a
ct addres
s
commit
|
commitdiff
|
tree
2012-12-19
O
s
c
ar
Carballal
.
.
.
Add
e
d an ex
a
mple d
a
taba
s
e
with u
s
ers
and a space and
.
.
.
commit
|
commitdiff
|
tree
2012-12-19
Oscar
C
arballal
.
.
.
Added default DB with p
e
r
m
i
ss
i
ons for group "Sp
a
ce
.
.
.
commit
|
commitdiff
|
tree
2012-12-19
Oscar Carballal
.
.
.
Replaced index pla
c
e
h
older text
wi
t
h intr
o
d
u
cti
o
n text
.
commit
|
commitdiff
|
tree
2012-12-19
O
scar
C
a
rballal
.
.
.
R
e
m
o
v
ed tr
a
sh HEAD
c
ode from
m
erge
commit
|
commitdiff
|
tree
2012-12-19
Osca
r
Carballal
.
.
.
Merge branch 'tick
e
t_228' of git://
g
ithub
.
com/
S
antiM
u
nin
.
.
.
commit
|
commitdiff
|
tree
2012-12-19
Oscar Carballal
.
.
.
Ad
d
ed maps t
o
pro
p
osal
tem
p
lates
commit
|
commitdiff
|
tree
2012-12-19
O
s
car Carballal
.
.
.
Added pr
o
posals j
a
vascript
code for
m
aps and tools
commit
|
commitdiff
|
tree
2012-12-17
Oscar Carb
a
llal
.
.
.
Up
d
ated l
a
nguage catalog, fix
e
d bit
h
date i
s
su
e
in
.
.
.
commit
|
commitdiff
|
tree
2012-12-17
Osca
r
Carballal
.
.
.
R
emove
d
i18n
_
patterns due to code inconsis
t
e
n
cy
a
nd
.
.
.
commit
|
commitdiff
|
tree
2012-12-13
O
s
car Carballal
.
.
.
Updated voting mo
d
ule URLs to
u
r
l
_
names
commit
|
commitdiff
|
tree
2012-12-13
O
scar Carb
a
llal
.
.
.
Added
url_names fil
e
for
voti
n
g m
o
dule
commit
|
commitdiff
|
tree
2012-12-13
Osc
a
r Carba
l
l
al
.
.
.
M
inor modi
f
ic
a
t
ions into READM
E
and b
u
ildout
commit
|
commitdiff
|
tree
2012-12-13
Oscar Carballa
l
.
.
.
Updated language ca
t
a
logs
.
Prep
a
ring for st
r
i
n
g
freeze
.
.
.
commit
|
commitdiff
|
tree
2012-12-13
Osca
r
Ca
r
ballal
.
.
.
Chan
g
ed
vers
i
on name to 0
.
1
.
7 beta
commit
|
commitdiff
|
tree
2012-12-13
Osca
r
C
a
rballal
.
.
.
Fixed
ge
t
_a
g
e() method and birthda
t
e defaul
t
.
Polished
.
.
.
commit
|
commitdiff
|
tree
2012-12-12
Oscar Carballal
.
.
.
F
n
ished securit
y
c
h
eck
o
n
p
ro
p
osa
l
s
commit
|
commitdiff
|
tree
2012-12-12
Oscar Carballal
.
.
.
Ad
d
e
d
permiss
i
on checks to the EditProposal view
commit
|
commitdiff
|
tree
2012-12-12
Oscar Carballal
.
.
.
Fixed pa
r
ametric err
o
r
in has_s
p
ace_permission
commit
|
commitdiff
|
tree
2012-12-12
Oscar Carballa
l
.
.
.
Remo
v
ed old propos
a
l views fi
l
e
commit
|
commitdiff
|
tree
2012-12-12
Oscar Carb
a
llal
.
.
.
Added
s
ecuri
t
y checks t
o
A
d
dP
r
op
o
sal CBV
commit
|
commitdiff
|
tree
2012-12-12
Oscar Car
b
allal
.
.
.
F
i
x
e
d
t
w
o
syn
t
a
x errors
commit
|
commitdiff
|
tree
2012-12-12
Oscar
C
a
rb
a
l
l
al
.
.
.
Added
s
ecurity checks to ViewProposal and support_propos
a
l
commit
|
commitdiff
|
tree
2012-12-11
Oscar Carballal
.
.
.
Removed annoying deb
u
gging me
s
sage
commit
|
commitdiff
|
tree
next