Commit Graph

95 Commits

Author SHA1 Message Date
rgarcia
2b52d26d82 refactors notifications into concerns and shared examples 2017-12-14 16:15:30 +01:00
Angel Perez
2bdc2c27d7 Add email specs for Poll 2017-11-17 13:14:03 -04:00
Angel Perez
4c110e8100 Add email specs for Topic 2017-11-17 13:14:03 -04:00
Angel Perez
3605a43947 Add email specs for Budget::Investment 2017-11-17 13:14:03 -04:00
Bertocq
cd66ba5d54 Rubocop autocorrections 2017-11-13 02:22:00 +01:00
María Checa
bb06af3877 Improved results tests 2017-10-20 16:49:25 +02:00
María Checa
8be8bb07f9 Added first poll results tests 2017-10-19 12:17:49 +02:00
Bertocq
ce0a7f6fad Rubocop autocorrections 2017-10-17 22:00:00 +02:00
rgarcia
6b7d38c27a adds spec for user voting in poll and then verifying account 2017-10-17 15:00:34 +02:00
María Checa
5b7a90221a Fixed tests 2017-10-04 11:18:09 +02:00
Bertocq
825671ad9b Fix polls answer this question show text 2017-10-03 18:53:44 +02:00
rgarcia
085991c624 allows voting only in one origin: booth or web 2017-10-02 16:22:31 +02:00
Bertocq
69f4e1c683 Fix all rubocop Metrics/LineLength issues (140+) 2017-07-10 13:22:49 +02:00
Bertocq
d7b8777395 Fix all Layout/SpaceAroundEqualsInParameterDefault rubocop issues from rubocop_todo list 2017-06-26 18:03:40 +02:00
Juanjo Bazán
c4ba6a7e94 updates specs 2017-06-12 19:48:57 +02:00
rgarcia
5c676498e2 fixes specs 2017-02-01 11:37:11 +01:00
rgarcia
6c34599e1e adds officer residence check and user voting 2017-01-29 00:36:20 +01:00
Juanjo Bazán
113f9b32d7 Merge branch 'master' into polls 2017-01-19 16:51:19 +01:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +01:00
kikito
7089d965d5 Removes unused common actions 2016-12-25 12:57:57 +01:00
kikito
4589ba5f0b Fixes incorrect implementation of add_to_ballot common action 2016-12-23 18:34:42 +01:00
kikito
2e8650c324 merge with master 2016-12-12 16:09:05 +01:00
Alberto Garcia Cabeza
87e7e7e4ea fixes specs 2016-12-07 18:16:09 +01:00
kikito
2a2179d0f3 Merge branch 'master' into budget 2016-11-28 11:41:49 +01:00
kikito
f0b8cfd4a2 Time.now -> Time.current 2016-11-23 19:19:19 +01:00
rgarcia
e12f183775 fixes typo 2016-11-19 14:03:10 +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
Alberto Garcia Cabeza
6fd5e6a67a unifies styles for participation not allowed 2016-10-31 16:50:13 +01: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
Juanjo Bazán
acae610995 adds model specs for archived proposal 2016-09-12 18:15:18 +02:00
rgarcia
65f029f34c Fixes permissions and feasibility specs 2016-09-10 16:22:42 +02:00
rgarcia
29cad341f5 Adds voting in selecting phase 2016-09-10 16:22:40 +02:00
Alberto Garcia Cabeza
3bbc2862d2 Adds admin setting 'months to archive proposals' 2016-09-09 18:02:02 +02:00
Alberto Garcia Cabeza
fa3b503c47 Adds specs 2016-09-09 17:32:21 +02:00
Juanjo Bazán
974c4d6d70 adds specs for proposal ballots 2016-09-08 12:43:06 +02:00
rgarcia
3c55d66591 fixes conflicts with budget 2016-07-27 11:41:46 +02:00
rgarcia
7fee1e43ff fixes specs 2016-07-27 11:33:59 +02:00
Andrés Pereira
c5e6735caa Change madrid.es to consul.dev - closes #1169 2016-07-14 16:28:16 +02:00
rgarcia
9e910a834b Displays badge for official positions 2016-06-20 21:37:25 +02:00
rgarcia
18dd9c95f3 fixes specs 2016-06-16 12:06:26 +02:00
rgarcia
ce6072d17b sends a copy of the direct message to the sender 2016-06-14 18:55:28 +02:00
rgarcia
6e800c5120 adds email digest for proposal notifications 2016-06-14 17:53:36 +02:00
Juanjo Bazán
d1e50d70d6 managers can login to /management 2016-05-10 19:10:02 +02:00
kikito
dea1a28a69 purges simple_captcha 2016-04-27 16:07:47 +02:00
Juanjo Bazán
c939339020 shows voting button for sps only if voting allowed 2016-04-18 12:04:50 +02:00
Juanjo Bazán
e6a9cb4fcc disable voting on sps if setting disabled
refactors hover messages on sps votes
2016-04-15 23:01:00 +02:00
Juanjo Bazán
6f5a23bb4f makes manager a HashWithIndifferentAccess 2016-04-08 11:01:36 +02:00
Juanjo Bazán
1e35169694 fixes i18n calls 2016-04-04 14:43:49 +02:00
Juanjo Bazán
28bdd6b426 Merge pull request #875 from palomahnhp/inform_users_in_vote_comments
show link to sign in for no connect users
2016-02-11 17:28:17 +01:00
rgarcia
d2400d0b36 makes specs for error handling more robust 2016-02-05 13:08:09 +01:00