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 #142 from bithin/gsoc2012
2012-08-02
Osc
a
r
Carbal
l
al
Merge p
u
ll reques
t
#142 fro
m
b
i
t
h
i
n/gso
c
2012
commit
|
commitdiff
|
tree
2012-07-31
O
s
c
a
r
Carb
a
llal
Mer
g
e pull re
q
uest #141 from TamaraAtanasoska
/
gsoc2012
commit
|
commitdiff
|
tree
2012-07-31
O
scar Carb
a
llal
.
.
.
Fixe
d
#20
8
and
s
ome
other stu
f
f
commit
|
commitdiff
|
tree
2012-07-30
Oscar
Carballal
.
.
.
Fi
x
e
d
a m
i
nor st
y
ling
i
ss
u
e with the voting secti
o
n
.
.
.
commit
|
commitdiff
|
tree
2012-07-30
Oscar Carballal
.
.
.
Fi
x
ed erro
r
tha
t
preve
n
ted syncdb from working
commit
|
commitdiff
|
tree
2012-07-27
Osc
a
r Carballal
Merge pull request #140 from bithin/gsoc2
0
12
commit
|
commitdiff
|
tree
2012-07-27
Osc
a
r Carballal
M
erge pull r
e
quest #13
9
from
h
e116ra1n/gso
c
2
0
12
commit
|
commitdiff
|
tree
2012-07-27
Oscar
Carbal
l
al
.
.
.
Added
i
nstalle
r
for development envir
o
nment
commit
|
commitdiff
|
tree
2012-07-26
Oscar Carballal
.
.
.
Fixed
t
h
e
poll detail templ
a
te style
commit
|
commitdiff
|
tree
2012-07-26
Oscar Carballal
M
e
rge pu
l
l request #138
from Tama
r
a
A
tanasoska/gsoc2
0
12
commit
|
commitdiff
|
tree
2012-07-26
Oscar Carb
a
lla
l
.
.
.
Added polls and voting list
s
in
s
pace inde
x
commit
|
commitdiff
|
tree
2012-07-24
Oscar Carballal
.
.
.
Adde
d
s
l
icing
a
nd
"mor
e
"
l
inks
t
o the space index
commit
|
commitdiff
|
tree
2012-07-24
Oscar Carbal
l
al
.
.
.
Fixed OSM and added t
o
ggle
effe
c
t
commit
|
commitdiff
|
tree
2012-07-24
Oscar Carball
a
l
.
.
.
F
i
x pro
p
os
a
l
map err
o
r
with OpenStreetM
a
p
commit
|
commitdiff
|
tree
2012-07-24
Oscar Carballal
Merge pull request #13
7
from bithin/gsoc2012
commit
|
commitdiff
|
tree
2012-07-23
Oscar Carb
a
llal
Merg
e
pull
r
equest #136 f
r
o
m b
i
t
hin/gsoc
2
012
commit
|
commitdiff
|
tree
2012-07-23
Oscar Carb
a
lla
l
Merge pull requ
e
st
#135
f
rom bithin/g
s
o
c
2012
commit
|
commitdiff
|
tree
2012-07-23
Oscar Carball
a
l
M
er
g
e
pull request
#134 from bithin
/
gsoc2012
commit
|
commitdiff
|
tree
2012-07-23
Osc
a
r Carballal
.
.
.
Merg
e
branch '
g
s
o
c20
1
2
'
o
f
gi
t
://github
.
com/cidadania
.
.
.
commit
|
commitdiff
|
tree
2012-07-23
O
s
car Carballal
.
.
.
Added 'most
viewed' functionality
t
o newsº
commit
|
commitdiff
|
tree
2012-07-20
Oscar
C
arball
a
l
Merge pull request #133 fro
m
bithin/g
s
oc2012
commit
|
commitdiff
|
tree
2012-07-19
O
scar
C
arballal
.
.
.
Added
t
op commented n
e
ws
commit
|
commitdiff
|
tree
2012-07-18
O
scar Carballal
.
.
.
Added comment_c
o
unt met
h
od to News
commit
|
commitdiff
|
tree
2012-07-18
Oscar C
a
r
ballal
Merge pull r
e
quest #132 from bith
i
n
/gsoc2012
commit
|
commitdiff
|
tree
2012-07-18
Oscar
C
a
r
b
allal
.
.
.
Fix
e
d #21
1
: M
a
lfor
m
ed e
v
ent
f
orm
commit
|
commitdiff
|
tree
2012-07-18
O
scar Carballal
.
.
.
Merge
b
ranch
'gsoc2012' of git:
/
/
github
.
com/cidadani
a
.
.
.
commit
|
commitdiff
|
tree
2012-07-18
Osc
a
r Carballal
Merg
e
pull
reques
t
#131 from bithin/gsoc2012
commit
|
commitdiff
|
tree
2012-07-17
Oscar Carba
l
lal
.
.
.
Me
r
ge branc
h
'g
s
oc2012' of git://githu
b
.
com/cidadania
.
.
.
commit
|
commitdiff
|
tree
2012-07-17
Osc
a
r Carballal
M
erge pull reque
s
t #130 fro
m
bithi
n
/g
s
o
c
20
1
2
commit
|
commitdiff
|
tree
2012-07-16
Oscar Ca
r
bal
l
al
.
.
.
Merge branch 'g
s
oc2012' of
g
it://gi
t
hub
.
c
o
m/cidadania
.
.
.
commit
|
commitdiff
|
tree
2012-07-16
Osc
a
r
C
arballal
Merge
pull reques
t
#
1
28 from Ta
m
a
r
aAtanasoska/gsoc2012
commit
|
commitdiff
|
tree
2012-07-16
Oscar Ca
r
b
a
llal
.
.
.
Minor fix
e
s in
v
i
ews
.
Fixed some m2m forms
commit
|
commitdiff
|
tree
2012-07-16
Osca
r
C
arballal
Merge pull
r
eque
s
t
#
127 fro
m
TamaraAtanasoska/gsoc2012
commit
|
commitdiff
|
tree
2012-07-15
Oscar Carballal
.
.
.
Some PEP
8
cl
e
a
n
ing
.
Added user_is_
a
dm
i
n con
t
ext to
.
.
.
commit
|
commitdiff
|
tree
2012-07-13
O
s
car Carballa
l
Merge pull request #126 from TamaraAtanasoska/
g
soc2012
commit
|
commitdiff
|
tree
2012-07-12
Oscar Car
b
alla
l
.
.
.
Styled code in views
.
Added user
c
oun
t
in space
.
Renamed
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Oscar Ca
r
ballal
Merge
pull re
q
u
est #125 from Tamar
a
A
t
anaso
s
ka/g
s
oc2012
commit
|
commitdiff
|
tree
2012-07-11
Oscar C
a
rballal
.
.
.
Fixed permi
s
s
ions
i
n voting
commit
|
commitdiff
|
tree
2012-07-11
Oscar
Carb
a
llal
Merge p
u
ll request
#
124 f
r
om bit
h
in/gsoc2012
commit
|
commitdiff
|
tree
2012-07-10
O
scar Carballal
.
.
.
Fi
x
e
d me
r
ge er
r
ors
commit
|
commitdiff
|
tree
2012-07-10
Oscar
Ca
r
ballal
.
.
.
M
e
rg
e
b
ranch 'g
s
oc
2
012' o
f
git://github
.
c
om/cidadania
.
.
.
commit
|
commitdiff
|
tree
2012-07-10
Os
c
ar Carballal
.
.
.
M
e
r
ge branch 'g
s
oc2012' of git:
/
/github
.
com/TamaraAtan
a
soska
.
.
.
commit
|
commitdiff
|
tree
2012-07-10
Osca
r
C
a
rballal
Merge
p
ull request #121 from bithin
/
gsoc20
1
2
commit
|
commitdiff
|
tree
2012-07-10
Oscar Carballal
Merge pull request #12
0
f
r
om bithin/g
s
o
c
2012
commit
|
commitdiff
|
tree
2012-07-09
Oscar
C
arballal
.
.
.
S
ome modifications
commit
|
commitdiff
|
tree
2012-07-09
Oscar
Ca
r
b
allal
.
.
.
Merge bra
n
ch 'gsoc2012' of git://gith
u
b
.
com/TamaraAtanasoska
.
.
.
commit
|
commitdiff
|
tree
2012-07-06
Oscar C
a
r
b
a
l
lal
Merge p
u
ll request #116 from he116ra1n/gsoc
2
012
commit
|
commitdiff
|
tree
2012-07-06
O
sca
r
Carb
a
l
lal
M
er
g
e pull reques
t
#
115
f
rom he116ra1
n
/gsoc2012
commit
|
commitdiff
|
tree
2012-07-03
Oscar Carballal
.
.
.
Merge branch 'gsoc2012'
o
f
git://github
.
com/cidadania
.
.
.
commit
|
commitdiff
|
tree
2012-07-03
O
s
car Carballal
.
.
.
M
i
n
o
r improvements in Intent vie
w
and template
commit
|
commitdiff
|
tree
2012-07-03
Oscar Car
b
allal
Merge pull request #112 from bi
t
h
i
n/gsoc2012
commit
|
commitdiff
|
tree
2012-07-03
O
s
c
a
r Carballal
M
e
rge pull r
e
qu
e
st #111 fr
o
m bith
i
n/gs
o
c2012
commit
|
commitdiff
|
tree
2012-07-02
Oscar Ca
r
ballal
.
.
.
Fi
x
ed i
n
t
en
t
system for c
i
tizen par
t
icipation
.
Moved
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Osc
a
r Carballa
l
.
.
.
Fixes m2m query and add
e
d
s
taff and supe
r
user u
s
e cases
commit
|
commitdiff
|
tree
2012-07-02
Oscar
Carba
l
lal
.
.
.
Merge b
r
anch 'gsoc2012' of git
:
//github
.
c
om/c
i
dadania
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Oscar C
a
rballal
.
.
.
F
i
x e
r
ror i
n
s
paces l
i
st
.
Fix
i
n
c
o
m
plete p
e
rmission
.
.
.
commit
|
commitdiff
|
tree
2012-06-30
Oscar Carbal
l
a
l
Merge pull re
q
uest #110 from b
i
thin/gso
c
2012
commit
|
commitdiff
|
tree
2012-06-29
Oscar Carballal
.
.
.
Adde
d
default database
with user groups and administrator
commit
|
commitdiff
|
tree
2012-06-29
Oscar
C
arballa
l
.
.
.
Finished crea
t
in
g
u
ser roles manage
m
ent
.
F
ixed permissions
.
.
.
commit
|
commitdiff
|
tree
2012-06-28
Oscar Carball
a
l
.
.
.
Updated language
ca
t
alogs
.
Removed
user ro
l
e
s
fr
o
m
.
.
.
commit
|
commitdiff
|
tree
2012-06-26
Oscar Carballal
.
.
.
Deleted un
n
ecesary bina
r
y fi
l
es
commit
|
commitdiff
|
tree
2012-06-26
Oscar
C
arb
a
llal
Merg
e
pull re
q
ue
s
t #
1
08 from he116r
a
1n/imp
r
ovements
commit
|
commitdiff
|
tree
2012-06-26
Oscar Carb
a
ll
a
l
Merge p
u
ll request
#
107 from b
i
thin/gsoc2012
commit
|
commitdiff
|
tree
2012-06-26
Osca
r
Carballa
l
Merge pull re
q
u
e
st #1
0
6
from bithin/gsoc2012
commit
|
commitdiff
|
tree
2012-06-26
Oscar Carballal
.
.
.
Fi
x
ed NoReverseMatch
error and a minor
e
rror
i
n
the
.
.
.
commit
|
commitdiff
|
tree
2012-06-25
Osca
r
Carballal
.
.
.
Tons o
f
f
i
xes
.
Relocation of the userro
l
e mod
u
le
.
A
dded
.
.
.
commit
|
commitdiff
|
tree
2012-06-25
Oscar Carballal
Merge pull r
e
quest #105 from bithin/gso
c
2012
commit
|
commitdiff
|
tree
2012-06-25
Oscar Carba
l
lal
Merge pull request #104 f
r
om bith
i
n/gsoc2012
commit
|
commitdiff
|
tree
2012-06-22
Oscar Carballal
.
.
.
Red
e
signed home
pag
e
commit
|
commitdiff
|
tree
2012-06-21
Oscar Carbal
l
al
.
.
.
F
i
xes
to the debate system and a bug in the core views
.
.
.
commit
|
commitdiff
|
tree
2012-06-21
Oscar Carb
a
llal
.
.
.
Fixed #55: Per
m
issions on debates
.
Sty
l
e
d
the
d
eba
t
e
.
.
.
commit
|
commitdiff
|
tree
2012-06-21
O
scar Car
b
allal
.
.
.
Fix t
y
po th
a
t preve
n
t
e
d syncdb
t
o work
commit
|
commitdiff
|
tree
2012-06-21
Oscar Carballal
Merge pull requ
e
st #103 f
r
om he116ra1n/imp
r
ovemen
t
s
commit
|
commitdiff
|
tree
2012-06-21
Oscar Carballal
.
.
.
Updated all t
h
e tra
n
slation catalogs
commit
|
commitdiff
|
tree
2012-06-21
Oscar C
a
rballal
.
.
.
Added move_no
t
e
p
ermissions for th
e
debate
s
commit
|
commitdiff
|
tree
2012-06-20
Osca
r
Carball
a
l
.
.
.
U
pdated debate add
f
orm
and some icons according
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-06-20
Oscar Carballal
.
.
.
Fixed
de
b
a
te forms
and
m
in
o
r fixes t
o
propos
a
ls an
d
.
.
.
commit
|
commitdiff
|
tree
2012-06-20
Oscar C
a
r
b
allal
.
.
.
F
i
xed and
u
pd
a
t
ed mar
k
up for the pro
p
osals and
p
r
o
p
o
sal
.
.
.
commit
|
commitdiff
|
tree
2012-06-20
Oscar Carba
l
lal
Me
r
ge pull re
q
uest #10
2
from bithin/gs
o
c20
1
2
commit
|
commitdiff
|
tree
2012-06-19
O
s
c
ar C
a
rba
l
la
l
.
.
.
Updated news forms and
model with the new markup an
d
.
.
.
commit
|
commitdiff
|
tree
2012-06-19
Oscar Carb
a
l
la
l
.
.
.
Up
d
ated document add
/
edit form and
merged it
.
Fixed
.
.
.
commit
|
commitdiff
|
tree
2012-06-19
Oscar Carballal
.
.
.
Created event_form template
w
i
t
h
new m
a
rlip a
n
d tooltip
s
.
.
.
commit
|
commitdiff
|
tree
2012-06-19
Osca
r
Car
b
allal
.
.
.
Fixed title and header un
i
ficati
o
n of the f
o
r
m
.
Now
.
.
.
commit
|
commitdiff
|
tree
2012-06-19
Os
c
ar Car
b
allal
.
.
.
A
dd
e
d new glyphicons icons
a
nd ad
d
ed a tango quest
i
on
.
.
.
commit
|
commitdiff
|
tree
2012-06-19
Oscar Carball
a
l
.
.
.
Me
r
g
e
sp
a
ce add/
e
dit form
.
Fixed ma
r
kup
.
Added tooltips
.
.
.
commit
|
commitdiff
|
tree
2012-06-18
Oscar Car
b
allal
.
.
.
Undo
r
efactoring ove
r
t
he get
_
absolute_url met
h
o
d
in
.
.
.
commit
|
commitdiff
|
tree
2012-06-18
O
s
ca
r
Ca
r
balla
l
.
.
.
Fix #205:
H
TML tags do
n
't re
n
der in debate n
o
te
commit
|
commitdiff
|
tree
2012-06-18
Osca
r
Carballal
.
.
.
oReplaces sp
a
ce
_
nam
e
not
a
tion b
y
mo
r
e intuitive sp
a
ce_url
.
.
.
commit
|
commitdiff
|
tree
2012-06-15
Oscar
Carballal
M
erge pull requ
e
st #94 from he116ra1n/impr
o
vements
commit
|
commitdiff
|
tree
2012-06-15
Osc
a
r
C
arballal
.
.
.
Merge branch 'gsoc2012' of git:/
/
git
h
ub
.
com/c
i
dad
a
nia
.
.
.
commit
|
commitdiff
|
tree
2012-06-15
Osca
r
Carballal
.
.
.
Updated
g
enerator script to 0
.
2
.
Now
t
he script can
.
.
.
commit
|
commitdiff
|
tree
2012-06-14
Oscar Carballal
Merge
p
u
l
l requ
e
st #92 from
b
ithin/gsoc2012
commit
|
commitdiff
|
tree
2012-06-14
Os
c
a
r
C
a
rball
a
l
.
.
.
Updated
french translations and a
d
ded mi
s
sin
g
fi
l
es
.
.
.
commit
|
commitdiff
|
tree
2012-06-14
Osc
a
r Carb
a
llal
.
.
.
A
dd
e
d Fre
n
ch (fr_FR) la
n
guage
.
Upda
t
ed language ca
t
alogs
.
.
.
commit
|
commitdiff
|
tree
2012-06-14
O
s
car Carbal
l
al
.
.
.
Proposal sets a
r
e ob
l
ig
a
to
r
y, can' be
activated or
.
.
.
commit
|
commitdiff
|
tree
2012-06-14
Oscar Carball
a
l
Merge pu
l
l request #91
f
rom h
e
1
16ra1n/improvements
commit
|
commitdiff
|
tree
2012-06-13
Oscar Carballal
Merge pull req
u
est #90 from
he116r
a
1n/
i
mprovements
commit
|
commitdiff
|
tree
2012-06-13
Oscar Carballa
l
M
e
rge pull
r
e
quest #88 from bithin/g
s
oc20
1
2
commit
|
commitdiff
|
tree
2012-06-12
Oscar
C
ar
b
allal
.
.
.
Fi
x
ed DEBU
G
flag and typo in docume
n
t
a
tion
commit
|
commitdiff
|
tree
2012-06-12
Oscar Ca
r
bal
l
al
.
.
.
Add
e
d new
template an
d
up
d
ated the doc
u
m
e
ntation
commit
|
commitdiff
|
tree
next