Commit Graph

5383 Commits

Author SHA1 Message Date
decabeza
6c5513ab38 replaces back_link partial to back_link_to helper 2017-07-26 18:22:45 +02:00
decabeza
0b235d69d4 adds consistency for back links 2017-07-26 18:18:30 +02:00
Senén Rodero Rodríguez
3370896ead Add empty interests list message. 2017-07-26 17:48:47 +02:00
BertoCQ
13871b823b Merge pull request #1750 from rockandror/followable-user-activity
User page: new following section
2017-07-24 13:10:09 +02:00
BertoCQ
fa940b0687 Merge pull request #1765 from consul/admin-menu
Admin dropdown
2017-07-24 12:42:35 +02:00
decabeza
39b6834a61 fixes admin dropdown on admin section 2017-07-24 11:15:41 +02:00
Bertocq
361e0efe00 Remove Poll Recount model and all usages 2017-07-23 23:29:24 +02:00
Bertocq
d98425f45b Remove daily officer recounts from admin poll recounts list 2017-07-23 23:28:38 +02:00
Bertocq
c40294e931 Remove officing recount feature 2017-07-23 23:28:38 +02:00
Senén Rodero Rodríguez
b7bce2e699 Remove complex methods from follow model. Create instance method followed_by? on followable model concern. Some code improvements. 2017-07-19 21:50:37 +02:00
Senén Rodero Rodríguez
dec7d2d2b5 Add followable specific notices to follows controller actions and render notice on AJAX JS response. 2017-07-19 19:43:05 +02:00
decabeza
631ea77cf7 adds dropdown on admin menu items 2017-07-19 18:34:07 +02:00
Senén Rodero Rodríguez
119a6b3397 Remove where clause from followable button partial and rename followable_button partial to follow_button. 2017-07-19 17:51:51 +02:00
Senén Rodero Rodríguez
c9a6630c94 Remove popup on follow buttons and remove uneeded code. 2017-07-19 17:51:45 +02:00
Senén Rodero Rodríguez
cba497b32e Create new followables helper to have some methods previously on follows helper. Rename entity to followable. 2017-07-19 17:50:46 +02:00
decabeza
79fb497bfb adds active class on login items menu 2017-07-19 17:03:19 +02:00
rgarcia
b7ef755b16 minor refactoring for follows 2017-07-19 13:52:38 +02:00
Senén Rodero Rodríguez
57c8887077 Add method to follows helper to get followable partial name and arguments automatically. 2017-07-18 19:35:47 +02:00
Senén Rodero Rodríguez
16987e7eb8 Easier conditional usage. 2017-07-18 19:21:17 +02:00
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
taitus
b0c571e658 Do not display send notification button when proposal is from another author. 2017-07-13 20:33:57 +02:00
Alessandro Cuoghi
556e2598c3 Remove margin bottom in the table inside accordion. Divided into groups of 10 interests. Inserted interests in columns. 2017-07-13 20:29:36 +02:00
taitus
7e2e94d709 Add following tab to user public page. 2017-07-13 20:29:34 +02:00
Alessandro Cuoghi
52e195d837 Add tab. Add accordion. Add style. Pass test scss-lint. 2017-07-13 20:14:55 +02:00
rgarcia
a6baaa93ba Adds social meta tags for budget results 2017-07-13 12:28:51 +02:00
BertoCQ
204ea13c85 Merge branch 'master' into followable 2017-07-11 11:30:49 +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
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
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
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
b29bf62f56 Send proposals notifications to followers. 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