consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,039 Commits 1 Branch 0 Tags
aefa875ae2d73908e60b0da116dfe7615ea4b2e6
Commit Graph

1220 Commits

Author SHA1 Message Date
Amaia Castro
368430d914 Legislation Question page 2016-12-22 16:00:28 +01:00
Amaia Castro
959b36caa8 Add more specs for process page (phases) 2016-12-22 13:21:44 +01:00
Amaia Castro
36399277ec Legislation Process page 2016-12-22 11:23:49 +01:00
Fernando Blat
e872f2d626 Merge pull request #33 from medialab-prado/25-legislation-questions 
Legislation Questions model and basic admin
 2016-12-21 08:50:28 +01:00
Amaia Castro
92a13b0f77 Merge branch 'master' into legislation-module-stable 2016-12-20 20:03:04 +01:00
Amaia Castro
d25d6c178c Legislation Questions model and basic admin 2016-12-20 18:52:43 +01:00
Alberto Garcia Cabeza
3f394d099d fixes specs 2016-12-20 11:41:24 +01:00
Amaia Castro
a4055a1578 Legislation processes home page 2016-12-16 17:59:44 +01:00
Amaia Castro
e4315f94c8 Merge branch 'master' into legislation-module-stable 2016-12-15 11:26:22 +01:00
Raimond Garcia
392f00cdbd Merge pull request #1282 from amiedes/crud-geozones-PRs 
[Finished] Allow admins to manage geozones
 2016-12-14 19:25:17 +01:00
Fernando Blat
13a23d8383 Merge pull request #12 from PopulateTools/store-processed-html-from-markdown 
Store DraftVersion processed html
 2016-12-14 12:07:15 +01:00
Amaia Castro
8c9cfa8b3f Merge branch 'master' into legislation-module-stable 2016-12-14 11:48:28 +01:00
Amaia Castro
400b510b71 Store the processed html from the markdown text body field 2016-12-14 11:32:28 +01:00
Alberto Miedes Garcés
db029964fa Check geozone 'safe_to_delete' behavior as unit test instead of integration test 2016-12-13 18:38:13 +01:00
Alberto Miedes Garcés
419905fb59 Set expectations for flash inside admin geozones spec 2016-12-13 13:25:38 +01:00
Alberto Miedes Garcés
2a3dfdd595 Refactor admin geozones specs 2016-12-13 12:33:58 +01:00
rgarcia
6b0f8eb62b do not allow verification of deregistered accounts 2016-12-12 19:11:00 +01:00
rgarcia
d7e73b8abb fixes specs 2016-12-12 19:11:00 +01:00
rgarcia
39fd031780 adds specs 2016-12-12 19:11:00 +01:00
Alberto Miedes Garcés
0e1cea48c4 Fixed admin edit geozone spec 2016-12-08 13:17:05 +01:00
Alberto Miedes Garcés
93e79228a7 Ability to delete geozones from admin dashboard 2016-12-08 13:16:42 +01:00
Alberto Miedes Garcés
fea2009396 Ability to edit geozones from admin dashboard 2016-12-07 22:08:22 +01:00
Alberto Garcia Cabeza
7ef9bafbf9 fixes specs of remove link on debates and proposals description 2016-12-07 18:42:56 +01:00
Alberto Garcia Cabeza
87e7e7e4ea fixes specs 2016-12-07 18:16:09 +01:00
Amaia Castro
e4fe499e66 DraftVersion base model and very basic admin pages 2016-12-06 12:10:20 +01:00
Amaia Castro
369804a2ba Base Legislation::Process model and admin page 2016-12-05 13:24:23 +01:00
Alberto Miedes Garcés
c23ce8bdc6 Modified Geozone factory and seeds to be more complete 2016-12-04 21:20:06 +01:00
Alberto Miedes Garcés
6175990533 Admin geozones: index, create 
Modified Geozone factory and seeds to be more complete
 2016-12-04 21:19:36 +01:00
Amaia Castro
9a9f1da5a0 Renames Legislation model to LegacyLegislation 
Renames the model and related stuff from Legislation 
to LegacyLegislation to avoid name clashes with 
the future Legislation module.
 2016-11-30 12:00:05 +01:00
kikito
f0b8cfd4a2 Time.now -> Time.current 2016-11-23 19:19:19 +01:00
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