Commit Graph

2313 Commits

Author SHA1 Message Date
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
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
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
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
Bertocq
343da2d58e Improve admin investment view with selection/compatibility/winner flags on top 2017-07-05 11:26:59 +02:00
Bertocq
e35817f240 Add selected checkbox on admin investment form 2017-07-04 23:48:18 +02:00
Raimond Garcia
e7e5b3c4a3 Merge branch 'master' into 1647-locale_site_customization 2017-07-04 12:11:07 +02:00
Bertocq
10c299d19f Add to public Budget Results page winners, discarded and incompatible listing 2017-07-04 01:34:25 +02:00
Bertocq
688ec05ea2 Replace winner column for incompatible on admin investment list filter by selected 2017-07-04 01:34:24 +02:00
Bertocq
646b3657ee Add investment status on admin budget investment detail show page 2017-07-04 01:34:24 +02:00
Bertocq
afc77f68fb Add incompatible checkbox on admin investment edit form 2017-07-04 01:34:24 +02:00
María Checa
ecaf7192c5 Merge branch '1647-locale_site_customization' of https://github.com/MariaCheca/consul into 1647-locale_site_customization 2017-07-03 12:59:09 +02:00
María Checa
3e2cbabc9c Locales helper improvement
Added a rescue block in `name_for_locale()` to ensure the application doesn't crash in case it receives an invalid locale.
2017-07-03 12:55:22 +02:00
María Checa
36d51b380b Merge branch 'master' into 1647-locale_site_customization 2017-07-02 23:19:40 +02:00
María Checa
6f24c68ab5 Improved pages index
Locale can be seen as text instead of the code.
2017-07-02 23:12:47 +02:00
María Checa
8894ec4f7c Pages form improvements
Added `locale` validation to model and improved its form select tag performance.
2017-07-02 21:28:13 +02:00
María Checa
ed7b7f0361 Added scope to pages model
New scope to use when listing pages to show only the ones with current locale.
2017-07-02 14:54:11 +02:00
María Checa
720a2af046 Update pages controller and views
Added new attribute `locale` to pages index list and form.
2017-07-02 14:49:56 +02:00
Eduardo Martinez Echevarria
3e5c5d7e49 Define some actions on legislation processes as member actions 2017-06-30 15:08:23 +02:00
Eduardo Martinez Echevarria
dfa9c988ad Add checkbox to set published in process admin management 2017-06-30 15:08:23 +02:00
Raimond Garcia
22d28d9c79 Merge branch 'master' into issue#1575-tag-administration 2017-06-29 19:09:54 +02:00
decabeza
a97130934a fixes text on publish comment button 2017-06-28 13:40:37 +02:00
Bertocq
57f476c2fa Merge branch 'master' into feature/add_population_to_budget_heading 2017-06-27 18:43:24 +02:00
Raimond Garcia
2ad4959c42 Merge pull request #1706 from consul/refactor_test
Refactor comments partial
2017-06-27 15:25:41 +02:00