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 #139 from he116ra1n/gsoc2012
2012-07-27
Osca
r
Carballal
Merge pull request #139 fr
o
m
h
e
116ra1n/gsoc2012
commit
|
commitdiff
|
tree
2012-07-27
Osca
r
Carballal
.
.
.
Added insta
l
ler f
o
r
development en
v
iron
m
ent
commit
|
commitdiff
|
tree
2012-07-26
Osc
a
r Ca
r
ballal
.
.
.
Fixed
t
he poll detai
l
templat
e
style
commit
|
commitdiff
|
tree
2012-07-26
O
scar Carballa
l
Merge pull request #138 fr
o
m TamaraAtanasoska/gsoc2012
commit
|
commitdiff
|
tree
2012-07-26
O
s
car C
a
rball
a
l
.
.
.
Added polls and voting
l
i
s
t
s
i
n space index
commit
|
commitdiff
|
tree
2012-07-24
Osc
a
r Carballal
.
.
.
Added slicing and "m
o
re" links to the
s
pac
e
i
ndex
commit
|
commitdiff
|
tree
2012-07-24
Oscar Carbal
l
al
.
.
.
Fixed OSM and a
d
ded toggle e
f
fect
commit
|
commitdiff
|
tree
2012-07-24
Oscar Car
b
allal
.
.
.
Fix p
r
oposal map e
r
ror
w
ith OpenStreetMap
commit
|
commitdiff
|
tree
2012-07-24
Osca
r
Carbal
l
al
Merge pull requ
e
st #
1
37 f
r
om bithin/
g
soc
2
012
commit
|
commitdiff
|
tree
2012-07-23
Oscar
C
a
rb
a
l
l
a
l
Merge pull re
q
ues
t
#136 fr
o
m bithin/g
s
oc20
1
2
commit
|
commitdiff
|
tree
2012-07-23
Oscar Carballal
Me
r
ge pull request #135 fr
o
m bit
h
in
/
g
s
oc20
1
2
commit
|
commitdiff
|
tree
2012-07-23
Oscar Carballal
Merge pull request
#
1
34 from
b
ithin/gsoc2
0
12
commit
|
commitdiff
|
tree
2012-07-23
Oscar C
a
rballal
.
.
.
M
e
r
g
e
branch
'
gsoc20
1
2'
of git://github
.
c
om/cidadania
.
.
.
commit
|
commitdiff
|
tree
2012-07-23
Oscar Carb
a
llal
.
.
.
Ad
d
ed 'm
o
st viewed' fun
c
tionality to news
º
commit
|
commitdiff
|
tree
2012-07-20
O
s
car Car
b
allal
Me
r
ge pull req
u
est #133
f
rom bithin/gsoc2012
commit
|
commitdiff
|
tree
2012-07-19
Oscar Carbal
l
al
.
.
.
Ad
d
ed top commented
news
commit
|
commitdiff
|
tree
2012-07-18
O
scar
C
arballal
.
.
.
Added com
m
ent_count
method to News
commit
|
commitdiff
|
tree
2012-07-18
Oscar Carballal
M
erge pull request
#
132 from
b
ithi
n
/gsoc2012
commit
|
commitdiff
|
tree
2012-07-18
Os
c
ar Ca
r
b
a
llal
.
.
.
Fixe
d
#211: Malformed event
f
orm
commit
|
commitdiff
|
tree
2012-07-18
Oscar Carballal
.
.
.
Merge bran
c
h 'gsoc2
0
12' o
f
git://github
.
com/cidadania
.
.
.
commit
|
commitdiff
|
tree
2012-07-18
Oscar Car
b
allal
Merge pull req
u
e
s
t #131 from bithi
n
/
g
soc2012
commit
|
commitdiff
|
tree
2012-07-17
Osca
r
C
a
r
ball
a
l
.
.
.
Merge
branch 'gsoc2012'
of
g
it://gi
t
hub
.
com/cidadania
.
.
.
commit
|
commitdiff
|
tree
2012-07-17
Os
c
a
r
C
a
rbal
l
al
Me
r
ge pull req
u
est #130 from bithin/gsoc2012
commit
|
commitdiff
|
tree
2012-07-16
Osca
r
C
arbal
l
al
.
.
.
Merge br
a
nch 'gsoc2012' of git://github
.
com
/
ci
d
adania
.
.
.
commit
|
commitdiff
|
tree
2012-07-16
O
scar Carbal
l
al
Merge pull
request #128 from TamaraAt
a
nasosk
a
/gsoc201
2
commit
|
commitdiff
|
tree
2012-07-16
Osca
r
Carballal
.
.
.
M
i
n
o
r
fi
x
es in views
.
Fixed some
m2m fo
r
m
s
commit
|
commitdiff
|
tree
2012-07-16
Oscar Carbal
l
al
Mer
g
e
pull request #127 from Tama
r
aAt
a
na
s
o
ska/gsoc2012
commit
|
commitdiff
|
tree
2012-07-15
O
s
c
a
r C
a
rba
l
lal
.
.
.
Some PEP8 cleaning
.
Added u
s
er_is_a
d
min
context to
.
.
.
commit
|
commitdiff
|
tree
2012-07-13
Osca
r
Carballal
Merge
p
u
ll reque
s
t #126
from T
a
mar
a
Atanasoska/
g
so
c
2012
commit
|
commitdiff
|
tree
2012-07-12
Osc
a
r Carballal
.
.
.
Sty
l
ed
c
ode in views
.
Adde
d
user count in
space
.
R
e
named
.
.
.
commit
|
commitdiff
|
tree
2012-07-11
Oscar
Carballal
Merge pul
l
req
u
est #125 fro
m
TamaraAtanasosk
a
/gsoc20
1
2
commit
|
commitdiff
|
tree
2012-07-11
Oscar Car
b
allal
.
.
.
Fi
x
ed permiss
i
ons in voting
commit
|
commitdiff
|
tree
2012-07-11
Osca
r
Carballal
Merge pull requ
e
s
t
#
12
4
from bit
h
in/
g
soc2012
commit
|
commitdiff
|
tree
2012-07-10
Oscar Carb
a
llal
.
.
.
F
i
xed merge errors
commit
|
commitdiff
|
tree
2012-07-10
Oscar Carballal
.
.
.
Merge
branch 'g
s
oc2012'
of git://github
.
com/cid
a
dani
a
.
.
.
commit
|
commitdiff
|
tree
2012-07-10
Oscar Carballal
.
.
.
Merge bra
n
ch
'gsoc201
2
' of git://
g
i
thub
.
com/TamaraAtanaso
s
ka
.
.
.
commit
|
commitdiff
|
tree
2012-07-10
Oscar Carballal
Merge pull r
e
quest
#121 from bithin/gsoc2012
commit
|
commitdiff
|
tree
2012-07-10
Oscar Carbal
l
al
Merge pull request
#
1
2
0 from
b
ithin/gsoc
2
0
1
2
commit
|
commitdiff
|
tree
2012-07-09
Oscar Carba
l
lal
.
.
.
Some mod
i
fica
t
i
ons
commit
|
commitdiff
|
tree
2012-07-09
O
s
c
a
r Carbal
l
al
.
.
.
Merge bran
c
h '
g
soc2012' of git:
/
/github
.
com/TamaraAta
n
a
soska
.
.
.
commit
|
commitdiff
|
tree
2012-07-06
Oscar C
a
r
b
allal
Merg
e
pull r
e
quest #116 from
h
e116ra1
n
/gsoc2012
commit
|
commitdiff
|
tree
2012-07-06
Oscar Carballa
l
Mer
g
e pull request
#
115 from
he116r
a
1n/gsoc201
2
commit
|
commitdiff
|
tree
2012-07-03
Oscar Carbal
l
al
.
.
.
Merge branch 'g
s
o
c2012'
of git://
g
i
t
hub
.
com/cidad
a
nia
.
.
.
commit
|
commitdiff
|
tree
2012-07-03
Oscar Carballal
.
.
.
Minor improvements in Intent view and template
commit
|
commitdiff
|
tree
2012-07-03
Oscar Carballa
l
Me
r
ge
p
ull r
e
qu
e
st #112 from bithin/gsoc2012
commit
|
commitdiff
|
tree
2012-07-03
Oscar Carba
l
lal
Merge pull
request
#
111
f
rom bit
h
in/gso
c
2012
commit
|
commitdiff
|
tree
2012-07-02
Os
c
a
r
C
a
rballal
.
.
.
Fixed
i
ntent system for cit
i
z
e
n participa
t
ion
.
M
o
ved
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
O
sca
r
Carballal
.
.
.
F
ixes m2m que
r
y and
a
dded
s
taff and s
u
peruser use cases
commit
|
commitdiff
|
tree
2012-07-02
O
s
car Carb
a
ll
a
l
.
.
.
Merge branch
'
gsoc2012' of g
i
t
:
//github
.
com/
c
id
a
dan
i
a
.
.
.
commit
|
commitdiff
|
tree
2012-07-02
Os
c
a
r Ca
r
ballal
.
.
.
Fix error in spa
c
es list
.
F
i
x inco
m
plet
e
permission
.
.
.
commit
|
commitdiff
|
tree
2012-06-30
Os
c
ar
C
a
rballal
Mer
g
e pull
r
equest #110
f
rom bithin/gsoc2012
commit
|
commitdiff
|
tree
2012-06-29
Oscar Carbal
l
al
.
.
.
Added defaul
t
database with user g
r
oup
s
and administrator
commit
|
commitdiff
|
tree
2012-06-29
Oscar Carballal
.
.
.
Fi
n
i
s
hed crea
t
ing user role
s
management
.
Fixed
permiss
i
ons
.
.
.
commit
|
commitdiff
|
tree
2012-06-28
Osc
a
r Carb
a
llal
.
.
.
Upd
a
t
ed lan
g
uage catalogs
.
Removed user rol
e
s
f
rom
.
.
.
commit
|
commitdiff
|
tree
2012-06-26
Osc
a
r Carballal
.
.
.
D
ele
t
ed un
n
ec
e
sary
b
inary
files
commit
|
commitdiff
|
tree
2012-06-26
O
scar Carball
a
l
Merge pull
r
equest #108 from
he11
6
ra1n/improvements
commit
|
commitdiff
|
tree
2012-06-26
Oscar Carball
a
l
M
erge pull req
u
est #107 from bithin/gsoc
2
012
commit
|
commitdiff
|
tree
2012-06-26
Oscar
Carballal
M
erg
e
p
u
l
l
r
e
qu
e
st #
1
06
f
rom
b
i
t
hin/gsoc2012
commit
|
commitdiff
|
tree
2012-06-26
Oscar
Carba
l
lal
.
.
.
Fix
e
d NoReverseM
a
tch err
o
r and a minor error in the
.
.
.
commit
|
commitdiff
|
tree
2012-06-25
Osca
r
C
arba
l
lal
.
.
.
Tons of fixes
.
Relocatio
n
of the userrole
m
odule
.
Added
.
.
.
commit
|
commitdiff
|
tree
2012-06-25
Osc
a
r Carballal
Merge pull
r
equest #
1
05 fro
m
b
ithi
n
/gsoc2
0
1
2
commit
|
commitdiff
|
tree
2012-06-25
Oscar Carballal
Merge pull request #104 f
r
om bithin/gsoc2012
commit
|
commitdiff
|
tree
2012-06-22
Os
c
ar Carballal
.
.
.
Redesigned hom
e
page
commit
|
commitdiff
|
tree
2012-06-21
Osc
a
r Car
b
a
l
lal
.
.
.
Fixe
s
to th
e
d
ebate sy
s
tem a
n
d a bug
in the
c
ore views
.
.
.
commit
|
commitdiff
|
tree
2012-06-21
Os
c
ar
Carballal
.
.
.
Fixed
#
5
5
: Permissions on debates
.
Styled the
d
ebate
.
.
.
commit
|
commitdiff
|
tree
2012-06-21
O
s
car Ca
r
ballal
.
.
.
Fix typo that pre
v
ented syncdb to wo
r
k
commit
|
commitdiff
|
tree
2012-06-21
O
scar Carballal
Merge pull r
e
quest #103 f
r
om he116ra1n/improvements
commit
|
commitdiff
|
tree
2012-06-21
Osc
a
r Ca
r
balla
l
.
.
.
Updated all the tran
s
lation cat
a
logs
commit
|
commitdiff
|
tree
2012-06-21
O
sc
a
r Ca
r
ballal
.
.
.
Added m
o
ve_note permiss
i
ons
for the
debates
commit
|
commitdiff
|
tree
2012-06-20
Osca
r
Ca
r
b
a
llal
.
.
.
Updated d
e
bate add form and some icon
s
a
c
cordin
g
t
o
.
.
.
commit
|
commitdiff
|
tree
2012-06-20
Oscar Carballal
.
.
.
Fixed debate forms and mi
n
or
fixes to
p
r
o
po
s
als and
.
.
.
commit
|
commitdiff
|
tree
2012-06-20
Oscar Carbal
l
al
.
.
.
Fi
x
e
d and updated markup for the pro
p
osals a
n
d proposal
.
.
.
commit
|
commitdiff
|
tree
2012-06-20
Oscar Carba
l
lal
Merge pull r
e
ques
t
#
102 from
bithin/g
s
oc2012
commit
|
commitdiff
|
tree
2012-06-19
Oscar Car
b
a
l
lal
.
.
.
Update
d
news for
m
s and
model with the ne
w
markup and
.
.
.
commit
|
commitdiff
|
tree
2012-06-19
Oscar Carba
l
lal
.
.
.
Up
d
ated document add/edit form and m
e
rged
it
.
Fixe
d
.
.
.
commit
|
commitdiff
|
tree
2012-06-19
Osc
a
r
Carballal
.
.
.
Created ev
e
n
t
_
f
orm
t
emplate wi
t
h new
m
arlip a
n
d
tooltips
.
.
.
commit
|
commitdiff
|
tree
2012-06-19
O
s
ca
r
C
a
r
b
a
llal
.
.
.
F
i
x
ed title and header un
i
fic
a
tion of th
e
form
.
Now
.
.
.
commit
|
commitdiff
|
tree
2012-06-19
Os
c
ar Carballal
.
.
.
Added
new g
l
yphico
n
s icon
s
and a
d
ded a t
a
n
go ques
t
ion
.
.
.
commit
|
commitdiff
|
tree
2012-06-19
O
s
c
a
r C
a
rballal
.
.
.
Merge space add/ed
i
t form
.
Fixed markup
.
Added t
o
oltips
.
.
.
commit
|
commitdiff
|
tree
2012-06-18
Osc
a
r Carba
l
lal
.
.
.
U
n
d
o
ref
a
ct
o
ring over
t
he get_absolute_url method in
.
.
.
commit
|
commitdiff
|
tree
2012-06-18
Oscar Carballal
.
.
.
Fix #205: HTML tags don't render in debate
note
commit
|
commitdiff
|
tree
2012-06-18
Oscar Carb
a
llal
.
.
.
oR
e
plac
e
s s
p
ace_
n
a
me notation b
y
more intui
t
ive space_url
.
.
.
commit
|
commitdiff
|
tree
2012-06-15
Oscar Carballal
M
e
r
ge pull request #
9
4 from he116ra1n/imp
r
ov
e
ments
commit
|
commitdiff
|
tree
2012-06-15
Oscar Carballal
.
.
.
M
e
r
ge br
a
n
ch 'gsoc2012' of git:
/
/github
.
com/cidadania
.
.
.
commit
|
commitdiff
|
tree
2012-06-15
Oscar Carba
l
lal
.
.
.
Updated generator scri
p
t to
0
.
2
.
Now the sc
r
ipt can
.
.
.
commit
|
commitdiff
|
tree
2012-06-14
Oscar Carballal
M
er
g
e
p
u
l
l request
#
92 from
bithi
n
/gsoc20
1
2
commit
|
commitdiff
|
tree
2012-06-14
Osc
a
r
C
arballal
.
.
.
Upd
a
ted
fre
n
ch tr
a
nsla
t
io
n
s an
d
a
d
d
e
d
missing f
i
les
.
.
.
commit
|
commitdiff
|
tree
2012-06-14
Oscar Carballal
.
.
.
Ad
d
ed French (
f
r_FR) language
.
U
pdated language cata
l
og
s
.
.
.
commit
|
commitdiff
|
tree
2012-06-14
Oscar
Carballal
.
.
.
P
r
o
p
osal sets are obligatory,
can' be
a
ct
i
vated or
.
.
.
commit
|
commitdiff
|
tree
2012-06-14
Oscar
C
arballal
Merge pull reques
t
#91
from he116ra
1
n
/
improvements
commit
|
commitdiff
|
tree
2012-06-13
O
scar Carbal
l
a
l
Merge pull
r
eq
u
es
t
#90 from he11
6
ra1
n
/
impro
v
ements
commit
|
commitdiff
|
tree
2012-06-13
Oscar C
a
rba
l
l
al
M
erge
p
ull request #88 from
b
ithin/gsoc2012
commit
|
commitdiff
|
tree
2012-06-12
O
s
car Carba
l
lal
.
.
.
Fixed DEBUG fl
a
g a
n
d t
y
po in
d
oc
u
mentation
commit
|
commitdiff
|
tree
2012-06-12
O
scar Carballal
.
.
.
Added new template and u
p
dated the documentation
commit
|
commitdiff
|
tree
2012-06-12
O
s
c
ar Carba
l
l
al
Merg
e
pul
l
re
q
uest
#
87 from bithin/gsoc2012
commit
|
commitdiff
|
tree
2012-06-12
Oscar
Carballal
.
.
.
Updat
e
d index file
commit
|
commitdiff
|
tree
2012-06-12
Oscar Carba
l
l
a
l
.
.
.
Minor fixes
a
nd
a
d
ded link
t
o
develo
p
me
n
t e
n
vironment
commit
|
commitdiff
|
tree
2012-06-12
O
s
car Carba
l
lal
.
.
.
Up
d
a
ted the cofiguration docs
to
reflect
c
hanged made
.
.
.
commit
|
commitdiff
|
tree
2012-06-12
Oscar Carballal
.
.
.
Updated
a
nd fixed so
m
e sy
n
t
a
z for the
e
nvironment docs
commit
|
commitdiff
|
tree
2012-06-12
Oscar Ca
r
ba
l
lal
.
.
.
U
pda
t
ed list
o
f authors
,
including p
e
opl
e
from
t
he
.
.
.
commit
|
commitdiff
|
tree
next