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 Car
b
al
l
al
Merg
e
pull request #1
7
3 from t
s
savita
/
m
a
ster
commit
|
commitdiff
|
tree
2013-03-06
Oscar Carballal
Mer
g
e
pull r
e
q
uest #
1
72 from
V
ishru
t
Mehta/maste
r
commit
|
commitdiff
|
tree
2013-03-05
Oscar Carball
a
l
.
.
.
M
oved
trav
i
s
file and updated it for the new loc
a
tion
commit
|
commitdiff
|
tree
2013-03-05
Oscar
C
a
rb
a
llal
.
.
.
M
oved travis
f
i
le to proj
e
ct
root
commit
|
commitdiff
|
tree
2013-03-05
Osca
r
Ca
r
b
a
llal
.
.
.
A
dd
e
d
Travis CI
file a
n
d removed djang
o
f
r
om requirements
.
.
.
commit
|
commitdiff
|
tree
2013-03-04
Oscar Carballa
l
Merge pull request #171 f
r
om
V
ish
r
utMehta/master
commit
|
commitdiff
|
tree
2013-02-27
Osca
r
Carb
a
llal
.
.
.
Mi
n
or f
i
xes and fixed #11 wrong vote validat
i
on
.
It
.
.
.
commit
|
commitdiff
|
tree
2013-02-26
Oscar Carballal
.
.
.
Fixed bug in overview tab that
d
idn't work
.
Fixed li
s
t
.
.
.
commit
|
commitdiff
|
tree
2013-02-26
O
scar Car
b
all
a
l
.
.
.
Minor checks a
r
ound ticket
#
1
8
commit
|
commitdiff
|
tree
2013-02-26
O
s
car Carball
a
l
.
.
.
Fix
e
d #
1
9 replacing url by get_
a
bsolute_
u
rl method
commit
|
commitdiff
|
tree
2013-02-26
O
s
car Carball
a
l
.
.
.
Fi
x
#28
c
hange querysets for proposals and
proposals
e
ts
commit
|
commitdiff
|
tree
2013-02-26
Oscar Carballa
l
.
.
.
M
odifie
d
v
i
ew f
o
r
edit debnat
e
and ad
d
e
d
ed
i
t fu
n
ti
o
n
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Oscar Carballal
.
.
.
Fixed #2
4
Included
h
as_space
_
permi
s
sion in the impo
r
ts
commit
|
commitdiff
|
tree
2013-02-25
Oscar
C
arballal
.
.
.
Fixed
#
1
2
Validation fo
r
PDF up
l
oads
.
Relocated
a
nd
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Os
c
a
r
Car
b
allal
.
.
.
F
ixed
#7: Proposals
e
t list
s
ho
w
s
all sets
.
F
i
xed old
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Oscar Carballal
M
e
rge pull requ
e
st #170
f
ro
m
p
iyushbansal/master
commit
|
commitdiff
|
tree
2013-02-25
Oscar
Ca
r
b
allal
.
.
.
Fixe
d
git merge errors
commit
|
commitdiff
|
tree
2013-02-25
Oscar
Carba
l
lal
.
.
.
Merge b
r
anch 'master'
o
f
g
it://g
i
thub
.
com/cidadania
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Oscar Carba
l
lal
.
.
.
S
upport votes
m
odif
i
cat
i
on
commit
|
commitdiff
|
tree
2013-02-25
O
scar Carbal
l
al
Me
r
ge pull request #169
f
rom piyushbansal
/
master
commit
|
commitdiff
|
tree
2013-02-21
O
s
car Carballal
Merge
p
ul
l
req
u
est #1
6
8 from piyushba
n
s
al
/
master
commit
|
commitdiff
|
tree
2013-02-20
Oscar Ca
r
ballal
.
.
.
Merge
branch 'master'
of git://github
.
com/c
i
d
a
dania
.
.
.
commit
|
commitdiff
|
tree
2013-02-20
Oscar Car
b
a
l
lal
.
.
.
F
i
xed p
e
rmission checks
.
Rep
l
aced edit perm
i
ssi
o
n nam
e
.
.
.
commit
|
commitdiff
|
tree
2013-02-19
O
s
ca
r
Carbal
l
al
M
e
r
ge pu
l
l requ
e
st
#167 from
p
iyushban
s
a
l/master
commit
|
commitdiff
|
tree
2013-02-19
Osc
a
r
C
a
rballal
.
.
.
Fi
x
#10 Remove numeric proposal title
commit
|
commitdiff
|
tree
2013-02-19
O
scar
Carba
l
lal
.
.
.
H
i
de the latitude and longitude form field
s
from independent
.
.
.
commit
|
commitdiff
|
tree
2013-02-19
Os
c
ar Carballal
.
.
.
Fixed some errors in the prop
o
sal
s
views
.
commit
|
commitdiff
|
tree
2013-02-19
Osca
r
Car
b
allal
Merge pull request #166 fr
o
m pi
y
ushb
a
nsal/ma
s
ter
commit
|
commitdiff
|
tree
2013-02-18
Oscar
C
arballal
.
.
.
Fixed
#17 Now the user c
a
n del
e
te
notes
.
Fixed err
o
r
.
.
.
commit
|
commitdiff
|
tree
2013-02-18
Oscar Carballal
.
.
.
Fix #16:
C
hang
e
d View, ed
i
t and re
m
ove strings from
.
.
.
commit
|
commitdiff
|
tree
2013-02-18
Oscar Carballal
.
.
.
Merge branch
'
m
a
ster' of git
:
//github
.
com/cida
d
ania
.
.
.
commit
|
commitdiff
|
tree
2013-02-16
Osc
a
r Carbal
l
al
Mer
g
e pull r
e
q
uest
#165 from piyushbansal/
m
aster
commit
|
commitdiff
|
tree
2013-02-15
Oscar Carballal
.
.
.
Fixe
d
double permiss
i
on
v
alidati
o
n in deb
a
te creati
o
n
commit
|
commitdiff
|
tree
2013-02-15
O
scar C
a
r
ballal
.
.
.
Fi
x
ed reques
t
re
f
errals in proposal v
i
e
ws
commit
|
commitdiff
|
tree
2013-02-15
Oscar Car
b
allal
.
.
.
Fixed bad
r
e
f
ere
n
ce to request in p
r
oposals
d
e
let
e
.
.
.
commit
|
commitdiff
|
tree
2013-02-14
Oscar Carballal
.
.
.
Updated the bo
o
tstrap script and fixed some permission
.
.
.
commit
|
commitdiff
|
tree
2013-02-13
O
scar Carballal
.
.
.
Mino
r
b
u
g f
i
xes
commit
|
commitdiff
|
tree
2013-01-30
Oscar Carballal
.
.
.
Added
some files for the se
r
ver
commit
|
commitdiff
|
tree
2013-01-08
O
s
c
a
r Carballal
.
.
.
Updated documen
t
a
t
ion
commit
|
commitdiff
|
tree
2013-01-08
O
scar Carb
a
llal
.
.
.
U
p
dated language catalog
s
commit
|
commitdiff
|
tree
2013-01-08
Os
c
a
r
Car
b
a
l
lal
.
.
.
Adde
d
"Explore" vie
w
a
nd U
R
L, r
e
moved 45px
separat
i
on
.
.
.
commit
|
commitdiff
|
tree
2013-01-07
Oscar Carballal
.
.
.
Solved bug in polls queryset and added new topbar menu
commit
|
commitdiff
|
tree
2013-01-07
Oscar Carbal
l
a
l
.
.
.
Added beta and debug icons
to mast
e
r
commit
|
commitdiff
|
tree
2013-01-07
Oscar Carballal
.
.
.
Fixed w
r
ong ca
l
ls t
o
has_all_permissi
o
ns me
t
hod an
d
.
.
.
commit
|
commitdiff
|
tree
2013-01-04
Oscar
C
arba
l
lal
.
.
.
Fix #159
.
Replaced the addin
g
stante
m
ent for a new
.
.
.
commit
|
commitdiff
|
tree
2013-01-01
Osc
a
r Carb
a
llal
.
.
.
Unc
o
m
ment the au
t
omatic p
e
r
miss
i
on
s
for new users
commit
|
commitdiff
|
tree
2012-12-31
Oscar Carballal
.
.
.
Change
d
version to 0
.
1
.
8 beta
commit
|
commitdiff
|
tree
2012-12-31
Oscar Carba
l
l
a
l
.
.
.
Regen
e
rated language catalogs
commit
|
commitdiff
|
tree
2012-12-31
Oscar Carballal
.
.
.
A
d
ded file missing i
n
the last commit
.
Main voting
.
.
.
commit
|
commitdiff
|
tree
2012-12-31
Oscar
Car
b
allal
.
.
.
Fi
x
ed voting module
.
Added token validation
.
F
i
x
ed
.
.
.
commit
|
commitdiff
|
tree
2012-12-30
Oscar C
a
r
b
a
llal
.
.
.
iFix
e
d datepick
e
r showin
g
in
da
t
e fi
e
l
d
s
commit
|
commitdiff
|
tree
2012-12-30
Os
c
ar
C
a
r
b
a
llal
M
erge pull reque
s
t #158 from
T
amaraAtanasosk
a
/m
a
ster
commit
|
commitdiff
|
tree
2012-12-28
Oscar Carballa
l
Merge pull reque
s
t #157 from TamaraAtana
s
o
s
k
a/master
commit
|
commitdiff
|
tree
2012-12-28
Oscar Carballal
Merge pull requ
e
st
#156 from TamaraA
t
a
n
asoska/mast
e
r
commit
|
commitdiff
|
tree
2012-12-28
Oscar Ca
r
ballal
.
.
.
Minor ch
a
n
g
e
s
commit
|
commitdiff
|
tree
2012-12-28
Oscar Carba
l
lal
.
.
.
Cleaned i
m
ports
commit
|
commitdiff
|
tree
2012-12-28
O
s
c
ar
C
arb
a
llal
.
.
.
Added start_date and end_d
a
t
e to the poll form and
.
.
.
commit
|
commitdiff
|
tree
2012-12-28
Oscar Carb
a
llal
.
.
.
A
dded start a
n
d
end da
t
es
t
o
p
oll
s
.
1
commit
|
commitdiff
|
tree
2012-12-27
Os
c
ar
Carba
l
lal
.
.
.
Redi
r
ect use
r
th
a
t
already voted to the results
.
Remove
.
.
.
commit
|
commitdiff
|
tree
2012-12-27
Oscar Carballal
.
.
.
Fixed list
URL
e
rror and some minor
t
empla
t
e errors
.
.
.
commit
|
commitdiff
|
tree
2012-12-27
Oscar Car
b
allal
.
.
.
Fixed vote count on poll results
commit
|
commitdiff
|
tree
2012-12-27
Oscar Car
b
allal
.
.
.
S
everal chan
g
es in t
h
e dat
a
m
o
dels, tempa
l
tes and functio
n
s
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
Oscar Carballal
.
.
.
Sol
v
e
d
minor
iss
u
es in poll functions and space inde
x
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
Oscar C
a
rballal
.
.
.
Re
n
amed function views and fixed UR
L
s
.
Fixed the None
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
Oscar Carba
l
lal
.
.
.
M
o
d
i
fied voting
v
ie
w
.
A
d
de
d
s
a
me mec
h
anism
a
s in proposal
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
Oscar C
a
rballal
.
.
.
Fixed
t
ypo
in template titl
e
commit
|
commitdiff
|
tree
2012-12-25
Oscar Carb
a
llal
Mer
g
e p
u
ll request #
1
55 from SantiMunin/maste
r
commit
|
commitdiff
|
tree
2012-12-24
O
scar Carballal
.
.
.
Switched to new views
and fi
x
e
d urls
commit
|
commitdiff
|
tree
2012-12-24
Oscar
Carballal
.
.
.
Minor ch
a
n
g
e
s
commit
|
commitdiff
|
tree
2012-12-21
Oscar Carballal
.
.
.
Added som
e
r
elated
n
a
m
es and
f
ixe
d
typos b
e
f
ore test
i
ng
.
.
.
commit
|
commitdiff
|
tree
2012-12-21
Oscar Carb
a
llal
.
.
.
Minor
f
ixes
commit
|
commitdiff
|
tree
2012-12-21
Os
c
ar Carballal
.
.
.
Updated model fi
l
es
and
added some pre-views
commit
|
commitdiff
|
tree
2012-12-20
Oscar Carballal
.
.
.
Rebuil
t
URLs
for voting mod
u
le and split
t
ed view
s
commit
|
commitdiff
|
tree
2012-12-20
Oscar Carballa
l
.
.
.
Star
t
ed deve
l
opi
n
g
splitted
v
iews for vo
t
i
ng mo
d
u
le
commit
|
commitdiff
|
tree
2012-12-20
Oscar Car
b
allal
.
.
.
S
olved OpenL
a
yers markers
bugs,
d
eleted code f
r
o
m proposal_t
.
.
.
commit
|
commitdiff
|
tree
2012-12-20
Osc
a
r Carba
l
lal
.
.
.
Removed ca
c
hi
n
g
in base
.
html due to some
e
rr
o
rs refreshing
.
.
.
commit
|
commitdiff
|
tree
2012-12-20
Oscar Carbal
l
al
.
.
.
Changed con
t
act add
r
ess
commit
|
commitdiff
|
tree
2012-12-19
O
s
car
C
arballal
.
.
.
Add
e
d
a
n
e
x
ample database with users and
a space
and
.
.
.
commit
|
commitdiff
|
tree
2012-12-19
Oscar Ca
r
ballal
.
.
.
Added d
e
fault DB with permission
s
f
or
g
roup "Spa
c
e
.
.
.
commit
|
commitdiff
|
tree
2012-12-19
Oscar Carballal
.
.
.
Rep
l
aced ind
e
x
p
l
aceholder text with
i
ntro
d
uction text
.
commit
|
commitdiff
|
tree
2012-12-19
Oscar Carba
l
lal
.
.
.
Remove
d
trash H
E
AD
cod
e
from mer
g
e
commit
|
commitdiff
|
tree
2012-12-19
O
s
ca
r
Carballal
.
.
.
Merg
e
branc
h
'tick
e
t_228' of git://github
.
com/Sant
i
Munin
.
.
.
commit
|
commitdiff
|
tree
2012-12-19
Oscar Carball
a
l
.
.
.
Added maps to proposal te
m
p
lates
commit
|
commitdiff
|
tree
2012-12-19
Osc
a
r Ca
r
ballal
.
.
.
Added proposals
j
avascript code for maps and
t
ools
commit
|
commitdiff
|
tree
2012-12-17
Oscar Ca
r
ballal
.
.
.
Upd
a
ted language ca
t
al
o
g, fixed bith
date i
s
sue i
n
.
.
.
commit
|
commitdiff
|
tree
2012-12-17
Oscar Carballal
.
.
.
Remove
d
i
18n_patterns due to code
incons
i
stency a
n
d
.
.
.
commit
|
commitdiff
|
tree
2012-12-13
Oscar Carba
l
l
al
.
.
.
Updat
e
d
v
oti
n
g modul
e
URLs to url_n
a
mes
commit
|
commitdiff
|
tree
2012-12-13
Oscar
Carba
l
lal
.
.
.
Added url_names file f
o
r voting modul
e
commit
|
commitdiff
|
tree
2012-12-13
Oscar Ca
r
ballal
.
.
.
Minor modifications int
o
README an
d
buildout
commit
|
commitdiff
|
tree
2012-12-13
Oscar Carballal
.
.
.
Up
d
a
ted langua
g
e cata
l
o
g
s
.
Prep
a
ring
f
o
r s
t
ring
f
reeze
.
.
.
commit
|
commitdiff
|
tree
2012-12-13
Os
c
ar
Carballal
.
.
.
C
han
g
ed version name
t
o 0
.
1
.
7
b
eta
commit
|
commitdiff
|
tree
2012-12-13
O
s
car
C
a
r
b
a
lla
l
.
.
.
Fixed g
e
t
_age() met
h
od and bir
t
hdate
d
efault
.
P
o
lished
.
.
.
commit
|
commitdiff
|
tree
2012-12-12
O
scar
C
arba
l
lal
.
.
.
F
nished security check on proposals
commit
|
commitdiff
|
tree
2012-12-12
Oscar Carballal
.
.
.
Added permi
s
si
o
n che
c
ks t
o
the EditProposal view
commit
|
commitdiff
|
tree
2012-12-12
Oscar
C
a
rballal
.
.
.
Fixed
p
ar
a
met
r
ic
error in has_space_pe
r
m
i
ssion
commit
|
commitdiff
|
tree
2012-12-12
Oscar
C
arbal
l
al
.
.
.
Removed
old prop
o
sal vi
e
ws
f
ile
commit
|
commitdiff
|
tree
2012-12-12
O
sca
r
Carballal
.
.
.
Ad
d
ed
security chec
k
s
to AddProposal CB
V
commit
|
commitdiff
|
tree
2012-12-12
Oscar Carballal
.
.
.
Fixed two syntax errors
commit
|
commitdiff
|
tree
2012-12-12
O
scar
C
arba
l
lal
.
.
.
Added s
e
curity che
c
ks
t
o
V
iewProposal an
d
support_proposal
commit
|
commitdiff
|
tree
2012-12-11
O
s
car Ca
r
ballal
.
.
.
Remo
v
ed annoying debugging messa
g
e
commit
|
commitdiff
|
tree
next