Commit Graph

4721 Commits

Author SHA1 Message Date
Juanjo Bazán
7a448b6890 adds BudgetInvestment case to users_helpers 2017-01-10 20:58:01 +01:00
rgarcia
4d5b885b7e sets spending proposal's settings to nil 2017-01-10 20:13:48 +01:00
Juanjo Bazán
dc4d965414 Merge pull request #1340 from consul/devise-mailer
Updates Devise sender email
2017-01-10 20:07:42 +01:00
rgarcia
0049b6154c testing devise mailer 2017-01-10 20:04:01 +01:00
Raimond Garcia
ccdaca8d93 Merge pull request #1339 from consul/comments_on_investments
Comments on investments
2017-01-10 14:58:54 +01:00
Juanjo Bazán
76d818dd1b adds Budget::Investment comments specs 2017-01-10 14:31:28 +01:00
Juanjo Bazán
b71bcdd4b5 adds permissions to comment Investments as admin/moderator 2017-01-10 14:31:02 +01:00
Juanjo Bazán
ad435040bd adds helper to fix links to commentable 2017-01-10 13:54:50 +01:00
Juanjo Bazán
f102f9f753 adds Budget::Investment to valid commentable types 2017-01-10 13:30:30 +01:00
Juanjo Bazán
205b988f49 changes copy 2017-01-10 13:10:39 +01:00
Juanma
fcebfe4440 Fixes specs. 2017-01-10 12:34:02 +01:00
Alberto Garcia Cabeza
508de35320 polishes forms styles on devise views 2017-01-09 19:10:15 +01:00
Alberto Garcia Cabeza
ea70e0a5db removes duplicated i18n keys 2017-01-09 18:49:45 +01:00
Alberto Garcia Cabeza
201a222cd3 improves styles for omniauth buttons 2017-01-09 18:49:29 +01:00
Juanjo Bazán
a5338a4455 removes problematic html_safe link from flash notice
No need for it now that investments are public
2017-01-09 18:16:59 +01:00
Alberto Garcia Cabeza
42d147a462 changes general styles for devise layout 2017-01-09 18:07:04 +01:00
Raimond Garcia
e60a56ea8f Merge pull request #1335 from consul/under_age_setting
Minimum age setting
2017-01-09 17:46:44 +01:00
Alberto Garcia Cabeza
428c539684 fixes lineheight on official labels 2017-01-09 17:16:17 +01:00
Alberto Garcia Cabeza
2a3cbee96a Merge branch 'budgets' of github.com:consul/consul into budgets 2017-01-09 17:10:46 +01:00
Alberto Garcia Cabeza
e6cc09a460 adds budget icon on investment show when no aside 2017-01-09 17:10:36 +01:00
Alberto Garcia Cabeza
f9c4649fd1 adds active class on subnavigation for budgets investments 2017-01-09 17:09:40 +01:00
Juanma
5fe38f9720 Removes translation texts. 2017-01-09 16:27:30 +01:00
Juanma
ff8cc2d7bd Fixes values of official_level options for selects in search filters. 2017-01-09 16:07:59 +01:00
Juanjo Bazán
5a0d28f9f0 updates verification spec 2017-01-09 16:05:44 +01:00
Juanjo Bazán
be0cbb9ea1 adds setting to dev_seeds values 2017-01-09 16:05:33 +01:00
Juanjo Bazán
e2118f701b removes hardcoded age, favours setting 2017-01-09 16:05:27 +01:00
Juanjo Bazán
220e7397e1 adds Setting: minimum age to participate 2017-01-09 16:04:49 +01:00
Juanjo Bazán
c5278bfb3b Merge pull request #1331 from consul/budgets-tags
Adds tags to investments
2017-01-09 14:35:43 +01:00
Alberto Miedes Garcés
6940b90260 Add more fields to api.yml 2017-01-09 14:11:51 +01:00
rgarcia
cc891b4f30 fixes specs 2017-01-09 14:10:07 +01:00
rgarcia
19a79801d3 fixes i18n specs 2017-01-09 13:54:29 +01:00
Alberto Garcia Cabeza
5fa6131e28 fixes management layout 2017-01-09 13:37:47 +01:00
Alberto Miedes Garcés
b0bd30e3d1 Move api config file parsing method into the ApiTypesCreator class 2017-01-09 13:36:53 +01:00
rgarcia
f2d23b56e0 fixes conflicts with budgets 2017-01-09 13:33:01 +01:00
Raimond Garcia
b7788e0a1a Merge pull request #1333 from consul/budgets-baltasar
Budgets baltasar
2017-01-09 11:17:42 +01:00
rgarcia
b84ec0857c fixes specs 2017-01-09 11:02:15 +01:00
Alberto Miedes Garcés
60786f17c2 Improved code coverage for GraphQL resolvers specs 2017-01-09 10:14:31 +01:00
Alberto Garcia Cabeza
d5ffabac55 fixes specs for management budget investments 2017-01-08 22:17:37 +01:00
Alberto Garcia Cabeza
8722699cd8 fixes typos and spec for budgets investments 2017-01-08 22:17:14 +01:00
rgarcia
64366ba1f6 tmp fix for heading geozones 2017-01-08 20:03:30 +01:00
rgarcia
b4cd1ea9d7 merges with budgets 2017-01-08 19:58:53 +01:00
Alberto Miedes Garcés
e1b3d468e5 Fix failing spec 2017-01-08 14:27:20 +01:00
Alberto Miedes Garcés
398bc8c211 Split api types creation and query type creation between two different classes 2017-01-08 13:39:50 +01:00
rgarcia
be10972406 fixes management specs 2017-01-08 13:39:01 +01:00
rgarcia
3ba57bbab2 adds valuator tags 2017-01-08 13:24:05 +01:00
Alberto Miedes Garcés
b9d2bc2801 Wrote specs for QueryType creation 2017-01-08 12:45:48 +01:00
Alberto Miedes Garcés
7027164867 Clean code 2017-01-08 11:37:56 +01:00
Alberto Miedes Garcés
ed6ba384dd Wrote specs for GraphQL root resolvers 2017-01-08 11:37:15 +01:00
rgarcia
fd28f6c2b3 adds tags to investment 2017-01-08 11:37:02 +01:00
Alberto Miedes Garcés
0b302c2afc Move code from GraphQL initializer into GraphQL::TypeCreator 2017-01-07 23:04:30 +01:00