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 |
|
kikito
|
73c306a673
|
Adds 3 orders for comments: most_voted, newest, oldest
|
2015-11-02 14:01:55 +01:00 |
|
kikito
|
2fab210ac8
|
merges with master and fixes conflicts
|
2015-10-31 17:09:52 +01:00 |
|
Juanjo Bazán
|
d3423b72b8
|
hides featured proposal from tag page
|
2015-10-30 12:14:18 +01:00 |
|
kikito
|
da19d4d773
|
replace most_voted by confidence_score in comment views
|
2015-10-28 16:02:40 +01:00 |
|
kikito
|
e4bfc72649
|
Refactors design of comments order selector into a partial with i18n
|
2015-10-28 15:48:48 +01:00 |
|
Juanjo Bazán
|
1136c5546a
|
adds featured proposals
via new action featured_vote
Featured proposals are never duplicated in the filtered lists
Featured are not calculated/shown in searches.
|
2015-10-22 11:54:17 +02:00 |
|
rgarcia
|
e1a2c0f523
|
changes commentable concern for commentable_actions concern
|
2015-09-29 15:56:55 +02:00 |
|
rgarcia
|
25c38f942e
|
refactors resource_class into resource_model
|
2015-09-29 12:01:46 +02:00 |
|
rgarcia
|
0074422977
|
uses resource_class instead of controller_name
|
2015-09-28 20:46:18 +02:00 |
|
rgarcia
|
708a41ee1c
|
refactors debate and proposal controllers
|
2015-09-28 19:23:32 +02:00 |
|
rgarcia
|
6426bd3a29
|
refactors debate and proposal flag actions
|
2015-09-28 16:34:43 +02:00 |
|
rgarcia
|
e7d1ae63d6
|
makes proposal tag filter case insensitive
|
2015-09-28 15:39:44 +02:00 |
|
rgarcia
|
c362ad0054
|
makes spaces consistent
|
2015-09-28 15:30:59 +02:00 |
|
kikito
|
f9101b4970
|
Implements tag_cloud using the new custom counters
|
2015-09-17 16:55:16 +02:00 |
|
kikito
|
79a99ce595
|
Makes hot_score the default order in proposals & debates
|
2015-09-15 09:27:55 +02:00 |
|