Commit Graph

3879 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
faecb51054 Adds booths index content 2016-11-14 13:51:09 +01:00
rgarcia
5d2a9bead3 hot fix to load last poll on officer's index 2016-11-14 13:51:09 +01:00
Alberto Garcia Cabeza
7b24e73999 Adds content to edit and show views 2016-11-14 13:51:09 +01:00
Alberto Garcia Cabeza
2acd1a69cd Adds i18n and styles to admin polls index and new 2016-11-14 13:51:09 +01:00
rgarcia
00721bac12 updates dev_seeds with polls 2016-11-14 13:51:09 +01:00
rgarcia
503338e47b adds view placeholders for officing polls 2016-11-14 13:51:09 +01:00
rgarcia
08fbe745a8 fixes translation key 2016-11-14 13:51:09 +01:00
rgarcia
1ca821c520 creates polling officers from admin 2016-11-14 13:51:09 +01:00
Raimond Garcia
f24ced329f Merge pull request #1254 from consul/password-changed-at
sets default value for password_changed_at
2016-11-02 17:43:56 +01:00
rgarcia
1a8f7e119f sets default value for password_changed_at 2016-11-02 14:51:52 +01:00
Juanjo Bazán
87ec74b49f Merge pull request #1253 from consul/refactor-styles
Refactor styles
2016-10-31 17:27:52 +01:00
Alberto Garcia Cabeza
6fd5e6a67a unifies styles for participation not allowed 2016-10-31 16:50:13 +01:00
Enrique García
df7fb0360c Merge pull request #1252 from consul/i18n
I18n
2016-10-31 16:09:09 +01:00
Alberto Garcia Cabeza
d771b739bf renames variables, removes unused styles 2016-10-31 13:25:48 +01:00
Alberto Garcia Cabeza
7d4f92f10a unifies styles of page forms 2016-10-31 13:11:23 +01:00
Alberto Garcia Cabeza
6d9ced63a2 renames and removes unused variables 2016-10-31 13:10:15 +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
c0f400a4d9 Adds custom locale name for Português 2016-10-31 11:50:24 +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
de2df08665 Merge pull request #1251 from consul/dependencies
Dependencies
2016-10-28 12:38:04 +02:00
rgarcia
29905b61b7 Sets gem versions to equal to or greater than in the last digit 2016-10-28 12:36:58 +02:00
rgarcia
fe3451b4ba fixes specs 2016-10-26 10:31:05 +02:00
rgarcia
4979b6859a updates minor version dependencies 2016-10-26 00:34:23 +02:00
Raimond Garcia
94238ac350 Merge pull request #1250 from consul/improve-styles
Improve styles
2016-10-25 16:33:41 +02:00
Alberto Garcia Cabeza
08db2faf86 fixes breakpoint on mixins 2016-10-25 16:30:36 +02:00
Alberto Garcia Cabeza
5c1e1f96ea deletes unused wrap class 2016-10-25 16:23:45 +02:00
Alberto Garcia Cabeza
1a143dfe0f adds style for selection 2016-10-25 16:21:52 +02:00
Juanjo Bazán
179cb3d611 Merge pull request #1247 from consul/direct-messages-format
fixes text format on direct messages
2016-10-19 11:26:30 +02:00
Juanjo Bazán
57335ab1da Merge pull request #1248 from consul/flash-notice
improves styles for flash notices
2016-10-19 11:12:51 +02:00
Alberto Garcia Cabeza
c835d9b1d1 improves styles for flash notices 2016-10-19 10:54:48 +02:00
Alberto Garcia Cabeza
e8312ff86a fixes text format on direct messages 2016-10-18 16:40:59 +02: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
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