Commit Graph

77 Commits

Author SHA1 Message Date
Juanjo Bazán
616efbffed uses path instead of url for proposal improvement link 2017-06-23 13:12:46 +02:00
decabeza
ea38f79442 removes specs of proposals successful banner 2017-06-05 17:55:37 +02:00
decabeza
c76bd65b40 removes old proposals successful banner 2017-06-05 16:29:48 +02:00
Bertocq
cf8bc486e4 Rename proposal_improvement_url to proposal_improvement_path to truly describe the value that the variable holds 2017-05-31 12:51:01 +02:00
Bertocq
438aaa65f6 Merge author param into Proposal building at proposal controller create action 2017-05-31 11:10:27 +02:00
Bertocq
520563d54f Add proposal improvement info link to share page, and make it option through Setting variable 2017-05-31 10:59:31 +02:00
Bertocq
29f59e2af5 Add create method on proposals controller to redirect to proposal share page with notice after save 2017-05-31 10:59:30 +02:00
Bertocq
b2c79174aa Add new Proposal share endpoint, plus ability for ereryone to use it 2017-05-31 10:59:30 +02:00
rgarcia
87dd15b7bf includes search concern in commendable actions 2017-05-04 20:42:21 +02:00
rgarcia
37d8693049 extracts advanced search to controller concern 2017-05-04 04:23:53 +02:00
Juanjo Bazán
5ec12e4b5b Merge branch 'master' into redux-polling 2016-12-27 18:22:06 +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
724dac4df2 cherry picks creating poll question from successful proposals 2016-11-18 21:09:28 +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
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
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
Alberto Garcia Cabeza
41312ca2a5 Creates archived proposals method 2016-09-09 17:31:05 +02:00
Juanjo Bazán
50ef23205f avoids loading featured proposals if voting notice 2016-09-08 12:42:44 +02:00
Alberto Garcia Cabeza
b107790039 Adds links, texts and i18n 2016-09-07 12:46:29 +02:00
rgarcia
fc6cc090f8 displays notifications in proposal view 2016-06-06 12:21:48 +02:00
kikito
6c9c2f1b96 removes obsolete/deprecated code 2016-04-28 14:00:20 +02:00
kikito
9ac6e2d60b Uses invisible_captcha's default "foo fast" action 2016-04-28 12:47:04 +02:00
kikito
289182b145 Adds invisible_captcha to proposals, debates & sps 2016-04-27 16:12:32 +02:00
kikito
eedf02a186 Starts using invisible_captcha in the source code. Pending: tests, proper invisible_captcha gem in Gemfile 2016-04-27 16:07:48 +02:00
kikito
dea1a28a69 purges simple_captcha 2016-04-27 16:07:47 +02:00
rgarcia
5aeaa3270d splits large method into smaller methods 2016-04-27 12:17:47 +02:00
Juanjo Bazán
ed0a4a8525 adds links to filter retired proposals by reason 2016-04-23 13:24:15 +02:00
Juanjo Bazán
d63cf8b392 removes retired proposals from default index
adds a sidebar link to retired proposals list
2016-04-23 13:24:15 +02:00
Juanjo Bazán
58a5e2a283 authors can retire proposals now 2016-04-23 13:24:15 +02:00
Raimond Garcia
2a4adc2e60 Merge pull request #817 from microweb10/friendly_urls
Friendly urls
2016-03-02 17:51:00 +01:00
rgarcia
cfb48ef937 cleans up 2016-02-16 15:30:04 +01:00
rgarcia
14ddeaaa2e displays sidebar in proposal summary page 2016-02-16 13:58:58 +01:00
rgarcia
42fdc52329 adds specs for proposal summary 2016-02-16 13:53:39 +01:00
rgarcia
0432151e6b displays only proposals from last week ordered by votes 2016-02-16 12:22:20 +01:00
rgarcia
6540092bcd displays the top 3 proposals for every category 2016-02-16 12:17:37 +01:00
rgarcia
e4a49f802e removes duplication between debate and proposal suggestions 2016-02-03 19:57:37 +01:00
MaiteHdezRivas
5dd4633d6a Merge branch 'suggest_before_creating'
Conflicts:
	app/assets/javascripts/application.js
	app/controllers/debates_controller.rb
	app/controllers/proposals_controller.rb
	config/locales/es.yml
	config/routes.rb
	db/schema.rb
	spec/features/debates_spec.rb
	spec/features/proposals_spec.rb
2016-01-27 13:11:23 +01:00
MaiteHdezRivas
7406904c51 adding suggest with coffescript 2016-01-27 12:32:44 +01:00
rgarcia
21b9e31f11 uses geozones instead of district tags 2016-01-25 22:28:46 +01:00
Perisso
7d1d4cea4a filter by districts and categories 2016-01-25 22:28:17 +01:00
rgarcia
0505be08e8 fixes conflicts 2016-01-25 22:24:58 +01:00
nachogomez
8d54e51413 change test in debates and proposals for district Select geozone.name 2016-01-21 09:55:15 +01:00
rgarcia
33cfd92b09 adds naming consistency 2016-01-13 19:25:48 +01:00
Ana
4d3e3f2e09 Advanced search - except author type 2016-01-13 19:25:46 +01:00
Julian Herrero
7c65b8555c redirect to frendly url for debates and proposals if needed 2016-01-10 13:38:22 +01:00
kikito
b89f39bfef Removes unused orders from debates controller 2016-01-05 19:37:56 +01:00
rgarcia
40ea3fcc58 displays relevance order in searches 2015-11-23 13:39:32 +01:00