kikito
2e8650c324
merge with master
2016-12-12 16:09:05 +01:00
kikito
869f7b39d6
fixes i18n
2016-12-08 11:49:13 +01:00
kikito
748fd8becf
Makes all tests pass in bi management
2016-12-07 19:16:37 +01:00
kikito
a962b2dfa7
i18n shared.search
2016-12-07 17:46:33 +01:00
Alberto Garcia Cabeza
cca30801cc
updates texts
2016-12-07 13:57:48 +01:00
Alberto Garcia Cabeza
442e5df461
removes unnecessary heading and nav tag on pagination
2016-12-07 12:49:15 +01:00
Juanjo Bazán
5598bf442a
Merge pull request #1281 from consul/cron
...
updates sitemap daily in all servers
2016-12-07 10:30:30 +01:00
kikito
0564392964
Introduces management budgets
2016-12-06 18:02:25 +01:00
kikito
8ef479bf31
Changes routes to use budgets resource instead of namespace
2016-12-06 18:01:37 +01:00
Alberto Garcia Cabeza
b61b08a2f5
adds optgroup on local switcher
2016-12-05 17:46:24 +01:00
Alberto Garcia Cabeza
ae12848e23
adds text for screen readers on toggle comments
2016-12-05 14:26:54 +01:00
rgarcia
5d6c083f67
updates sitemap daily in all servers
2016-12-04 19:57:10 +01:00
Julian Herrero
9a2b049ec8
take default host from settings
2016-12-03 12:19:58 +01:00
kikito
1fbd91383c
Changes routes to use namespaced budget investments in management
2016-12-02 19:13:47 +01:00
Julian Herrero
0c09d1016c
generate a new sitemap everyday at 5:00am
2016-12-02 11:30:57 +01:00
Julian Herrero
3940165642
don't compress the sitemap
2016-12-02 11:29:35 +01:00
Julian Herrero
bb61d73c04
add sitemap generator
2016-12-02 11:28:39 +01:00
kikito
00cfb95913
Starts fixing management budget investments
2016-12-01 16:31:05 +01:00
kikito
979880f910
adds i18n for budget phases
2016-11-28 19:08:09 +01:00
kikito
2a2179d0f3
Merge branch 'master' into budget
2016-11-28 11:41:49 +01:00
rgarcia
cea90fea47
installs bundler gem for new ruby versions
2016-11-21 10:15:57 +01:00
rgarcia
d24ef1615f
cleans up deploy.rb
2016-11-21 10:15:51 +01:00
rgarcia
c8c5b55816
updates ruby version for capistrano
2016-11-21 10:15:44 +01:00
rgarcia
a1095089af
configures up to date capistrano rvm gem
2016-11-21 10:15:34 +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
2249fdbdfa
improves outline and structure headings
2016-11-14 17:45:20 +01:00
Alberto Garcia Cabeza
7594981964
changes text 2% of census to 1%
2016-11-02 14:22:37 +01:00
rgarcia
028cc4362d
Makes i18n-tasks only aware of english and spanish locales
2016-10-31 11:54:44 +01:00
rgarcia
d540be333a
Makes tolk aware of french and portuguese translations
2016-10-31 11:54:26 +01:00
rgarcia
aeec264b8b
makes fallback locale spanish
2016-10-31 11:50:16 +01:00
rgarcia
04ca5f7ae8
adds french and brazilian portuguese locales
2016-10-31 11:50:07 +01:00
Juanjo Bazán
fb8669292e
adds missing i18n keys to settings
2016-10-13 11:25:29 +02:00
Raimond Garcia
593e77147c
Merge pull request #1232 from usabi/custom_locales_load_fix
...
Fixes custom locales inclusion.
2016-10-06 16:47:31 +02: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
Ignacio Aliende García
e4e2706af6
Fixes custom locales inclusion.
2016-09-20 17:34:26 +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
Marcia
8d883b1e17
mejoras de codigo
2016-09-15 11:45:03 +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
9a2d45f25d
Merge pull request #1219 from consul/budget-management
...
Budget management
2016-09-13 18:45:30 +02:00
Alberto Garcia Cabeza
c42877efb1
Improves styles for select heading page
2016-09-12 18:45:47 +02:00
Raimond Garcia
992425f4b3
Merge pull request #1212 from consul/budget-votes
...
Budget votes
2016-09-12 16:00:23 +02:00
Juanjo Bazán
5b1ff1584c
Merge branch 'master' into budget
2016-09-12 12:29:47 +02:00
kikito
2bc9e7be78
started working on budget manatement
2016-09-12 12:11:47 +02:00
rgarcia
22373c3ddd
Review my votes page
2016-09-10 16:22:41 +02:00
