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 branch 'master' of git://github.com/piyushbansal/e-cidadania into piyushbansal...
2013-03-25
Osc
a
r Carballal
.
.
.
Me
r
ge bran
c
h
'maste
r
'
o
f
g
it://github
.
com/piy
u
shbansal
.
.
.
commit
|
commitdiff
|
tree
2013-03-25
Oscar Carballal
M
e
r
ge pull re
q
u
est #187 from tssavita/master
commit
|
commitdiff
|
tree
2013-03-25
Os
c
ar Car
b
allal
Merg
e
pull re
q
uest #185
f
rom VishrutM
e
ht
a
/master
commit
|
commitdiff
|
tree
2013-03-22
Oscar Carballal
M
e
r
ge pull request #186 from
tssavita/m
a
s
ter
commit
|
commitdiff
|
tree
2013-03-18
Oscar Car
b
allal
.
.
.
Removed pe
p
8
verification te
m
porarily
commit
|
commitdiff
|
tree
2013-03-18
Oscar Carbal
l
al
.
.
.
Updated language catalogs and so
m
e minor fixes
i
n the
.
.
.
commit
|
commitdiff
|
tree
2013-03-14
Oscar Ca
r
ballal
.
.
.
F
i
xed #34 Replaced toggle() function (d
e
preca
t
ed
i
n
.
.
.
commit
|
commitdiff
|
tree
2013-03-14
Oscar
Carballal
Mer
g
e pull r
e
q
uest #183 from markododa/do
d
a
commit
|
commitdiff
|
tree
2013-03-14
Os
c
ar
C
a
r
ballal
M
erge pull request #
1
82 from VishrutMehta/master
commit
|
commitdiff
|
tree
2013-03-13
Oscar
C
a
r
ballal
Mer
g
e pull re
q
uest #181 from Vis
h
rutMehta/ma
s
t
e
r
commit
|
commitdiff
|
tree
2013-03-13
Oscar Carballal
Merge pull reques
t
#180 f
r
o
m piyushbans
a
l/master
commit
|
commitdiff
|
tree
2013-03-11
Os
c
ar Carballal
.
.
.
Added missing file in last com
m
it, modernizr
commit
|
commitdiff
|
tree
2013-03-11
Oscar
Carballal
.
.
.
Add
e
d b
r
owser valida
t
io
n
d
e
tec
t
i
n
g canva
s
proper
t
y
commit
|
commitdiff
|
tree
2013-03-11
Oscar Carballal
Merge
pu
l
l request
#
178 fro
m
VishrutMehta/master
commit
|
commitdiff
|
tree
2013-03-11
Os
c
ar Carballal
.
.
.
Fix
#3
2
:
R
emove i1
8
n
u
r
l
s
.
Als
o
r
e
generated lang
u
age
.
.
.
commit
|
commitdiff
|
tree
2013-03-11
Oscar Carballal
.
.
.
Fix
e
d space name in the
t
o
pbar
commit
|
commitdiff
|
tree
2013-03-11
Oscar Carballal
.
.
.
Fixed logo and ba
n
ner blocks in proposal list
t
e
mpla
t
e
commit
|
commitdiff
|
tree
2013-03-08
Os
c
ar Car
b
alla
l
.
.
.
Finished migration to gr
i
tter, added more notifications
.
.
.
commit
|
commitdiff
|
tree
2013-03-08
Oscar C
a
rballal
Me
r
ge pull reque
s
t #177 from VishrutM
e
hta/m
a
st
e
r
commit
|
commitdiff
|
tree
2013-03-06
O
scar
Carbal
l
al
.
.
.
Fix #31: Replac
e
notify
w
i
t
h gritter
.
Also
s
olved a
.
.
.
commit
|
commitdiff
|
tree
2013-03-06
Oscar Carballa
l
.
.
.
Removed jQuery
Noti
f
y lib
r
ary
commit
|
commitdiff
|
tree
2013-03-06
Oscar Carballal
.
.
.
C
omp
i
led and
u
p
d
ated language c
a
talo
g
s
.
commit
|
commitdiff
|
tree
2013-03-06
O
scar Carballal
.
.
.
Replace
d
old Google AP
I
S access for the ne
w
o
ne and
.
.
.
commit
|
commitdiff
|
tree
2013-03-06
Oscar
Carball
a
l
.
.
.
Added Port
u
guese (Brazi
l
) and
H
indi languages
t
o
the
.
.
.
commit
|
commitdiff
|
tree
2013-03-06
Oscar Ca
r
ball
a
l
Merge pull reques
t
#17
6
from
V
ishru
t
Mehta/cleanup
commit
|
commitdiff
|
tree
2013-03-06
Oscar Carballal
Merg
e
pull
reque
s
t #174 from VishrutMeh
t
a/test
commit
|
commitdiff
|
tree
2013-03-06
Oscar Carb
a
llal
Mer
g
e pull
r
eq
u
est #1
7
3 from
t
ss
a
vita/ma
s
ter
commit
|
commitdiff
|
tree
2013-03-06
Oscar
C
arballal
Merge
pu
l
l reque
s
t
#172 fr
o
m VishrutMehta/master
commit
|
commitdiff
|
tree
2013-03-05
O
sca
r
Carballal
.
.
.
Moved travis
file a
n
d updated it
for the new locatio
n
commit
|
commitdiff
|
tree
2013-03-05
Oscar Carb
a
lla
l
.
.
.
Mo
v
ed tr
a
vis fi
l
e to p
r
oj
e
c
t
root
commit
|
commitdiff
|
tree
2013-03-05
O
s
c
a
r Carba
l
lal
.
.
.
Added Trav
i
s CI
f
i
l
e and remov
e
d djan
g
o from
r
eq
u
irem
e
n
t
s
.
.
.
commit
|
commitdiff
|
tree
2013-03-04
Oscar
Carballal
M
e
rge pull reques
t
#171
from Vis
h
r
u
tMehta/m
a
ster
commit
|
commitdiff
|
tree
2013-02-27
O
s
car Carballal
.
.
.
Minor fi
x
es and fi
x
ed #11 wron
g
v
o
t
e
validation
.
I
t
.
.
.
commit
|
commitdiff
|
tree
2013-02-26
Oscar Carb
a
l
lal
.
.
.
Fixed bug
in
ov
e
rview
t
a
b
t
h
at didn't work
.
Fixed list
.
.
.
commit
|
commitdiff
|
tree
2013-02-26
Oscar Car
b
al
l
al
.
.
.
M
i
n
o
r
ch
e
cks a
r
oun
d
t
icket
#
18
commit
|
commitdiff
|
tree
2013-02-26
O
scar Carballal
.
.
.
F
i
xed #
1
9 replacing url by ge
t
_absolute_url m
e
thod
commit
|
commitdiff
|
tree
2013-02-26
Oscar Carba
l
l
a
l
.
.
.
Fix #28 chang
e
que
r
ysets
for
prop
o
sals and proposa
l
sets
commit
|
commitdiff
|
tree
2013-02-26
O
s
c
a
r Carballa
l
.
.
.
Modified view for edit de
b
nate a
n
d added edi
t
funti
o
n
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Oscar Carballa
l
.
.
.
Fixed #24 Included has_space_permission in
t
he imports
commit
|
commitdiff
|
tree
2013-02-25
Os
c
ar C
a
rballa
l
.
.
.
Fixed
#
12 Vali
d
atio
n
for
PDF uploads
.
R
e
locat
e
d and
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Oscar Carballal
.
.
.
Fixed #7: Pr
o
posalset l
i
st s
h
ows all
sets
.
Fixed old
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Oscar Carballal
Mer
g
e pu
l
l request #170 from p
i
y
u
shbansal/m
a
ster
commit
|
commitdiff
|
tree
2013-02-25
Osc
a
r Carballal
.
.
.
Fix
e
d
git merge
e
rrors
commit
|
commitdiff
|
tree
2013-02-25
Osc
a
r
Carball
a
l
.
.
.
Merge
b
ranch
'master' of git://git
h
ub
.
com/cid
a
d
a
nia
.
.
.
commit
|
commitdiff
|
tree
2013-02-25
Osca
r
Carballal
.
.
.
Su
p
port votes
m
o
dification
commit
|
commitdiff
|
tree
2013-02-25
Oscar Car
b
allal
Merge pull
request
#
169 from
p
iyushbans
a
l/m
a
ster
commit
|
commitdiff
|
tree
2013-02-21
Os
c
ar Carballa
l
M
e
rge pull reques
t
#168 from piyushbansal/master
commit
|
commitdiff
|
tree
2013-02-20
Oscar Ca
r
bal
l
al
.
.
.
Merge br
a
nch '
m
aster' of
git
:
//github
.
com/cid
a
dan
i
a
.
.
.
commit
|
commitdiff
|
tree
2013-02-20
Oscar Carballal
.
.
.
Fixed permission checks
.
Rep
l
a
ced edi
t
permission n
a
me
.
.
.
commit
|
commitdiff
|
tree
2013-02-19
O
s
car
Carballal
M
erge
pull
request #167 f
r
om
p
iyushban
s
al/master
commit
|
commitdiff
|
tree
2013-02-19
Oscar Car
b
a
l
lal
.
.
.
Fix #10 Remove numeric propo
s
a
l
title
commit
|
commitdiff
|
tree
2013-02-19
Oscar Carball
a
l
.
.
.
Hi
d
e the latit
u
de and l
o
ng
i
tude form fi
e
lds
from inde
p
e
ndent
.
.
.
commit
|
commitdiff
|
tree
2013-02-19
O
s
c
ar Carballal
.
.
.
Fi
x
ed some error
s
in the proposal
s
vi
e
w
s
.
commit
|
commitdiff
|
tree
2013-02-19
Oscar Carballal
Merge pull request #166 from piyu
s
hbansal/master
commit
|
commitdiff
|
tree
2013-02-18
Oscar Carballal
.
.
.
F
i
xed #17 Now
t
he user can
d
ele
t
e
n
otes
.
Fi
x
ed error
.
.
.
commit
|
commitdiff
|
tree
2013-02-18
Os
c
a
r Ca
r
ballal
.
.
.
Fix
#
1
6: Chang
e
d View
,
e
di
t
and remove strings from
.
.
.
commit
|
commitdiff
|
tree
2013-02-18
Oscar Carballal
.
.
.
M
e
r
g
e
branch '
m
a
ster' of
g
it://github
.
com/cidadania
.
.
.
commit
|
commitdiff
|
tree
2013-02-16
Oscar Carballal
Merge pull request #
1
65
f
rom pi
y
ushbansal/master
commit
|
commitdiff
|
tree
2013-02-15
Oscar Carballal
.
.
.
Fixed dou
b
le permission v
a
l
i
dation in deb
a
te creation
commit
|
commitdiff
|
tree
2013-02-15
Oscar Ca
r
b
a
llal
.
.
.
Fi
x
ed request r
e
ferra
l
s in proposal views
commit
|
commitdiff
|
tree
2013-02-15
Osc
a
r Carba
l
l
a
l
.
.
.
Fixed b
a
d reference to request in proposals delete
.
.
.
commit
|
commitdiff
|
tree
2013-02-14
Osc
a
r
Carballal
.
.
.
Upd
a
ted
the boo
t
strap s
c
ript a
n
d fixed some
p
ermi
s
sion
.
.
.
commit
|
commitdiff
|
tree
2013-02-13
Oscar Carballa
l
.
.
.
M
inor bu
g
f
i
xes
commit
|
commitdiff
|
tree
2013-01-30
Oscar
Carballal
.
.
.
A
dded some fi
l
es f
o
r the server
commit
|
commitdiff
|
tree
2013-01-08
Oscar Carballal
.
.
.
Upd
a
ted documentation
commit
|
commitdiff
|
tree
2013-01-08
Osca
r
Carballal
.
.
.
U
pda
t
ed language catalogs
commit
|
commitdiff
|
tree
2013-01-08
Oscar Carballal
.
.
.
A
d
d
e
d "Explore" view and UR
L
, re
m
o
v
ed
4
5
p
x sepa
r
ation
.
.
.
commit
|
commitdiff
|
tree
2013-01-07
Oscar Carballal
.
.
.
Solved b
u
g in polls querys
e
t
a
nd adde
d
new topb
a
r
menu
commit
|
commitdiff
|
tree
2013-01-07
Oscar Carb
a
llal
.
.
.
Added bet
a
a
n
d deb
u
g icons
t
o master
commit
|
commitdiff
|
tree
2013-01-07
Oscar
C
arballa
l
.
.
.
Fix
e
d wrong calls t
o
h
a
s_all_p
e
r
missions method and
.
.
.
commit
|
commitdiff
|
tree
2013-01-04
Oscar Ca
r
ballal
.
.
.
F
i
x #159
.
Replaced
t
he adding
s
tantemen
t
for
a n
e
w
.
.
.
commit
|
commitdiff
|
tree
2013-01-01
Oscar Carballal
.
.
.
Uncomment the automatic p
e
r
missions for new users
commit
|
commitdiff
|
tree
2012-12-31
Oscar Carballal
.
.
.
Changed
v
e
rsion to 0
.
1
.
8 beta
commit
|
commitdiff
|
tree
2012-12-31
Oscar Carballal
.
.
.
Regene
r
ated
l
ang
u
age catalogs
commit
|
commitdiff
|
tree
2012-12-31
Oscar Carballa
l
.
.
.
Added f
i
le mi
s
s
i
ng in
t
h
e
l
ast
c
ommit
.
M
a
in voti
n
g
.
.
.
commit
|
commitdiff
|
tree
2012-12-31
Oscar Ca
r
ballal
.
.
.
Fixed v
o
t
ing module
.
Added to
k
en validation
.
F
i
xe
d
.
.
.
commit
|
commitdiff
|
tree
2012-12-30
Oscar Carballal
.
.
.
iFixed datepi
c
ker show
i
ng in
d
ate field
s
commit
|
commitdiff
|
tree
2012-12-30
Os
c
ar Carballal
Merge pu
l
l req
u
est #
1
58 from TamaraAtanasoska/master
commit
|
commitdiff
|
tree
2012-12-28
Oscar Carballa
l
M
e
rge pull request
#
157 from T
a
maraAt
a
nasos
k
a/
m
ast
e
r
commit
|
commitdiff
|
tree
2012-12-28
O
scar Ca
r
b
a
llal
M
erg
e
p
u
l
l
request
#
156 from Tamara
A
t
anasoska
/
m
a
ster
commit
|
commitdiff
|
tree
2012-12-28
Oscar C
a
rball
a
l
.
.
.
Mi
n
o
r
changes
commit
|
commitdiff
|
tree
2012-12-28
Oscar Carballal
.
.
.
Cl
e
aned imports
commit
|
commitdiff
|
tree
2012-12-28
O
scar C
a
rball
a
l
.
.
.
Added start
_
date and end_date to the poll form and
.
.
.
commit
|
commitdiff
|
tree
2012-12-28
O
sca
r
Carballal
.
.
.
Added
start
and
e
nd d
a
tes to polls
.
1
commit
|
commitdiff
|
tree
2012-12-27
O
s
car Carballa
l
.
.
.
Re
d
i
re
c
t user that al
r
eady voted to the r
e
sults
.
Remove
.
.
.
commit
|
commitdiff
|
tree
2012-12-27
Os
c
ar Carballal
.
.
.
Fixed list URL
e
rror and some minor
t
emplate errors
.
.
.
commit
|
commitdiff
|
tree
2012-12-27
O
scar Carballal
.
.
.
Fixed vote
c
ount on poll result
s
commit
|
commitdiff
|
tree
2012-12-27
Oscar Carballal
.
.
.
Severa
l
c
hanges in the d
a
ta models, tempaltes
and functions
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
Osc
a
r Carballal
.
.
.
Solved minor iss
u
es
i
n
p
oll functions
an
d
sp
a
c
e i
n
dex
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
Oscar Carb
a
l
lal
.
.
.
Renamed
f
unct
i
on v
i
ews a
n
d
fixed
URLs
.
Fixed the None
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
Oscar C
a
r
b
allal
.
.
.
Modi
f
ied vot
i
ng view
.
Added sa
m
e
m
e
chanis
m
a
s
in proposal
.
.
.
commit
|
commitdiff
|
tree
2012-12-26
O
s
car Carballal
.
.
.
Fixed typo in
template title
commit
|
commitdiff
|
tree
2012-12-25
Oscar Carballal
M
erge pul
l
reques
t
#155 from Sant
i
Munin/mas
t
er
commit
|
commitdiff
|
tree
2012-12-24
Os
c
ar
C
a
r
ballal
.
.
.
Switched to new
v
iews an
d
fi
x
e
d
u
r
l
s
commit
|
commitdiff
|
tree
2012-12-24
Oscar Ca
r
ballal
.
.
.
Minor changes
commit
|
commitdiff
|
tree
2012-12-21
Oscar Carballal
.
.
.
Added
s
ome
related names and
fix
e
d typos before
te
s
ti
n
g
.
.
.
commit
|
commitdiff
|
tree
2012-12-21
O
scar C
a
rb
a
llal
.
.
.
Minor
f
ixes
commit
|
commitdiff
|
tree
2012-12-21
Osc
a
r
Carballal
.
.
.
Updated m
o
del files a
n
d ad
d
ed some pre
-
v
iews
commit
|
commitdiff
|
tree
2012-12-20
Oscar C
a
rballal
.
.
.
Re
b
u
ilt URLs for
vo
t
ing module
and sp
l
itted views
commit
|
commitdiff
|
tree
2012-12-20
Oscar C
a
r
b
allal
.
.
.
Started developing
s
plitted views for
v
oting module
commit
|
commitdiff
|
tree
next