consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,859 Commits 1 Branch 0 Tags
e7de5c3a7f0c6e7bcc7b4caea1ada23e2bef02cb
Commit Graph

1361 Commits

Author SHA1 Message Date
rgarcia
72e173b8ea closes missing div 2016-09-16 20:25:12 +02:00
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
Alberto Garcia Cabeza
7abd31e4bf Renames variable, updates text 2016-09-15 13:47:53 +02:00
Juanjo Bazán
e0c3f7c029 Merge pull request #1213 from consul/archived-proposals 
Archived proposals
 2016-09-15 13:22:05 +02:00
Alberto Garcia Cabeza
db6f82fa4c Moves banner to a partial and includes it on debates index 2016-09-14 11:09:36 +02:00
Alberto Garcia Cabeza
076e237320 Improves proposal ballot banner, deletes unused partial 2016-09-14 10:40:16 +02:00
Alberto Garcia Cabeza
6fac3c67ff Merge branch 'voting-proposals' of github.com:consul/consul into voting-proposals 2016-09-12 18:07:22 +02:00
Alberto Garcia Cabeza
77077b28b8 Removes question and supports on successfull proposals 2016-09-12 18:06:43 +02:00
Alberto Garcia Cabeza
d5af06da5d Adds proposal's total votes in index/show views 2016-09-12 17:56:15 +02:00
Alberto Garcia Cabeza
fa3b503c47 Adds specs 2016-09-09 17:32:21 +02:00
Alberto Garcia Cabeza
e8b70a48fa Adds tab in index & removes support button in index/show 2016-09-09 17:32:03 +02:00
Juanjo Bazán
974c4d6d70 adds specs for proposal ballots 2016-09-08 12:43:06 +02:00
Alberto Garcia Cabeza
cff1f43a90 Adds banner, styles, and updates icons font 2016-09-07 16:42:57 +02:00
Jaime Iniesta
9c48a46f0a adjusts style for badge in featured proposals 2016-09-07 13:22:52 +02:00
Jaime Iniesta
8af944ce56 Fixes failing spec for badges. 
spec/features/official_positions_spec.rb:56 was failing because the expected
badge was not being shown in featured proposals.
 2016-09-07 13:13:06 +02:00
Alberto Garcia Cabeza
b107790039 Adds links, texts and i18n 2016-09-07 12:46:29 +02:00
Alberto Garcia Cabeza
a527de4f92 Adds proposal ballots controller and views 2016-09-07 12:43:12 +02:00
Juanjo Bazán
fb810c1b90 Merge pull request #1188 from consul/custom-folders 
Custom folders
 2016-07-21 13:19:52 +02:00
rgarcia
a23666683f fixes conflicts with master 2016-07-19 15:50:22 +02:00
Alberto Garcia Cabeza
a30d9218d4 Deletes alt text for decorative images 2016-07-14 18:07:45 +02:00
Alberto Garcia Cabeza
c3d70f6e95 Adds text for show comment children 2016-07-14 18:02:27 +02:00
Alberto Garcia Cabeza
62a7b32389 Adds texts to icons on comments votes 2016-07-12 13:55:52 +02:00
Alberto Garcia Cabeza
77b99c1b5c Adds text to icons like and unlike on debates 2016-07-12 13:48:55 +02:00
Alberto Garcia Cabeza
f3e0626709 Adds text to notifications icons on header 2016-07-12 13:24:49 +02:00
Juanjo Bazán
7f01dbdca2 makes sure setting helper is used in views 2016-07-08 14:42:28 +02:00
Alberto Garcia Cabeza
702cfe13d1 Fixes specs 2016-07-06 14:47:09 +02:00
Alberto Garcia Cabeza
42722080fc Changes references to Madrid 2016-07-05 13:47:14 +02:00
Alberto Garcia Cabeza
ece2f6f019 Removes Madrid references on pages 2016-07-04 18:07:45 +02:00
rgarcia
745de9bb77 sends invitation email to users 2016-06-27 23:37:58 +02:00
Alberto Garcia Cabeza
0bb948a013 Updates mailer texts 2016-06-27 16:01:03 +02:00
Alberto Garcia Cabeza
a2a2960867 Adds mailer template for user invites 2016-06-27 15:37:45 +02:00
Alberto Garcia Cabeza
947b2bcb0d Adds user invites views on management 2016-06-27 14:25:20 +02:00
kikito
73d3d0c8c3 hides the retire proposal link for admins in User#show 2016-06-23 17:48:30 +02:00
Alberto Garcia Cabeza
0972f5284a Creates new scss file for IE styles 2016-06-23 13:56:57 +02:00
rgarcia
1f7e86e206 fixes specs 2016-06-20 22:06:49 +02:00
rgarcia
9e910a834b Displays badge for official positions 2016-06-20 21:37:25 +02:00
rgarcia
51d688897a displays badge option if official position is level 1 2016-06-20 21:37:03 +02:00
rgarcia
98040e191e fixes conflicts with fork 2016-06-20 21:33:34 +02:00
Alberto Garcia Cabeza
3299b595aa Adds info text on proposal notification digest 2016-06-20 16:28:56 +02:00
Enrique García
588a2d84e4 Merge pull request #1154 from consul/stats 
Adds stats for proposal notifications and direct messages
 2016-06-16 18:42:10 +02:00
rgarcia
b7e3129ec1 uses more efficient count 2016-06-16 18:35:34 +02:00
Alberto Garcia Cabeza
352f3fa2f9 Resolves conflicts and improves styles for stats 2016-06-16 18:07:13 +02:00
rgarcia
f9a2f5d5dc adds specs for stats 2016-06-16 17:59:56 +02:00
rgarcia
0abc9c8376 adds stats for direct messages and proposal notifications 2016-06-16 17:42:16 +02:00
rgarcia
d40af1e94c do not display button to send message to myself 2016-06-16 16:05:09 +02:00
Alberto Garcia Cabeza
7f20d4eb23 Improves styles for admin pages 2016-06-16 13:44:06 +02:00
rgarcia
18dd9c95f3 fixes specs 2016-06-16 12:06:26 +02:00
rgarcia
b3fd5e225a Merge branch 'proposal-notifications' of github.com:AyuntamientoMadrid/participacion into proposal-notifications 2016-06-16 11:23:23 +02:00
rgarcia
91860cb409 validates that a user does not want to receive direct messages 2016-06-16 11:23:03 +02:00
Alberto Garcia Cabeza
9f7b49838d Improves texts for the sender's email 2016-06-15 21:37:36 +02:00