Commit Graph

1190 Commits

Author SHA1 Message Date
rgarcia
0939479263 removes custom knapsack configuration 2016-11-20 11:58:31 +01:00
rgarcia
a0a4f3c38e removes time offset warning for parallel builds 2016-11-20 11:56:50 +01:00
rgarcia
f3512a4a6f tries to speed up build with knapsack 2016-11-19 20:13:51 +01:00
Enrique García
03f14e05dd Merge pull request #1262 from consul/flacky-spec
Tries to fix flacky spec 'change my credentials'
2016-11-15 11:43:07 +01:00
Raimond Garcia
14af1a1961 Merge pull request #1259 from consul/accessibility
Accessibility
2016-11-15 11:39:40 +01:00
rgarcia
4ac5e84044 tries to fix flacky spec 'change my credentials' 2016-11-15 11:24:59 +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
5e487bb85f fixes specs 2016-11-14 18:06:39 +01:00
Alberto Garcia Cabeza
6fd5e6a67a unifies styles for participation not allowed 2016-10-31 16:50:13 +01:00
rgarcia
fe3451b4ba fixes specs 2016-10-26 10:31:05 +02:00
Raimond Garcia
593e77147c Merge pull request #1232 from usabi/custom_locales_load_fix
Fixes custom locales inclusion.
2016-10-06 16:47:31 +02:00
Marcia
680c0636ed expired password last 2016-10-06 14:19:48 +02:00
Marcia
1f72c5cc74 improves expired password view 2016-09-30 10:10:20 +02:00
Marcia
4269f3810b Merge remote-tracking branch 'upstream/master' into admin_password_expired 2016-09-27 13:26:08 +02:00
Marcia
78c6a30424 optimize code 2016-09-27 13:07:06 +02:00
Ignacio Aliende García
e4e2706af6 Fixes custom locales inclusion. 2016-09-20 17:34:26 +01:00
rgarcia
7d4d9b0ead sorts archived proposals by votes 2016-09-16 19:42:18 +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
Marcia
fa833f5a4a modificado otro mensaje en los test 2016-09-15 13:06:03 +02:00
Marcia
4832558948 modificado mensaje en el test 2016-09-15 12:21:25 +02:00
Marcia
8d883b1e17 mejoras de codigo 2016-09-15 11:45:03 +02:00
Alberto Garcia Cabeza
89340d4647 Deletes author_id on specs 2016-09-14 12:20:22 +02:00
Alberto Garcia Cabeza
30c11c9e22 Fixes specs 2016-09-14 11:41:29 +02:00
Juanjo Bazán
2142351743 archived proposals should not appear in 'featured' 2016-09-13 12:56:49 +02:00
Juanjo Bazán
11dbc05a80 removes archived proposals from index/search pages 2016-09-13 12:56:10 +02:00
Juanjo Bazán
8d48eccfed adds not_archived scope to proposal 2016-09-13 12:10:31 +02:00
Juanjo Bazán
da03311f99 archived proposals can not accept votes 2016-09-12 18:47:56 +02:00
Juanjo Bazán
acae610995 adds model specs for archived proposal 2016-09-12 18:15:18 +02:00
Juanjo Bazán
aa05b0259e fixes featured proposal creation in failing spec 2016-09-12 17:37:55 +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
Juanjo Bazán
46563f8222 Merge pull request #1194 from consul/notifications-polish
Notifications polish
2016-08-04 11:29:21 +02:00
rgarcia
24bc8cca20 runs all specs 2016-08-03 20:56:33 +02:00
rgarcia
4f4a5b68e5 runs all spec file 2016-08-03 20:50:37 +02:00
rgarcia
3b5e0b55c0 tries to fix flacky spec 2016-08-03 20:45:36 +02:00
rgarcia
5bd7fdb263 fixes specs 2016-08-03 20:05:08 +02:00
rgarcia
63274dfe08 marks notifications as emailed after rake 2016-08-03 19:48:43 +02:00
rgarcia
0faff2f01c adds specs 2016-08-03 19:33:43 +02:00
rgarcia
9d9bf488fc does not create notifications for blocked or erased users 2016-08-02 20:52:20 +02:00
rgarcia
99b9c3867e adds pending spec 2016-08-02 20:52:08 +02:00
rgarcia
c42a041d3a fixes specs 2016-07-19 16:20:45 +02:00
rgarcia
a23666683f fixes conflicts with master 2016-07-19 15:50:22 +02:00
Andrés Pereira
c5e6735caa Change madrid.es to consul.dev - closes #1169 2016-07-14 16:28:16 +02:00
Juanjo Bazán
6b351de6a1 fixes build 2016-07-11 10:43:27 +02:00
Juanjo Bazán
8316d9d895 fixes spec 2016-07-10 23:24:42 +02:00
Alberto Garcia Cabeza
67f07ba73a Fixes typo 2016-07-06 14:48:51 +02:00
Alberto Garcia Cabeza
edd8883deb Fixes specs 2016-07-06 13:43:05 +02:00
rgarcia
96630f88f2 takes into account emails separated by commas without spaces 2016-06-29 21:46:03 +02:00
rgarcia
745de9bb77 sends invitation email to users 2016-06-27 23:37:58 +02:00