Commit Graph

1026 Commits

Author SHA1 Message Date
kikito
dee409cfc8 Fixes budget_helper issues 2016-12-02 20:10:42 +01:00
kikito
104ccf11e4 Updates paths 2016-12-02 19:16:12 +01:00
kikito
00cfb95913 Starts fixing management budget investments 2016-12-01 16:31:05 +01:00
Juanjo Bazán
cc27c3735c adds back_link_to global helper 2016-12-01 13:37:06 +01:00
Juanjo Bazán
ef52285121 Merge pull request #1277 from consul/polls-admin-menu-styles
Polls admin menu styles
2016-12-01 13:00:50 +01:00
Alberto Garcia Cabeza
7056487f3d improves styles for admin menu 2016-11-30 18:46:35 +01:00
rgarcia
20cb044015 adds search and filter for poll questions 2016-11-29 11:46:30 +01:00
kikito
2a2179d0f3 Merge branch 'master' into budget 2016-11-28 11:41:49 +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
5ba72f0fe3 assigns officers to booths 2016-11-14 13:58:00 +01:00
rgarcia
fda2f3c89e adds admin submit button helper 2016-11-14 13:56:49 +01:00
rgarcia
1ca821c520 creates polling officers from admin 2016-11-14 13:51:09 +01:00
rgarcia
c0f400a4d9 Adds custom locale name for Português 2016-10-31 11:50:24 +01:00
rgarcia
9d4f2d1aff Displays budget groups 2016-09-10 16:22:41 +02:00
rgarcia
9839d7afd0 can add investments to ballot 2016-09-10 16:22:40 +02:00
Juanjo Bazán
0fc31b1259 adds budget/budget_investment indexes to valuators 2016-09-09 13:39:08 +02:00
Juanjo Bazán
8890380804 adds investment editing to admin 2016-09-07 14:13:40 +02:00
Juanjo Bazán
31ef3f4c98 adds heading filter to index 2016-09-06 17:03:35 +02:00
Juanjo Bazán
b0358e4867 adds index of investments with filters to admin 2016-09-05 17:50:58 +02:00
rgarcia
c2c7cdb18d Merge branch 'budget' into budget-public-controllers 2016-09-02 13:15:40 +02:00
Juanjo Bazán
64a614c67f adds geozone helper to map ids and names 2016-08-03 20:20:52 +02:00
Juanjo Bazán
9014de2693 adds budgets_helper 2016-07-29 13:34:11 +02:00
rgarcia
3c55d66591 fixes conflicts with budget 2016-07-27 11:41:46 +02: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
kikito
be6d7a1d39 Adds views and helpers for investments 2016-06-03 18:50:49 +02:00
kikito
fa6f34bf5c Adds basic Budget controller / views 2016-05-31 19:26:56 +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