Alberto Miedes Garcés
|
e3fca5c49f
|
Remove functionality related to votes demographic info
Since this was giving me too much pain and nobody actually requested
this functionality, I decided to remove it.
|
2017-01-25 13:37:29 +01:00 |
|
Juanjo Bazán
|
113f9b32d7
|
Merge branch 'master' into polls
|
2017-01-19 16:51:19 +01:00 |
|
Alberto Miedes Garcés
|
6940b90260
|
Add more fields to api.yml
|
2017-01-09 14:11:51 +01:00 |
|
Alberto Miedes Garcés
|
861a723724
|
Only show public_voter if votable.total_votes are above threshold
|
2017-01-07 17:22:18 +01:00 |
|
Alberto Miedes Garcés
|
6445fffc0d
|
Merge branch 'master' into api-dev-0.18.11
|
2017-01-04 16:21:32 +01:00 |
|
Juanjo Bazán
|
08ea4b35eb
|
Merge branch 'master' into polls
|
2017-01-02 12:14:40 +01:00 |
|
kikito
|
68d598a43d
|
Merge branch 'master' into budgets
|
2017-01-02 12:10:23 +01:00 |
|
Alberto Miedes Garcés
|
9c6001e987
|
Move public_author into module
|
2017-01-01 20:46:08 +01:00 |
|
rgarcia
|
43c18d58ac
|
fixes specs
|
2016-12-29 12:47:57 +01:00 |
|
rgarcia
|
365faeff31
|
removes physical votes from proposals
|
2016-12-29 12:05:29 +01:00 |
|
Juanjo Bazán
|
5ec12e4b5b
|
Merge branch 'master' into redux-polling
|
2016-12-27 18:22:06 +01:00 |
|
Alberto Miedes Garcés
|
2311cd4b1d
|
Renamed User::public_activity scope
|
2016-12-26 18:42:12 +01:00 |
|
Alberto Miedes Garcés
|
402b07d959
|
Expose Proposal public_author using scopes instead of modules
|
2016-12-13 14:04:53 +01:00 |
|
Alberto Miedes Garcés
|
82954c922a
|
Expose public_author for proposals
|
2016-12-11 15:42:17 +01:00 |
|
kikito
|
2a2179d0f3
|
Merge branch 'master' into budget
|
2016-11-28 11:41:49 +01:00 |
|
rgarcia
|
e12f183775
|
fixes typo
|
2016-11-19 14:03:10 +01:00 |
|
rgarcia
|
7d4d9b0ead
|
sorts archived proposals by votes
|
2016-09-16 19:42:18 +02:00 |
|
Alberto Garcia Cabeza
|
910b24936d
|
Merge branch 'master' into voting-proposals
Conflicts:
app/models/proposal.rb
app/views/proposals/_proposal.html.erb
app/views/proposals/index.html.erb
app/views/proposals/show.html.erb
spec/support/common_actions.rb
|
2016-09-15 13:58:53 +02:00 |
|
Juanjo Bazán
|
8d48eccfed
|
adds not_archived scope to proposal
|
2016-09-13 12:10:31 +02:00 |
|
Juanjo Bazán
|
da03311f99
|
archived proposals can not accept votes
|
2016-09-12 18:47:56 +02:00 |
|
Alberto Garcia Cabeza
|
3bbc2862d2
|
Adds admin setting 'months to archive proposals'
|
2016-09-09 18:02:02 +02:00 |
|
Alberto Garcia Cabeza
|
41312ca2a5
|
Creates archived proposals method
|
2016-09-09 17:31:05 +02:00 |
|
Juanjo Bazán
|
e330b704c0
|
removes half-baked feature
archived proposals is a separate issue now
|
2016-09-08 17:06:16 +02:00 |
|
Alberto Garcia Cabeza
|
22487592cf
|
Adds scope for archived proposals
|
2016-09-07 12:57:53 +02:00 |
|
Alberto Garcia Cabeza
|
b107790039
|
Adds links, texts and i18n
|
2016-09-07 12:46:29 +02:00 |
|
Juanjo Bazán
|
b8b71d0ab0
|
Merge branch 'master' into budget
|
2016-09-02 12:47:54 +02:00 |
|
rgarcia
|
9d9bf488fc
|
does not create notifications for blocked or erased users
|
2016-08-02 20:52:20 +02:00 |
|
rgarcia
|
f24a8887bb
|
fixes conflicts with master
|
2016-07-19 14:49:27 +02:00 |
|
rgarcia
|
fc6cc090f8
|
displays notifications in proposal view
|
2016-06-06 12:21:48 +02:00 |
|
rgarcia
|
ca26b3423b
|
sends notification email to each voter
|
2016-06-01 21:40:23 +02:00 |
|
kikito
|
06f48b6fdd
|
Includes description in Sanitizable
|
2016-05-20 12:41:26 +02:00 |
|
kikito
|
dea1a28a69
|
purges simple_captcha
|
2016-04-27 16:07:47 +02:00 |
|
Juanjo Bazán
|
d63cf8b392
|
removes retired proposals from default index
adds a sidebar link to retired proposals list
|
2016-04-23 13:24:15 +02:00 |
|
Juanjo Bazán
|
58a5e2a283
|
authors can retire proposals now
|
2016-04-23 13:24:15 +02:00 |
|
Juanjo Bazán
|
f36f0ca8c8
|
adds scope & boolean method for retired proposals
|
2016-04-23 13:24:15 +02:00 |
|
Raimond Garcia
|
2a4adc2e60
|
Merge pull request #817 from microweb10/friendly_urls
Friendly urls
|
2016-03-02 17:51:00 +01:00 |
|
Juanjo Bazán
|
0e1e0ce371
|
adds filters: by geozone and without_admin
|
2016-02-25 18:18:40 +01:00 |
|
rgarcia
|
6fde504e67
|
displays summary for districts
|
2016-02-19 18:15:18 +01:00 |
|
rgarcia
|
bbeb02e9a9
|
orders summary groups alphabetically
|
2016-02-19 17:55:49 +01:00 |
|
rgarcia
|
5837c3ac94
|
uses standard search to create proposal summaries
|
2016-02-18 17:11:48 +01:00 |
|
rgarcia
|
9409190db1
|
uses tag ids instead of tag names
|
2016-02-17 20:53:25 +01:00 |
|
rgarcia
|
9a767caa27
|
avoids duplicate categories
|
2016-02-17 20:07:28 +01:00 |
|
rgarcia
|
72b8c24470
|
moves category_names method to Tag class
|
2016-02-16 16:23:20 +01:00 |
|
rgarcia
|
fccd5e9e2f
|
cleans up
|
2016-02-16 16:09:07 +01:00 |
|
rgarcia
|
cfb48ef937
|
cleans up
|
2016-02-16 15:30:04 +01:00 |
|
rgarcia
|
42fdc52329
|
adds specs for proposal summary
|
2016-02-16 13:53:39 +01:00 |
|
rgarcia
|
0432151e6b
|
displays only proposals from last week ordered by votes
|
2016-02-16 12:22:20 +01:00 |
|
rgarcia
|
6540092bcd
|
displays the top 3 proposals for every category
|
2016-02-16 12:17:37 +01:00 |
|
Juanjo Bazán
|
c4055d1c28
|
adds searching by proposal code
Closes #844
|
2016-02-12 13:54:57 +01:00 |
|
rgarcia
|
af6bfdbb46
|
moves search logic to a searchable module
|
2016-02-05 14:10:02 +01:00 |
|