consul/nairobi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
3,994 Commits 1 Branch 0 Tags
766f509f8ea869439c4e247ef8efdb585fed179c
Commit Graph

838 Commits

Author SHA1 Message Date
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
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
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
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
Raimond Garcia
14af1a1961 Merge pull request #1259 from consul/accessibility 
Accessibility
 2016-11-15 11:39:40 +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
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
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
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
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
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
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
Andrés Pereira
c5e6735caa Change madrid.es to consul.dev - closes #1169 2016-07-14 16:28:16 +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
rgarcia
00dbbd0689 fixes specs (unauthenticated users can view spending proposal show) 2016-06-20 21:54:45 +02:00