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

..

activity

adds activity page to administration

2015-09-22 16:30:43 +02:00

comments

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

dashboard

Updates admin and moderation texts

2015-09-25 09:40:51 +02:00

debates

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

moderators

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

officials

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

organizations

Replaces icons i tags for span

2016-03-14 19:32:48 +01:00

proposals

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

settings

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

shared

Improves layout for management spending proposals

2016-04-06 13:07:26 +02:00

spending_proposals

updates dependencies and specs

2016-04-19 13:05:08 +02:00

stats

Merge branch 'master' into tracking_user_verifications_and_others

2016-04-20 11:44:33 +02:00

tags

Adds title on input checkboxes

2016-03-14 19:32:49 +01:00

users

Adds foundation 6 🎉

2016-02-26 19:33:33 +01:00

valuators

adds missing i18n

2016-03-16 11:19:40 +01:00

verifications

refactors pending verification step view [#500]

2015-09-24 17:21:10 +02:00

_menu.html.erb

Replaces icons i tags for span

2016-03-14 19:32:48 +01:00