Raimond Garcia
|
c43ba27b1b
|
Merge pull request #1203 from jaimeiniesta/fix-readme-setup
no need to db:create here
|
2016-10-06 16:40:50 +02:00 |
|
Raimond Garcia
|
39160f0a91
|
Merge pull request #1229 from gentooza/master
added linux config instructions
|
2016-10-06 16:29:50 +02:00 |
|
Raimond Garcia
|
4a1e34c415
|
Merge pull request #1106 from gitmarcia/admin_password_expired
Expire admin passwords once a year #885
|
2016-10-06 16:27:11 +02:00 |
|
Marcia
|
680c0636ed
|
expired password last
|
2016-10-06 14:19:48 +02:00 |
|
Juanjo Bazán
|
df46b806cb
|
Merge pull request #1240 from consul/error-pages
updates image url for error pages
|
2016-10-05 12:43:45 +02:00 |
|
rgarcia
|
ac6b75e8f9
|
updates image url for error pages
|
2016-10-04 18:38:10 +02:00 |
|
Juanjo Bazán
|
407c6e022d
|
updates capistrano-rails
|
2016-10-03 14:40:06 +02:00 |
|
Juanjo Bazán
|
263bef42bc
|
updates dependencies
all minor upgrades
|
2016-10-03 14:36:05 +02:00 |
|
Marcia
|
1f72c5cc74
|
improves expired password view
|
2016-09-30 10:10:20 +02:00 |
|
Marcia
|
1e87810593
|
improves expired password view
|
2016-09-29 14:34:37 +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 |
|
Enrique García
|
03dca699ac
|
removes unused budget feature info from schema.rb
|
2016-09-21 15:53:38 +02:00 |
|
Juanjo Bazán
|
8fa8729c0b
|
Merge pull request #1233 from consul/initialjs
updates initial.js to support unicode
|
2016-09-21 13:08:20 +02:00 |
|
kikito
|
dc74a180b6
|
updates initial.js to support unicode
|
2016-09-21 12:22:16 +02:00 |
|
Ignacio Aliende García
|
e4e2706af6
|
Fixes custom locales inclusion.
|
2016-09-20 17:34:26 +01:00 |
|
prointegra
|
b107c2461b
|
improved text
|
2016-09-20 14:16:47 +02:00 |
|
gentooza
|
ae22d94255
|
added linux config instructions
|
2016-09-18 20:08:57 +02:00 |
|
Juanjo Bazán
|
7c08948574
|
Merge pull request #1228 from consul/archived-proposals-polish
Archived proposals polish
|
2016-09-16 20:45:47 +02:00 |
|
rgarcia
|
72e173b8ea
|
closes missing div
|
2016-09-16 20:25:12 +02:00 |
|
rgarcia
|
0c873649c5
|
updates dev seed with archived proposals
|
2016-09-16 20:24:25 +02:00 |
|
Raimond Garcia
|
782aa2e4d8
|
Merge pull request #1227 from consul/archived-proposals-order
sorts archived proposals by votes
|
2016-09-16 20:08:41 +02:00 |
|
rgarcia
|
7d4d9b0ead
|
sorts archived proposals by votes
|
2016-09-16 19:42:18 +02:00 |
|
Juanjo Bazán
|
a5f85a414c
|
Merge pull request #1226 from consul/polish-banner
Polish voting proposals banner
|
2016-09-16 12:10:40 +02:00 |
|
Alberto Garcia Cabeza
|
a39506f54b
|
Polish voting proposals banner
|
2016-09-16 12:08:38 +02:00 |
|
Juanjo Bazán
|
902bdb8bd3
|
Merge pull request #1223 from consul/binstubs
updates binstubs for rails 4
|
2016-09-15 14:29:50 +02:00 |
|
rgarcia
|
a1c893ce28
|
updates binstubs for rails 4
|
2016-09-15 14:16:45 +02:00 |
|
Raimond Garcia
|
86ab58e7f7
|
Merge pull request #1206 from consul/voting-proposals
Proposal ballots
|
2016-09-15 14:10:08 +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 |
|
Alberto Garcia Cabeza
|
7abd31e4bf
|
Renames variable, updates text
|
2016-09-15 13:47:53 +02:00 |
|
Juanjo Bazán
|
e0c3f7c029
|
Merge pull request #1213 from consul/archived-proposals
Archived proposals
|
2016-09-15 13:22:05 +02:00 |
|
Juanjo Bazán
|
dd8352a0c4
|
Merge pull request #1220 from consul/binstubs
updates binstubs
|
2016-09-15 13:21:49 +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 |
|
rgarcia
|
67096725ed
|
updates binstubs
|
2016-09-14 11:50:11 +02:00 |
|
Alberto Garcia Cabeza
|
30c11c9e22
|
Fixes specs
|
2016-09-14 11:41:29 +02:00 |
|
Alberto Garcia Cabeza
|
db6f82fa4c
|
Moves banner to a partial and includes it on debates index
|
2016-09-14 11:09:36 +02:00 |
|
Alberto Garcia Cabeza
|
076e237320
|
Improves proposal ballot banner, deletes unused partial
|
2016-09-14 10:40:16 +02:00 |
|
Raimond Garcia
|
76cd435808
|
Merge pull request #1217 from albertomg994/iss-1209
Development environment setup documentation
|
2016-09-13 18:18:19 +02:00 |
|
Alberto Miedes Garcés
|
2c54e19df4
|
Dev environment setup docs for Mac OS X (spanish)
|
2016-09-13 14:12:09 +02:00 |
|
Alberto Miedes Garcés
|
955d531683
|
Dev environment setup docs for Mac OS X (english)
|
2016-09-13 14:11:57 +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 |
|
Alberto Garcia Cabeza
|
6fac3c67ff
|
Merge branch 'voting-proposals' of github.com:consul/consul into voting-proposals
|
2016-09-12 18:07:22 +02:00 |
|
Alberto Garcia Cabeza
|
77077b28b8
|
Removes question and supports on successfull proposals
|
2016-09-12 18:06:43 +02:00 |
|