Juanjo Bazán
d057c9457d
Merge branch 'master' into signature-sheets
2016-12-23 20:23:56 +01:00
rgarcia
25729ac259
cleans up
2016-12-21 18:55:28 +01:00
Alberto Garcia Cabeza
4e7589f406
improves accessibility on subnavigation menu
2016-12-21 12:35:48 +01:00
rgarcia
3c682b8a9b
adds signature sheets
2016-12-20 12:21:05 +01:00
rgarcia
bb3c4c6399
adds consistency to ruby code style
...
Keep a blank line before and after private
Keep a blank line before and after protected
Remove extra empty line at class body end
Remove extra blank line
Add final newline
Use 2 (not 3) spaces for indentation
Use 2 (not 4) spaces for indentation
Remove space before comma
Add space after comma
Remove trailing whitespaces
Remove unnecessary spacing
Use snake_case for variable names
Do not use then for multi-line if
Remove unused block argument - i
Use the new Ruby 1.9 hash syntax
Remove unused assignment to variable
Indent when as deep as case
Align attributes
Align end with def
2016-11-15 11:18:43 +01:00
rgarcia
c0f400a4d9
Adds custom locale name for Português
2016-10-31 11:50:24 +01:00
Juanjo Bazán
06596ac4d8
adds author_of? helper method
2016-06-15 17:01:50 +02:00
rgarcia
e2689d640c
refactors notification helpers
2016-06-15 12:12:56 +02:00
rgarcia
a0ddde16e9
adds notifications for proposals
2016-06-07 22:03:14 +02:00
MaiteHdezRivas
3b2bfc46cf
Admin option to add banners and show banners
2016-05-19 13:18:30 +02:00
Alberto Garcia Cabeza
d46a2f9335
Includes aria hidden attribute on support buttons
2016-05-04 15:21:20 +02:00
rgarcia
8bce72bea3
displays correct admin info for proposals with supports
2016-04-26 17:37:21 +02:00
rgarcia
ab1216af3d
adds more info to admin summary for spending proposals
2016-04-26 14:47:44 +02:00
Juanjo Bazán
66dd511979
Merge pull request #1041 from consul/select-featured-debates
...
Select featured debates
2016-04-25 18:19:40 +02:00
Juanjo Bazán
479b48796f
Merge pull request #1085 from consul/retire-proposals
...
Retire proposals
2016-04-25 18:00:34 +02:00
Juanjo Bazán
32f971f0ad
Merge pull request #1084 from consul/spending-proposals-summary
...
Spending proposals admin summary
2016-04-25 11:29:07 +02:00
Juanjo Bazán
58a5e2a283
authors can retire proposals now
2016-04-23 13:24:15 +02:00
rgarcia
de84480788
adds admin summary page for spending proposals
2016-04-22 15:03:46 +02:00
MaiteHdezRivas
3e7db9d1b5
Best practices code changes
2016-04-20 16:40:58 +02:00
palomahnhp
bf5d253e12
Merge branch 'master' into tracking_user_verifications_and_others
...
Conflicts:
app/controllers/admin/stats_controller.rb
db/dev_seeds.rb
2016-04-20 11:44:33 +02:00
palomahnhp
b4ec077f16
Merge remote-tracking branch 'origin/master' into tracking_user_verifications_and_others
...
Conflicts:
app/assets/javascripts/application.js
2016-04-20 11:28:06 +02:00
Alberto Garcia Cabeza
42502cecb7
Fixes youtu.be embedded videos
2016-04-19 00:08:12 +02:00
rgarcia
5f60376c1d
changes order in valuator select
2016-04-12 19:12:28 +02:00
rgarcia
20c403e37b
uses valuator description in select
2016-04-12 18:39:14 +02:00
Juanjo Bazán
48c3cc580c
adds namespaced helper for spending_proposal route
2016-04-06 11:04:22 +02:00
Alberto Garcia Cabeza
3fd8e76a79
Merge branch 'select_debates_which_display_as_featured' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-select_debates_which_display_as_featured
...
Conflicts:
db/schema.rb
2016-04-05 14:05:27 +02:00
Raimond Garcia
fcf1b83740
Merge pull request #1009 from inobCR/Add_stats_for_Investment_Proyect_#918
...
Add stats for Investment Proyect (spending proposals) #918
2016-04-04 13:45:03 +02:00
MaiteHdezRivas
69bd24d2c8
merge with consul
2016-03-21 18:28:20 +01:00
inobcr
e2610e15e7
Add_stats_for_Investment_Proyect_#918
2016-03-21 18:18:18 +01:00
palomahnhp
3c7b71018b
embed video in proposal show
2016-03-20 20:44:20 +01:00
MaiteHdezRivas
68f9a76cea
Mark debates as featured
2016-03-20 13:56:05 +01:00
Juanjo Bazán
f4010bc77d
shows valuator description in admin edit form
2016-03-18 19:44:18 +01:00
Juanjo Bazán
5aa9cf9c50
changes links in 'My activity' to point to comment
...
(instead of to commentable)
Closes #947
2016-03-14 13:17:29 +01:00
palomahnhp
7d4936b577
track user verification and add statistics of verified users who did not vote proposals
2016-03-13 21:38:05 +01:00
rgarcia
e586a1df58
fixes conflicts with master
2016-03-08 14:31:18 +01:00
Juanjo Bazán
2f4621ab09
adds helper for explanation fields
2016-03-08 14:01:16 +01:00
rgarcia
cd8cbef389
adds filtering of tags for spending proposals
2016-03-08 13:57:58 +01:00
Juanjo Bazán
7231f72e01
cleans up show view
2016-03-08 13:40:35 +01:00
Juanjo Bazán
1cbd1f9324
moves assigned valuators info to helper
2016-03-08 13:33:03 +01:00
Juanjo Bazán
ac9eaec9d9
adds spending proposals index to valuation
...
filters included: valuation_open, valuating, valuation_finished
search by geozone & by valuator
2016-03-04 20:19:43 +01:00
rgarcia
ec25b388c7
adds filtering of spending proposals by admin
2016-03-01 20:10:57 +01:00
Juanjo Bazán
0325dd6199
refactors settings/flags helper to memoize values
2016-02-04 17:45:43 +01:00
rgarcia
48b5aba1c5
removes unused helper
2016-01-27 14:55:42 +01:00
rgarcia
eed3623466
users full text search of tag
2016-01-27 14:19:21 +01:00
Juanjo Bazán
393388de71
Merge pull request #830 from AjuntamentdeBarcelona/feature_flags
...
Feature flags
2016-01-18 15:19:09 +01:00
Juanjo Bazán
09b53a3d0a
Merge pull request #822 from consul/advanced-search
...
Advanced search
2016-01-18 15:17:17 +01:00
rgarcia
8d7984dcb3
uses case statement instead of eval
2016-01-18 15:02:18 +01:00
Josep Jaume Rey Peroy
2d45828cad
Feature-flag debates
2016-01-18 13:05:00 +01:00
Josep Jaume Rey Peroy
5de3d700e4
Simplify Settings API
2016-01-18 12:43:34 +01:00
rgarcia
44769d96f4
adds comprehensive specs for author type and date range searches
2016-01-16 21:45:59 +01:00
