Commit Graph

3893 Commits

Author SHA1 Message Date
BertoCQ
ada3d1a667 Merge pull request #1756 from consul/feature/social_metatags_images
Allow social image tags to be overwritten
2017-07-18 13:37:45 +02:00
decabeza
2844c03e43 adds consistency on social media filenames 2017-07-18 11:40:19 +02:00
BertoCQ
fca8d6b6bb Merge pull request #1748 from consul/chore/budget_results_madrid_improvements
Improvements on budget results view & table
2017-07-18 02:07:35 +02:00
Bertocq
f73c0a700a Allow social image tags to be overwritten with partial params 2017-07-17 20:35:19 +02:00
Bertocq
705ef19f6d Improvements on budget results view & table 2017-07-17 20:19:54 +02:00
decabeza
f24b9db8c4 improves styles of change credentials button 2017-07-17 17:22:47 +02:00
rgarcia
ffb80d8c51 Loads first heading if no heading_id params present 2017-07-13 12:29:18 +02:00
rgarcia
a6baaa93ba Adds social meta tags for budget results 2017-07-13 12:28:51 +02:00
BertoCQ
8d7a467397 Merge pull request #1746 from consul/rubocop/rails_fixes
Rubocop fixes 🤖: Rails edition 💎🛤
2017-07-11 22:28:55 +02:00
BertoCQ
9c4eb4cef3 Merge pull request #1727 from rockandror/followable
Followable
2017-07-11 13:19:42 +02:00
Bertocq
fafec293e8 Remove duplicated ability for everyone 2017-07-11 12:51:39 +02:00
BertoCQ
204ea13c85 Merge branch 'master' into followable 2017-07-11 11:30:49 +02:00
Senén Rodero Rodríguez
b0ee52556c Remove comment 2017-07-11 10:36:07 +02:00
Senén Rodero Rodríguez
503e079909 Move followable button to sidebar after social share buttons 2017-07-11 10:30:07 +02:00
Senén Rodero Rodríguez
58b1ee57cf Set button style to followable button 2017-07-11 10:29:23 +02:00
Bertocq
5a358bce17 Fix all Rails/FilePath rubocop issues 2017-07-10 23:08:02 +02:00
Bertocq
3a54713ed0 Fix all Rails/DynamicFindBy rubocop issues 2017-07-10 23:04:27 +02:00
Bertocq
beb4bc119c Fix Rails/Delegate rubocop issue 2017-07-10 23:02:27 +02:00
Bertocq
4e0d88739d Fix Rails/Blank rubocop issue 2017-07-10 23:02:27 +02:00
BertoCQ
6285ad3b68 Merge pull request #1738 from consul/feature/improve_budget_results
Improve budget results
2017-07-10 22:57:30 +02:00
Bertocq
11a793d63f Hide incompatible and non-winner investments by default 2017-07-10 19:43:55 +02:00
Bertocq
49f48ddf4b Highlight current heading on results list 2017-07-10 17:48:04 +02:00
Bertocq
741a342bb0 Restrict compatilibility edit on admin investment form
Why:

* A non-winner but compatible investment shouldn't be marked as incompatible

How:

* Show incompatilibility checkbox only if investment is winner or incompatible
2017-07-10 17:34:05 +02:00
Bertocq
2fba9de33b Don't display incompatible investment's table if empty 2017-07-10 17:12:28 +02:00
Bertocq
3a94fe4cc2 Fix indentation on if-else assignement 2017-07-10 16:03:31 +02:00
Bertocq
efacd0def3 Make calculate_winners explicitly delayed
Why:

* As seen on preproduction and production environments on Madrid's fork. Budget::Result#calculate_winners is very costly when done to all headings for a given budget (as requested on Admin::BudgetsController#calculate_winners) but its not when done individually for only a heading (as requested on Budget::Investment#recalculate_heading_winners)

How:

* Removing `handle_asynchronously :calculate_winners` from bellow Budget::Result#calculate_winners definition, to avoid making any call delayed. And explicitly calling `.delay` only when needed (on Admin::BudgetsController#calculate_winners)
2017-07-10 15:12:14 +02:00
Bertocq
2b85deabec Recalculate heading winners on incompatibility change
Why:

* We should recalculate winners also when an incompatible investment is flagged as compatible again

How:

* Removing the condition to recalculate that was checking only for a winner investment flagged as incompatible
* Extending the Budget::Result model spec to cover that new scenario
2017-07-10 14:24:55 +02:00
Bertocq
69f4e1c683 Fix all rubocop Metrics/LineLength issues (140+) 2017-07-10 13:22:49 +02:00
Senén Rodero Rodríguez
95630d6546 Add comment to temporary bugfix. 2017-07-10 12:46:31 +02:00
Bertocq
b1caefdf9a Use i18n to localize date on view 2017-07-09 13:44:31 +02:00
Senén Rodero Rodríguez
4b2310c135 Move and refactor method from follow to user model to get user interests. Add specification to check the discard of duplicate interests. 2017-07-07 15:18:34 +02:00
Senén Rodero Rodríguez
a7aef0a9fb Initialize App js modules after followable update. 2017-07-07 13:38:53 +02:00
taitus
60e812c2e5 New texts and titles for followable buttons. 2017-07-07 13:38:53 +02:00
taitus
5fe894aa6b New proposal method to get users_to_notify. 2017-07-07 13:38:52 +02:00
taitus
0c2be6a0d4 Refactor js followable response. 2017-07-07 13:38:52 +02:00
taitus
b60748c552 Remove unneeded return from Follow model. Add whitespaces to enhance reading. 2017-07-07 13:38:52 +02:00
taitus
97ee107157 Do not show flaggable and followable buttons on budgets_investment and proposals pages when user is not logged. 2017-07-07 13:38:52 +02:00
taitus
0ffa213a65 Fix scss-lint 2017-07-07 13:38:49 +02:00
taitus
b29bf62f56 Send proposals notifications to followers. 2017-07-07 13:37:55 +02:00
taitus
35f7f11177 Add dependent destroy to followable. 2017-07-07 13:37:55 +02:00
taitus
14ec4f5315 Add styles and translations for users interests. 2017-07-07 13:37:53 +02:00
Senén Rodero Rodríguez
313b78978d Add followable JS module. Refactor follow_helper and follow buttons partial. 2017-07-07 13:34:54 +02:00
Senén Rodero Rodríguez
1f22286e29 Create rspec shared examples to test followable features on any followable entity. 2017-07-07 13:34:54 +02:00
taitus
19820e4432 Add public interests validation and show interests on user profile 2017-07-07 13:34:43 +02:00
taitus
bce28afe36 Add followable to budget investment model. 2017-07-07 12:07:25 +02:00
Senén Rodero Rodríguez
84dbef16a4 Create followable concern, follow model. Add followable to proposal model. 2017-07-07 12:02:00 +02:00
Bertocq
a9c928505d Fix indentation on annotator overrides scss file 2017-07-06 15:56:51 +02:00
BertoCQ
e990568895 Merge pull request #1721 from consul/feature/add_slugs_to_budget_related
Add slugs to budget related
2017-07-05 13:16:24 +02:00
BertoCQ
c439454ec7 Merge pull request #1722 from consul/chore/rubocop_cleaning
Rubocop cleaning
2017-07-05 13:12:09 +02:00
Bertocq
e3d89261a6 Add Sluggable concern and unique validation to Budget, Group and Heading
* What: We need to generate slug on Budget, Group and Heading classes, validating its unique for its scope

* How: Adding a presence and unique validation using Budget always as scope.
2017-07-05 12:33:16 +02:00