ocelot-Social-Community/Ocelot-Social
1
0
Fork 0
mirror of https://github.com/Ocelot-Social-Community/Ocelot-Social.git synced 2025-12-13 07:46:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
16,423 Commits 117 Branches 1,511 Tags
Commit Graph

34 Commits

Author SHA1 Message Date
mahula
7480f2c523 replace deprecated jest methods in webapp unit tests 2023-10-31 11:10:38 +01:00
Markus
9454b7b541 [WIP] fixing layout on newsfeed page 2023-03-17 18:21:56 +01:00
Wolfgang Huß
ec9c35a7c4 Fix tests in DonationInfo.spec.js 2021-09-16 11:36:44 +02:00
Wolfgang Huß
850f3c15ac Merge branch 'master' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu 
# Conflicts:
#	webapp/components/DonationInfo/DonationInfo.spec.js
#	webapp/components/DonationInfo/DonationInfo.vue
#	webapp/pages/index.vue
 2021-09-16 11:30:05 +02:00
Wolfgang Huß
8251877bd9 Merge branch '4265-move-sort-newsfeed-menu-into-filter-menu-moriz' of github.com:Ocelot-Social-Community/Ocelot-Social into 4265-move-sort-newsfeed-menu-into-filter-menu 
# Conflicts:
#	webapp/components/DonationInfo/DonationInfo.spec.js
#	webapp/pages/admin/donations.spec.js
 2021-09-15 13:53:10 +02:00
Wolfgang Huß
41252785d2 Fix tests 2021-08-05 17:57:48 +02:00
Wolfgang Huß
37cb8a2afb Fix linting 2021-08-05 16:24:50 +02:00
Wolfgang Huß
aa454893ce Refactor pageParams, third step 
- Implement emails.js in backend as well.
- Move backend links.js into emails.js, because code is not a duplicate of webapp anymore.
 2021-08-05 14:44:54 +02:00
Wolfgang Huß
c491ddf1d8 Overtake @Mogge suggestion for 'DonationInfo.spec.js' 2021-07-21 12:53:30 +02:00
Moriz Wahl
5699620c85 suggested solutions 2021-07-12 12:20:08 +02:00
Wolfgang Huß
e4a7a6750c Write and fix donations bar frontend tests 2021-05-07 12:14:33 +02:00
Wolfgang Huß
da951c6fb6 Clean up 2021-05-06 16:37:31 +02:00
Wolfgang Huß
548df0a753 Fix tests 2021-05-06 16:02:42 +02:00
Wolfgang Huß
e558baef87 Implement showDonations in newsfeed 
- Clean up some stuff.
 2021-04-15 16:40:01 +02:00
Wolfgang Huß
9c9b6d5aa5 Change height of process bar and button to small 2021-04-15 13:17:49 +02:00
Wolfgang Huß
d40dd94868 Implement showDonations in the database 
- Add to backend tests.
 2021-04-15 10:51:01 +02:00
Wolfgang Huß
4c72dd7481 Move progress bar on top of the news feed again, with full width 2021-04-13 16:43:58 +02:00
Wolfgang Huß
90b9ffb917 Implement donation progress bar, second step 2021-04-08 17:44:35 +02:00
Wolfgang Huß
371e83404c Implement progress bar again, first step 2021-04-08 15:58:23 +02:00
Moriz Wahl
5cfb73572e further rebranding 2020-11-16 09:43:15 +01:00
roschaefer
387ea64faa Parameterize links 2020-06-05 17:15:12 +02:00
roschaefer
276ea79e8f Update prettier to v2 2020-03-24 21:11:11 +01:00
Alina Beck
56a3822377
Merge pull request #2562 from Human-Connection/migrate-styleguide-buttons 
refactor(styleguide): migrate and redesign buttons
 2020-01-15 14:17:06 +03:00
mattwr18
b2db5e6057 Skip tests for DonationsInfo 
- the functionality it's testing has been suspended. If we add back that
functionality, we should refactor the tests/stop skipping.
- Or maybe we can remove them in a separate PR??
 2020-01-10 10:35:12 +01:00
Alina Beck
34006a25e2 rename primary to filled 2020-01-09 13:25:12 +05:30
Alina Beck
7c7a800bc2 replace ds-button with base-button (wip) 2019-12-19 00:50:27 +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
63d223e368
Apply suggestions from code review 
Co-Authored-By: Robert Schäfer <git@roschaefer.de>
 2019-11-12 18:52:38 +03:00
mattwr18
8b5cd48d3c Translate success message, guard clause for no Donations 2019-11-12 15:33:21 +01:00
Alina Beck
982a02fc4f query donations data in donation info component 2019-11-12 14:24:46 +03:00
mattwr18
7d95809f6e Update test to ensure currency is shown by locale 2019-11-11 19:15:39 +01:00
Alina Beck
ffb3ff896e add tests for DonationInfo component (wip) 2019-11-11 17:36:04 +03:00
Alina Beck
d15a1a8105 style donations info for mobile 2019-11-11 15:57:29 +03:00
Alina Beck
f6de44b337 place donation info in separate component 
compute title and label according to selected locale and donation values
 2019-11-11 13:09:51 +03:00