Commit Graph

807 Commits

Author SHA1 Message Date
kikito
4b92cf3acf Removes unused error messages from 18n 2016-12-25 12:57:46 +01:00
kikito
32710f57e1 Organization instead of organisation 2016-12-25 12:57:34 +01:00
kikito
2fab251593 adds i18n entries 2016-12-25 12:53:27 +01:00
kikito
9e0007ba35 renames i18n entry 2016-12-23 15:38:31 +01:00
kikito
cd72b7e537 Renames i18n param 2016-12-22 20:27:16 +01:00
kikito
eb5291d8a6 Fixes budgets/votes_spec 2016-12-19 19:10:49 +01:00
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
kikito
0564392964 Introduces management budgets 2016-12-06 18:02:25 +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
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
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
d540be333a Makes tolk aware of french and portuguese translations 2016-10-31 11:54:26 +01:00
Juanjo Bazán
fb8669292e adds missing i18n keys to settings 2016-10-13 11:25:29 +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
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
rgarcia
9d4f2d1aff Displays budget groups 2016-09-10 16:22:41 +02:00
Alberto Garcia Cabeza
3bbc2862d2 Adds admin setting 'months to archive proposals' 2016-09-09 18:02:02 +02:00
Alberto Garcia Cabeza
e8b70a48fa Adds tab in index & removes support button in index/show 2016-09-09 17:32:03 +02:00
Juanjo Bazán
8aa62f8ce7 Merge branch 'budget' into admin-budgets 2016-09-09 15:13:05 +02:00
Juanjo Bazán
42c705e1e3 adds dossier editing of investments to valuation 2016-09-09 15:09:06 +02:00
Juanjo Bazán
0fc31b1259 adds budget/budget_investment indexes to valuators 2016-09-09 13:39:08 +02:00
kikito
fd5dd5984d fixes i18n issues 2016-09-09 13:07:01 +02:00
Juanjo Bazán
e330b704c0 removes half-baked feature
archived proposals is a separate issue now
2016-09-08 17:06:16 +02:00
Alberto Garcia Cabeza
cff1f43a90 Adds banner, styles, and updates icons font 2016-09-07 16:42:57 +02:00
Juanjo Bazán
f8a5f02cc9 adds i18n to budgets setting 2016-09-07 15:08:03 +02:00
Juanjo Bazán
8890380804 adds investment editing to admin 2016-09-07 14:13:40 +02:00
Alberto Garcia Cabeza
22487592cf Adds scope for archived proposals 2016-09-07 12:57:53 +02:00
Alberto Garcia Cabeza
b107790039 Adds links, texts and i18n 2016-09-07 12:46:29 +02:00
Jaime Iniesta
2e6328d502 fixes a few typos 2016-09-06 18:21:15 +02:00
Juanjo Bazán
6542812647 adds simple investment show view to admin
valuators info is missing
2016-09-06 17:04:31 +02:00