kikito
|
2466b2b830
|
adds the same routes as debates have to proposals
|
2015-09-13 12:26:23 +02:00 |
|
kikito
|
5903ebe857
|
merges master and fix conflicts
|
2015-09-12 19:54:15 +02:00 |
|
Enrique García
|
f97fc56bb7
|
Merge pull request #479 from AyuntamientoMadrid/orgs-responsible
Orgs responsible
|
2015-09-12 19:36:11 +02:00 |
|
Enrique García
|
ab1f502e2f
|
Merge pull request #478 from AyuntamientoMadrid/mobile
Mobile
|
2015-09-12 18:50:41 +02:00 |
|
kikito
|
07b99fcf19
|
fixes kaminari inability to pluralize spanish names
|
2015-09-12 18:39:29 +02:00 |
|
kikito
|
849a2c83a8
|
Implements searching in proposals
|
2015-09-12 18:35:45 +02:00 |
|
kikito
|
c44e709f24
|
Refactors search form
It only appears when the page asks for it.
Also, the i18n namespace and the path used for the form are parameters
now
|
2015-09-12 18:32:13 +02:00 |
|
Juanjo Bazán
|
d8c9974d1a
|
adds responsible_name to org's account page
|
2015-09-12 18:16:40 +02:00 |
|
Juanjo Bazán
|
6b0edac6fc
|
adds responsible_name to organizations
|
2015-09-12 18:16:14 +02:00 |
|
Alberto Garcia Cabeza
|
120b1a65c2
|
Changes tests for new texts
|
2015-09-12 18:13:52 +02:00 |
|
Alberto Garcia Cabeza
|
747c604127
|
Fixes styles for mobile version
|
2015-09-12 18:05:15 +02:00 |
|
Juanjo Bazán
|
7aaf16a683
|
updates i18n for proposals
|
2015-09-12 16:41:13 +02:00 |
|
Juanjo Bazán
|
2681eb5caa
|
adds button to proposals' index
|
2015-09-12 16:32:52 +02:00 |
|
Juanjo Bazán
|
6fc7a4a62a
|
adds proposals to header
|
2015-09-12 16:19:08 +02:00 |
|
Juanjo Bazán
|
6e27917d6e
|
moves comments out of commentables routes scopes
|
2015-09-12 14:12:37 +02:00 |
|
Juanjo Bazán
|
2acf23c1b2
|
fixes i18n missing keys
|
2015-09-12 13:56:26 +02:00 |
|
Juanjo Bazán
|
1a18895760
|
changes proposal/new info text
|
2015-09-12 13:33:56 +02:00 |
|
rgarcia
|
7d3a5d14bb
|
Merge branch 'proposals' of github.com:AyuntamientoMadrid/participacion into proposals
|
2015-09-12 13:18:44 +02:00 |
|
rgarcia
|
b46d23c46b
|
proposal translations
|
2015-09-12 13:18:33 +02:00 |
|
Juanjo Bazán
|
3889184432
|
adds proposal_code_prefix to Settings
|
2015-09-12 13:14:45 +02:00 |
|
Juanjo Bazán
|
9c9d2c2ea8
|
adds max_votes_for_proposal_edit to Settings
|
2015-09-12 12:38:12 +02:00 |
|
rgarcia
|
f2b917d486
|
adds proposal show
|
2015-09-12 12:30:20 +02:00 |
|
rgarcia
|
3f7338a6ae
|
adds proposal new and create
|
2015-09-12 11:38:22 +02:00 |
|
kikito
|
1e59d3259a
|
removes unnecessary whenever setup
|
2015-09-12 09:01:16 +02:00 |
|
kikito
|
05bfaa5c30
|
move whenever require to Capfile
|
2015-09-12 08:56:47 +02:00 |
|
kikito
|
74d07d337d
|
adds a dummy task to schedule.rb
|
2015-09-12 08:45:00 +02:00 |
|
kikito
|
054f3b94e5
|
uses -> instead of refer
|
2015-09-11 17:32:10 +02:00 |
|
kikito
|
06821b9dfc
|
Merge branch 'master' into whenever-355
|
2015-09-11 17:28:41 +02:00 |
|
Raimond Garcia
|
942b27100b
|
Merge pull request #472 from AyuntamientoMadrid/verification-path
Verification path
|
2015-09-11 16:52:02 +02:00 |
|
Juanjo Bazán
|
eabcbb3ef7
|
fixes I18n string
|
2015-09-11 14:41:27 +02:00 |
|
Juanjo Bazán
|
bc86d81302
|
adds verification controller
|
2015-09-11 14:40:51 +02:00 |
|
kikito
|
44b5ea6018
|
first try at integrating whenever and capistrano
|
2015-09-11 14:23:41 +02:00 |
|
Alberto Garcia Cabeza
|
d364d1bf7e
|
Fixes styles for search results and filters
|
2015-09-11 13:58:33 +02:00 |
|
kikito
|
71832b5ff1
|
adds whenever
|
2015-09-11 13:26:31 +02:00 |
|
Raimond Garcia
|
67d5b6fcc8
|
Merge pull request #467 from AyuntamientoMadrid/improve_design
Improve design
|
2015-09-10 20:49:00 +02:00 |
|
rgarcia
|
abc68dc868
|
refactors lock tries [#279]
|
2015-09-10 20:26:49 +02:00 |
|
Enrique García
|
c1c213f773
|
Merge pull request #461 from AyuntamientoMadrid/final_verification-395
Final letter verification
|
2015-09-10 20:22:42 +02:00 |
|
Alberto Garcia Cabeza
|
f1e95addaa
|
Changes tests and comments unused keys
|
2015-09-10 19:29:05 +02:00 |
|
kikito
|
8596df1ea8
|
merges master and fix conflicts
|
2015-09-10 18:09:19 +02:00 |
|
Raimond Garcia
|
b6f9de7e5c
|
Merge pull request #463 from AyuntamientoMadrid/welcome-screen-308
Welcome screen
|
2015-09-10 17:57:42 +02:00 |
|
kikito
|
43bdfb940e
|
merges master and fixes conflicts
|
2015-09-10 17:47:40 +02:00 |
|
kikito
|
249aed42c4
|
Makes welcome screen work using a sessions controller
|
2015-09-10 17:41:37 +02:00 |
|
kikito
|
2c04cd07d9
|
Adds independent welcome screen
|
2015-09-10 17:40:54 +02:00 |
|
Alberto Garcia Cabeza
|
57682e8111
|
Updates header styles, moves search form to header
|
2015-09-10 17:22:11 +02:00 |
|
rgarcia
|
1fb2211776
|
removes unused validation errors [#395]
|
2015-09-10 14:27:37 +02:00 |
|
rgarcia
|
cd74744e06
|
adds validation error for letter verification code [#395]
|
2015-09-10 14:27:02 +02:00 |
|
Juanjo Bazán
|
8e1dcdc16a
|
fix bug on tag deletion when no taggable
|
2015-09-10 13:52:39 +02:00 |
|
Alberto Garcia Cabeza
|
98937e4467
|
Improves styles and texts for footer
|
2015-09-10 13:13:28 +02:00 |
|
rgarcia
|
16dd609ad0
|
adds verification tries to letter code [#332]
|
2015-09-10 11:43:25 +02:00 |
|
Raimond Garcia
|
02c101cd97
|
Merge pull request #453 from AyuntamientoMadrid/ie8
Ie8
|
2015-09-09 23:51:31 +02:00 |
|