Commit Graph

691 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
7c65a6ee1a Merge branch 'add_banners_admin' of https://github.com/MaiteHdezRivas/consul into MaiteHdezRivas-add_banners_admin 2016-05-23 12:14:52 +02:00
Juanjo Bazán
65335d1344 optimizes stat query 2016-05-20 11:05:10 +02:00
MaiteHdezRivas
3b2bfc46cf Admin option to add banners and show banners 2016-05-19 13:18:30 +02:00
Juanjo Bazán
c4bf90f576 adds managers section to admin 2016-05-11 11:24:38 +02:00
Juanjo Bazán
d1e50d70d6 managers can login to /management 2016-05-10 19:10:02 +02:00
Juanjo Bazán
fd8fb49015 hides retire link if no author/admin 2016-05-06 12:18:38 +02:00
Juanjo Bazán
2d4ac24465 adds missing param 2016-04-28 18:36:22 +02:00
Raimond Garcia
712e42ca9d Merge pull request #1104 from consul/admin-access-to-management
Admin access to management
2016-04-28 16:55:10 +02:00
kikito
6c9c2f1b96 removes obsolete/deprecated code 2016-04-28 14:00:20 +02:00
kikito
9ac6e2d60b Uses invisible_captcha's default "foo fast" action 2016-04-28 12:47:04 +02:00
Juanjo Bazán
2eabab657a allows admin to sign in into management 2016-04-27 17:26:19 +02:00
Juanjo Bazán
585f3dd6c7 removes use of current_user in management
favors managed_user
to avoid conflicts with logged admin users
2016-04-27 17:26:19 +02:00
kikito
303b17c238 Adds invisible_captcha to user & organization registrations 2016-04-27 16:13:50 +02:00
kikito
7adc706d23 Moves redirect_timestamp_spam to AppController 2016-04-27 16:13:49 +02:00
kikito
289182b145 Adds invisible_captcha to proposals, debates & sps 2016-04-27 16:12:32 +02:00
kikito
eedf02a186 Starts using invisible_captcha in the source code. Pending: tests, proper invisible_captcha gem in Gemfile 2016-04-27 16:07:48 +02:00
kikito
dea1a28a69 purges simple_captcha 2016-04-27 16:07:47 +02:00
Juanjo Bazán
7590deed90 Merge pull request #1100 from consul/polish
splits large method into smaller methods
2016-04-27 12:21:28 +02:00
rgarcia
5aeaa3270d splits large method into smaller methods 2016-04-27 12:17:47 +02:00
rgarcia
aaca99b46f orders valuators by spending proposal count 2016-04-26 23:33:19 +02:00
rgarcia
4bbd3d7233 adds summary of spending proposals by valuator 2016-04-26 22:06:02 +02:00
rgarcia
64bab02a7c adds more explicit order for admin summary 2016-04-26 18:56:59 +02:00
rgarcia
4b751d513f orders admin summary by geozone 2016-04-26 18:26:41 +02:00
rgarcia
d51fe779e2 displays summary info for supported spending proposals 2016-04-26 15:13:53 +02:00
rgarcia
ab1216af3d adds more info to admin summary for spending proposals 2016-04-26 14:47:44 +02:00
Juanjo Bazán
d69d752f58 Merge pull request #1089 from consul/admin-sp-errors-on-update
displays error on failed update
2016-04-26 11:22:27 +02:00
rgarcia
23e325896f displays error on failed update 2016-04-26 11:12:07 +02:00
Juanjo Bazán
1c92ac4089 adds new filter 'All' to admin sps index 2016-04-26 10:20:07 +02:00
Juanjo Bazán
907737d5fa Merge pull request #1087 from consul/spending_proposal_admin_ui
Spending proposal admin ui
2016-04-25 18:50:03 +02:00
kikito
6e8a310ee1 Sorts spending proposals by votes and creation in admin 2016-04-25 18:33:18 +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
ed0a4a8525 adds links to filter retired proposals by reason 2016-04-23 13:24:15 +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
rgarcia
de84480788 adds admin summary page for spending proposals 2016-04-22 15:03:46 +02:00
Juanjo Bazán
54c1c581f9 uses index_customization in debates_controller 2016-04-21 12:00:48 +02:00
MaiteHdezRivas
f771a61a50 Refactoring method on debates controller 2016-04-21 11:13:58 +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
kikito
f86912c77c Adapts to new User api 2016-04-19 13:33:16 +02:00
kikito
c2b205da89 Makes redirect in spending proposal go back to the full page after editing 2016-04-13 13:55:29 +02:00
kikito
d794c1b79d Adds fields to admin/spendingproposals/edit view & controller 2016-04-13 13:54:57 +02:00
Juanjo Bazán
3087b2dac9 changes default order in valuation/sps to votes up 2016-04-11 16:12:03 +02:00
Juanjo Bazán
991b189610 refactors triplicated code 2016-04-08 12:16:09 +02:00
Juanjo Bazán
83e58f0cc9 adds account section to management
for now it only has the option to delete account
2016-04-08 11:43:26 +02:00
Juanjo Bazán
ce477273da adds managers option to delete a level 2 account 2016-04-08 11:03:30 +02:00
kikito
3e8150ceae hides the not-pending sps in valuation 2016-04-07 12:16:11 +02:00