IT4Change/Ocelot-Social
3
0
Fork 0
mirror of https://github.com/IT4Change/Ocelot-Social.git synced 2025-12-13 07:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,808 Commits 5 Branches 2 Tags
Commit Graph

59 Commits

Author SHA1 Message Date
ogerly
baaa61761d change width, oderBy slug_asc 2022-10-27 11:40:22 +02:00
Wolfgang Huß
937954b6f6 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 
# Conflicts:
#	webapp/layouts/default.vue
 2022-10-21 11:23:27 +02:00
Moriz Wahl
43bf1ae79d refactor: Category Filter in Filter Menu 2022-10-19 13:44:17 +02:00
Wolfgang Huß
5392da0983 Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 5059-epic-groups 2022-09-24 18:18:20 +02:00
ogerly
858739eaa0 fix review 2022-09-22 18:42:58 +02:00
ogerly
a1292ef9ff fix lint 2022-09-20 16:03:50 +02:00
ogerly
52070b8c57 change color and scss in branding 2022-09-20 16:03:06 +02:00
Wolfgang Huß
bece00c1bc Set Vue tooltip delay to 1500 ms and remove unneeded properties 2022-09-16 07:22:44 +02:00
Moriz Wahl
64153ea9e3 change delay of category tooltip to 1500 2022-09-15 10:04:26 +02:00
Moriz Wahl
5727eeb49f feature: Tooltips for Topics 2022-09-13 09:17:04 +02:00
Moriz Wahl
32e7c8971c Merge branch 'master' into save-categories-in-frontend 2022-09-07 15:14:03 +02:00
Moriz Wahl
f5d8014f6c fix: Category Filter Menu Client Only 2022-09-07 11:06:43 +02:00
Moriz Wahl
3213bd3ee4 test save categories 2022-09-06 19:17:06 +02:00
Moriz Wahl
d45ad17b43 add save button to category filters 2022-09-06 18:51:20 +02:00
Moriz Wahl
87aa47d683 add optional topica menu when categories are active 2022-08-31 14:32:46 +02:00
Moriz Wahl
407f4f8d2d fix test (mock .CATEGORIES_ACTIVE) 2022-08-25 13:29:08 +02:00
Moriz Wahl
a22023174d feat: Show Categories Filter when Categories are Active 2022-08-22 18:33:12 +02:00
Wolfgang Huß
d259b27943 Write and fix tests for order by in filter menu 2021-04-13 14:34:51 +02:00
Wolfgang Huß
c2cf89447b Rename newsfeed sorting to ordered by 
- Fix a test.
 2021-04-13 10:16:51 +02:00
Wolfgang Huß
7888d93a7f Cleanup 2021-04-12 15:59:44 +02:00
Wolfgang Huß
245be52ac8 Translate order by 
- Cleanup the store.
- Fix tests.
 2021-04-12 15:54:56 +02:00
Wolfgang Huß
16d8a42d9b Implement or move sort by date filter in filter menu 2021-04-12 15:09:28 +02:00
Moriz Wahl
8664c94c9c disbale emoji, language and catgeory filter 2021-02-03 12:27:04 +01:00
mattwr18
06985c2dbb chore: fix lint w/ new linting rules 2020-03-26 18:55:10 +01:00
mattwr18
e1733201e8 chore: Fix lint, follow @alina-beck suggestions 2020-03-25 11:02:28 +01:00
Alina Beck
478e4fa08f include magic numbers in tokens, fix tests 2020-03-25 11:02:28 +01:00
Alina Beck
d9c3412b41 outsource styling to FilterMenuSection component 
@mattwr18 great work and great styling so far! ;)
fyi: I noticed there was a lot of duplicate CSS and the solution I came up with is this new component, using slots
 2020-03-25 11:02:28 +01:00
mattwr18
eb4536d855 refactor: test the functionality separately 2020-03-25 11:02:28 +01:00
mattwr18
5b8fecc6ef refactor: Extract LanguagesFilter to its own spec 2020-03-25 11:02:28 +01:00
mattwr18
bb183b1211 refactor: Extract FollowingFilter to its own spec 2020-03-25 11:02:28 +01:00
mattwr18
27c3c02e07 refactor: Extract CategoriesFilter to it own spec 2020-03-25 11:02:28 +01:00
mattwr18
38d2edf0f2 refactor: Extract EmotionsFilter to its own spec 2020-03-25 11:02:28 +01:00
mattwr18
4f8a4c6753 Refactor LanguageFilter to remove ds-flex 2020-03-25 11:02:28 +01:00
mattwr18
e400a10c45 chore: rename/refactor filter, make responsive 
- Make the emotions filter similar in style to CategoriesFilter
 2020-03-25 11:02:28 +01:00
mattwr18
0f03d09723 refactor: Extract FollowingFilter as own component 
Co-authored-by: Alina Beck <alina.beck@mail.com>
 2020-03-25 11:02:28 +01:00
mattwr18
b19a2a8dea Refactor GeneralFilter to remove unnecessary code 
- remove ds-flex, ds-flex-item, ds-space, ds-heading
- not really happy with the design, and in mobile the divider border is
  hidden(!?)
 2020-03-25 11:02:28 +01:00
Alina Beck
1ffde6bf10 refactor: CategoriesFilter to not use ds-flex 
Co-authored-by: mattwr18 <mattwr18@gmail.com>

- introduce LabeledButton component
- rename FilterMenu to HashtagsFilter and FilterPosts to FilterMenu
 2020-03-25 11:02:00 +01:00
Alina Beck
ad385490bc follow @mattwr18 PR review 
- replace magic numbers with tokens
- remove unused name attribute
- use slot shorthand (for the slots added in this PR)
 2020-02-17 10:44:52 +01:00
Alina Beck
0a9da862ed replace instances of ds-card with base-card 2020-02-10 15:45:09 +01:00
Alina Beck
ad27404059 fix failing component tests 2019-12-19 12:48:13 +05:30
Alina Beck
85f628848b continue to replace ds-button with base-button (wip) 2019-12-19 08:38:04 +05:30
Alina Beck
77f4810ddc set up global localVue 
by setting up localVue with all required plugins (such as styleguide and vuex)
in a separate testSetup file we can avoid doing this individually in all component tests
the testSetup is executed before each test suite, so each test file gets a fresh
instance of localVue
 2019-11-20 12:31:40 +03:00
Alina Beck
da8491a559 style filter menu grid item 2019-08-15 21:29:37 +01:00
Robert Schäfer
0e707cdd4c Massive refactoring 
Fix #1231 the filter menu once and for all...
 2019-08-10 03:41:38 +02:00
Matt Rider
ec7a5865f7 Update tests, showFilterPostsDropdown only on route 2019-08-02 15:41:19 +02:00
Matt Rider
afb9dbe241 Move filter by followers functionality to filter dropdown 2019-08-02 13:02:12 +02:00
Robert Schäfer
6f24f066d6 Revert "Get rid of obsolete /search/hashtag page" 
This reverts commit ec19c732e5678544d8dfd50c25f2c33e5aeb217e.

Ok, native module URL cannot parse relative URLs. It ensures that all parts
of the URL are present. So I'll revert this to get the ball rolling. We
can refactor out the obsolete page later on.

FYI @Tirokk
 2019-07-09 14:39:28 +02:00
Robert Schäfer
ec19c732e5 Get rid of obsolete /search/hashtag page 
@Tirokk there is this neat URL module: https://nodejs.org/api/url.html

It has convenience methods for adding query params. I'm just not quite
sure about browser compatibility though.
 2019-07-08 23:10:46 +02:00
Wolfgang Huß
1c8dac7359 Get the links of the Tags in the Post as a URL driven query to work 
Co-Authored-By: mattwr18 <mattwr18@gmail.com>
 2019-07-04 19:55:06 +02:00
Matt Rider
8a77fcff15 Fix failing test, console.errors 2019-06-20 11:57:52 -03:00