consul/grecia
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
4,586 Commits 1 Branch 0 Tags
0cd72894ffb56fac6b49f4010c4b42a793dc6a74
Commit Graph

1202 Commits

Author SHA1 Message Date
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
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
Alberto Garcia Cabeza
a527de4f92 Adds proposal ballots controller and views 2016-09-07 12:43:12 +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
Juanjo Bazán
31ef3f4c98 adds heading filter to index 2016-09-06 17:03:35 +02:00
Juanjo Bazán
b0358e4867 adds index of investments with filters to admin 2016-09-05 17:50:58 +02:00
rgarcia
9570d79ee0 ignores missing and unused budget i18n keys 2016-09-02 13:51:22 +02:00
rgarcia
1c8290faa9 refactors budget translations 2016-09-02 13:51:16 +02:00
rgarcia
c2c7cdb18d Merge branch 'budget' into budget-public-controllers 2016-09-02 13:15:40 +02:00
rgarcia
3e0786b555 Merge branch 'budget' of github.com:AyuntamientoMadrid/participacion into budget 2016-09-02 13:15:30 +02:00
Juanjo Bazán
b8b71d0ab0 Merge branch 'master' into budget 2016-09-02 12:47:54 +02:00
Juanjo Bazán
f24886560b removes unused i18n entry 2016-09-01 12:46:43 +02:00
kikito
7ad4a21229 Tries to make ckeditor work correctly with the asset pipeline 
Reference: https://github.com/galetahub/ckeditor/issues/519
 2016-08-30 12:05:46 +02:00
kikito
345e34d422 adds ckeditor config 2016-08-29 16:49:52 +02:00
Juanjo Bazán
0f7e23bec4 adds budget's groups & headings to admin 2016-08-03 20:23:41 +02:00
Juanjo Bazán
724ccf175c adds budget show to admin 2016-07-29 14:52:37 +02:00
Juanjo Bazán
6fce9df451 adds admin creation of budgets 2016-07-29 13:34:41 +02:00
Alberto Garcia Cabeza
3e892c6e76 Adds translations and improve example content 2016-07-28 19:21:53 +02:00
Alberto Garcia Cabeza
b69308b770 Adds example content for admin budget new 2016-07-28 13:04:30 +02:00
Juanjo Bazán
6bb09185e4 makes i18n-tasks ignore filter keys in budgets 2016-07-28 12:40:57 +02:00