Commit Graph

15211 Commits

Author SHA1 Message Date
Alberto Garcia Cabeza
7056487f3d improves styles for admin menu 2016-11-30 18:46:35 +01:00
Juanjo Bazán
7a7bdb75d8 reorders admin sidebar's menu 2016-11-30 17:50:41 +01:00
Alberto Miedes Garcés
aef20aadf7 Refactor specs for TypeCreator and ConsulSchema 2016-11-30 13:44:31 +01:00
Alberto Miedes Garcés
a516262724 Example graphql_controller test 2016-11-30 13:43:50 +01:00
Alberto Miedes Garcés
d1e1ee9d41 Moved api_types into TypeCreator 2016-11-30 13:43:10 +01:00
Alberto Miedes Garcés
76dd11631a Fixes error initializing database 2016-11-30 13:38:13 +01:00
Amaia Castro
9a9f1da5a0 Renames Legislation model to LegacyLegislation
Renames the model and related stuff from Legislation 
to LegacyLegislation to avoid name clashes with 
the future Legislation module.
2016-11-30 12:00:05 +01:00
Amaia Castro
9e5a55be68 Removes duplicated i18n keys in locale files 2016-11-30 12:00:04 +01:00
Raimond Garcia
59d3e4956b Merge pull request #1276 from amiedes/fix-docs
Styled docs with markdown syntax
2016-11-30 09:30:05 +01:00
Alberto Miedes Garcés
9f4688a08a Styled docs with markdown syntax 2016-11-29 23:45:21 +01:00
rgarcia
c1ea074be4 adds question, booth and officer tabs for a poll 2016-11-29 11:46:37 +01:00
rgarcia
20cb044015 adds search and filter for poll questions 2016-11-29 11:46:30 +01:00
kikito
979880f910 adds i18n for budget phases 2016-11-28 19:08:09 +01:00
kikito
242f8102a3 moves styles inside participation.scss 2016-11-28 12:59:23 +01:00
kikito
2a2179d0f3 Merge branch 'master' into budget 2016-11-28 11:41:49 +01:00
rgarcia
66f4289e9c fixes conflicts with poll-questions 2016-11-28 11:18:32 +01:00
Alberto Miedes Garcés
0eae2fada6 Refactor GraphQL controller specs 2016-11-27 13:50:01 +01:00
Juanjo Bazán
e694b9c934 Merge pull request #1274 from consul/rubocop
Rubocop - Timezone warnings + .rubocop.yml
2016-11-25 14:05:15 +01:00
kikito
a2fa65a5bc adds .rubocop.yml + .rubocop_todo.yml 2016-11-25 13:39:59 +01:00
Juanjo Bazán
7edc783111 Merge pull request #1273 from consul/docs-ruby-version
updates ruby version in configuration instructions
2016-11-25 10:46:30 +01:00
rgarcia
a3b0fdb14d updates ruby version in configuration instructions 2016-11-25 10:39:54 +01:00
Alberto Miedes Garcés
9ed51cf477 Useless commit 2016-11-25 01:02:05 +01:00
Alberto Miedes Garcés
6230712b74 Fixed bug in my schema.rb 2016-11-25 00:56:26 +01:00
rgarcia
b76e1b5992 removes obsolete spec 2016-11-24 20:37:09 +01:00
rgarcia
d3a35971cd fixes spec 2016-11-24 20:37:03 +01:00
rgarcia
e4a61887d2 removes question attribute from poll_question show 2016-11-24 10:56:46 +01:00
rgarcia
f268cd0677 removes question attribute from seeds 2016-11-24 10:56:31 +01:00
kikito
f0b8cfd4a2 Time.now -> Time.current 2016-11-23 19:19:19 +01:00
Alberto Miedes Garcés
027bdf3f16 DRYed specs 2016-11-23 00:16:01 +01:00
Alberto Miedes Garcés
13273f4bc2 DRYed specs 2016-11-22 23:49:05 +01:00
Alberto Miedes Garcés
2271f6d634 Renamed GraphQL route, added support for GET requests 2016-11-22 15:22:27 +01:00
Juanjo Bazán
4782332691 Merge pull request #1272 from consul/update-gems
Update gems
2016-11-22 13:14:19 +01:00
kikito
619c77f615 bundle update unicorn 2016-11-22 12:44:08 +01:00
kikito
a4d840c9c6 bundle update omniauth 2016-11-22 12:44:08 +01:00
kikito
2050e1411e updates cancancan 2016-11-22 12:44:08 +01:00
kikito
6b24061bdc updates rack gem 2016-11-22 12:44:08 +01:00
kikito
dcebcc41cb Updates browser gem 2016-11-22 12:44:08 +01:00
kikito
695fc93b67 updates ancestry 2016-11-22 12:44:08 +01:00
rgarcia
ceebae644f removes question column from poll_questions 2016-11-22 11:41:10 +01:00
Enrique García
ae2a6d6498 Merge pull request #1268 from consul/knapsack
Reduces build time using parallel builds
2016-11-22 10:37:12 +01:00
Enrique García
c8f4bb7e0c Merge pull request #1270 from consul/upgrade-ruby
upgrade to ruby 2.3.2
2016-11-22 10:28:00 +01:00
Enrique García
3c120ad0ad Merge pull request #1271 from consul/capistrano-rvm
Configures Capistrano RVM
2016-11-22 10:27:40 +01:00
rgarcia
84bafa8107 adds specs for poll state 2016-11-21 11:19:03 +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
rgarcia
f8bd13ceb5 uses available capacity for open source projects 2016-11-21 09:57:23 +01:00
rgarcia
d720f8c84d uses four virtual machines to run travis build 2016-11-20 11:59:08 +01:00
rgarcia
0939479263 removes custom knapsack configuration 2016-11-20 11:58:31 +01:00