consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
e4e2706af6b50930f09aa080638ca4a4b56d8539
nairobi/app/views
History
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
..
account
displays badge option if official position is level 1
2016-06-20 21:37:03 +02:00
admin
makes sure setting helper is used in views
2016-07-08 14:42:28 +02:00
comments
Adds text for show comment children
2016-07-14 18:02:27 +02:00
custom
Custom folder structure: initial documentation, code and structure folders
2016-05-31 19:57:29 +02:00
debates
Renames variable, updates text
2016-09-15 13:47:53 +02:00
devise
Adds text to notifications icons on header
2016-07-12 13:24:49 +02:00
direct_messages
validates that a user does not want to receive direct messages
2016-06-16 11:23:03 +02:00
kaminari
Removes html role attributes
2016-03-14 19:31:15 +01:00
layouts
makes sure setting helper is used in views
2016-07-08 14:42:28 +02:00
legislations
Replaces icons i tags for span
2016-03-14 19:32:48 +01:00
mailer
sends invitation email to users
2016-06-27 23:37:58 +02:00
management
Fixes specs
2016-07-06 14:47:09 +02:00
moderation
makes sure setting helper is used in views
2016-07-08 14:42:28 +02:00
notifications
refactors notification helpers
2016-06-15 12:12:56 +02:00
organizations/registrations
Adds invisible_captcha to user & organization registrations
2016-04-27 16:13:50 +02:00
pages
Removes Madrid references on pages
2016-07-04 18:07:45 +02:00
proposal_ballots
Renames variable, updates text
2016-09-15 13:47:53 +02:00
proposal_notifications
Adds text to form new
2016-06-15 21:14:56 +02:00
proposals
Merge branch 'master' into voting-proposals
2016-09-15 13:58:53 +02:00
shared
Adds links, texts and i18n
2016-09-07 12:46:29 +02:00
spending_proposals
Displays badge for official positions
2016-06-20 21:37:25 +02:00
stats
adds json view for basic stats
2016-02-08 18:05:30 +01:00
users
hides the retire proposal link for admins in User#show
2016-06-23 17:48:30 +02:00
valuation
Moves back links inside a partial
2016-04-26 13:04:57 +02:00
verification
Changes references to Madrid
2016-07-05 13:47:14 +02:00
welcome
Deletes alt text for decorative images
2016-07-14 18:07:45 +02:00