MaDgIK
/
openaire-library
13
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
943 Commits 22 Branches 0 Tags 11 MiB
Commit Graph

104 Commits

Author SHA1 Message Date
konstantina.galouni 9261419e2d [Trunk | Library]: Merging branch 'use-UoaAdminToolsLibrary' into trunk for revisions 58402:59464 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59465 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-09-24 11:18:24 +00:00
k.triantafyllou bd41180c74 Fix reload location after login logout 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59457 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-09-23 10:15:39 +00:00
k.triantafyllou 6d593aaa27 [Library | Trunk]: Remove deprecated from getCommunity, add methods on user registry service 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59348 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-09-08 14:33:06 +00:00
k.triantafyllou e8a40e5e37 [Library | Trunk]: Change cdeditor library 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59269 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-08-14 09:49:35 +00:00
k.triantafyllou c1977b1404 [Library | Trunk]: Fix parse roles for userinfo 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59250 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-08-11 12:54:14 +00:00
argiro.kokogiannaki 99198fb0d9 [Library|Trunk] 
Domain:
	properties -->  domain: change it to https:// + domain (needed fro jsonld)
	getCommunityFromDomain function: split to remove the https://


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59248 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-08-11 12:39:55 +00:00
k.triantafyllou 07783fa92e [Library | Trunk]: Add on error for some subjects calls. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59245 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-08-11 12:16:50 +00:00
k.triantafyllou 59ff1cc209 [Library | Trunk]: Add new session methods on guards 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59232 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-08-06 20:01:37 +00:00
konstantina.galouni 15d4fc5398 [Trunk | Library]: community.service.ts & ISVocabularies.service.ts: Removed prints for debugging. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59156 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-07-21 13:50:31 +00:00
konstantina.galouni 0a1576d618 [Trunk | Library]: 
1. community.service.ts: 
	a. Add BehaviorSubject for community.
	b. Method "isCommunityManager" replaced by "isCommunityManagerByState" (filtering applied in community stored in BehaviorSubject).
        c. Method "isRIType" replaced by "isRITypeByState" (filtering applied in community stored in BehaviorSubject).
        d. Method "isCommunityType" replaced by "isCommunityTypeByState" (filtering applied in community stored in BehaviorSubject).
2. connectAdminLoginGuard.guard.ts: 
	a. Get properties from environment (no service needed).
	b. Call method "isCommunityManagerByState" of CommunityService.
	c. Add "canDeactivate" method to unsubscribe (TODO: call method from routing modules).
3. connectCommunityGuard.guard.ts: 
        a. Get properties from environment (no service needed).
        b. Call method "isCommunityTypeByState" of CommunityService.
        c. Add "canDeactivate" method to unsubscribe (TODO: call method from routing modules).
4. connectRIGuard.guard.ts:
        a. Get properties from environment (no service needed).
        b. Call method "isRITypeByState" of CommunityService.
        c. Add "canDeactivate" method to unsubscribe (TODO: call method from routing modules).
5. isRouteEnabled.guard.ts: Add "canDeactivate" method to unsubscribe (TODO: call method from routing modules).
6. curator.service.ts: [Undo change of r59073] Use "useCache" property, not "useLongCache" for curators.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59140 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-07-16 23:08:10 +00:00
argiro.kokogiannaki 150efc1cfb [Connect|Trunk] 
Connect Helper: read community from domain for production

Add extra properties file for real production environment (environment.prop.prod.ts)

Add new piwik ids



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59121 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-07-15 08:19:35 +00:00
konstantina.galouni 0e26d955bc [Trunk | Library]: 
1. curator.service.ts: Use "useLongCache" property for curators.
2. helper.service.ts: Use "useLongCache" property for helptexts.
3. env-properties.ts: Add "useLongCache" property.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59073 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-07-12 22:14:50 +00:00
k.triantafyllou 34fbdcf44b [Library | Trunk]: Revert parameter to user Info back 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59041 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-07-02 15:02:14 +00:00
k.triantafyllou 885999c8ad [Library | Trunk]: Remove parameter from userInfo. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59040 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-07-02 14:51:58 +00:00
argiro.kokogiannaki 2979275c17 [Library|Trunk] 
communities:
	add const prodReadyCommunities 
	communities search results: in production show link to beta or prod based on the list of prodReadyCommunities


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@59028 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-06-30 15:56:56 +00:00
argiro.kokogiannaki 14ab4b5d86 [Library|Trunk] 
Apply fix for community chart



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58684 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-05-12 13:23:23 +00:00
argiro.kokogiannaki fa94d9fc45 [Library|Trunk] 
CommunityCharts: update chart titles




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58670 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-05-11 15:17:19 +00:00
k.triantafyllou a0aff69243 [Library | Trunk]: Add adminPortalURL property for composer.ts 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58655 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-05-08 15:01:59 +00:00
argiro.kokogiannaki c4addc2f13 [Library|Trunk] 
Linking:
	rename entity type to Result type

Deposit:
	First page:
	remove border
	remove small text in first section paragraphs
	remove padding from search form
	Search:
	go to first page when keyword changes
	keep filters when keyword changes


Impact Factors:
	update text (Exceptional,Substantial,Average)


Search bar:
	pass parameters for advanced search
	init keyword from params
	if page not among search pages ignore keyword
	when change to other entity clear parameters


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58606 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-05-05 16:21:31 +00:00
argiro.kokogiannaki f3c6ac3638 [Library|Trunk] 
Deposit :
	add breadcrumb 
	light blue background
	title & forms changes
	new zenodo button

Search pages: remove route from last breadcrumb

SearchBar: show advanced search only if tthe current route is search		

 


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58563 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-04-27 12:54:48 +00:00
argiro.kokogiannaki 7f1862dbab [Library|Trunk] 
Search:

-Entities Selection: add check if route is enabled
-Delay in result types checkboxes to 2 s
-Use breadcrumb component
-add connect background
-remove space between names in showAuthors component
-Filters:
	-message about top 100 always visible
	-rename to view all
	-change css for search input
	-show 100 if results > 95
	-view less under the 2nd list
-Search bar:
	-select contains all avaliable entities not only search results
	-

Landing pages:

-correct issue with pmid in landing
-correct issue with date in cite this
-Hide Addthis:
	value in properties
 





git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58552 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-04-27 08:14:05 +00:00
konstantina.galouni 23ebd629e9 [Trunk | Library]: communityCharts.ts: Minor height and width changes for chars (old statistics tool) (during connect redesign). 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58545 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-04-24 15:47:01 +00:00
argiro.kokogiannaki bfc49c0e18 [Library|Trunk] 
Connect - Production release with links to beta: Connect helper ignore community id in domain if in production

Search Page:
	option to include breadcrumb
	show quickFilters for only results view
	Quick Filters: 
		one line if they fit
Entities Selection Component:
	add option to show only result types 
	add check  if different result types are enabled


Add search bar component:
	select different result types 

Navbar: apply changes for searchbar to fit 

	


	


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58517 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-04-22 13:00:13 +00:00
argiro.kokogiannaki f1fa706299 [Library|Trunk] 
Connect related changes:
	1.community search results: production link goes to beta
	2. add isActive fin stats display class



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58470 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-04-10 09:45:20 +00:00
konstantina.galouni 71a4d35c43 [Trunk | Library]: 
1. subscribe.service.ts: 
	a. Method "subscribeToCommunity()" renamed to "subscribeToCommunityByEmail()" and method "unSubscribeToCommunity()" renamed to "unSubscribeToCommunityByEmail()".
        b. Add methods: "getNumberOfCommunitySubscribers()", "subscribeToCommunity()", "unSubscribeToCommunity()".
	c. Method "isSubscribedToCommunity()": API changed to return true/ false without revealing users' emails (no processing needed here anymore).
	d. Methods: "isSubscribedToCommunity()", "subscribeToCommunity()", "unSubscribeToCommunity()" - DO NOT SEND user email, API will do the work via token ("X-XSRF-TOKEN" header).
2. connectSubscriber.guard.ts: Use new method "isSubscribedToCommunity()" without email parameter (subscribe.service).


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58459 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-04-10 05:16:38 +00:00
konstantina.galouni 6331a47039 [Trunk | Library]: 
1. searchDataproviders.service.ts & searchProjects.service.ts & searchZenodoCommunities.service.ts & email.service.ts: Rename "communityId" to "pid".
2. curator.service.ts: create request path in service.
3. help-content.service.ts: Added method "statisticsIsActiveToggle()" (already added in help-content.service.ts in Admin portal).
4. layout.service.ts: "properties" as first parameter in methods | build request path in service.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58443 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-04-08 11:25:41 +00:00
konstantina.galouni 4d6d459f41 [Trunk | Library]: 
1. community.service.ts: Mark unused method "isSubscribedToCommunity()" as "deprecated" (This service calls community API - made in Italy, not uoa-admin-tools - made in Greece).
2. connectSubscriber.guard.ts: Call "isSubscribedToCommunity()" method from "subscribe.service.ts" (not "community.service.ts").
3. curator.service.ts: getCurators(properties: EnvProperties, url: string) --> getCurators(properties: EnvProperties, emails: string): Build path for request in service.
4. email.service.ts: Build request path in service
	a. sendEmail(url: string, email: Email) --> sendEmail(properties: EnvProperties, email: Email)
	b. contact(url: string, email: Email, recaptcha: string = null) --> contact(properties: EnvProperties, email: Email, recaptcha: string = null)
	c. Create method "notifyForNewManagers(properties: EnvProperties, communityId: string, email: Email)" (sendEmail was used for everything).
5. subscribe.service.ts: 
	a. subscribeToCommunity(pid: string, email: string, url: string) --> subscribeToCommunity(properties: EnvProperties, pid: string, email: string)
	b. unSubscribeToCommunity(pid: string, email: string, url: string) --> unSubscribeToCommunity(properties: EnvProperties, pid: string, email: string)
6. layout.service.ts: getLayout(communityId: string, url: string) -->  getLayout(properties: EnvProperties, communityId: string): Build path for request in service.
7. feedback.component.ts: In method "contact" from "emailService", build request path in service.


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58420 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-04-07 14:57:26 +00:00
k.triantafyllou 6d9eafbf51 [Libary | Trunk]: Add isActive on StatisticsDisplay class 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@58372 d315682c-612b-4755-9ff5-7f18f6832af3
 2020-04-01 13:42:05 +00:00
k.triantafyllou eee4f0807e [Library | Trunk]: Change getUserInfo to be suitable for guards too. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57939 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-12-23 15:09:17 +00:00
k.triantafyllou 68ebe44682 [Library]: Check if is Client on userInfo method. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57547 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-11-08 12:07:39 +00:00
k.triantafyllou 4316c70b9a [Library]: Add check if isClient to getUserInfo 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57545 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-11-08 11:01:50 +00:00
argiro.kokogiannaki 2e20a38d17 [Library|Trunk] 
update customization options class (rm copy method, change fonts values)



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57337 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-10-10 14:46:00 +00:00
argiro.kokogiannaki bc427b7e62 [Library|Trunk] 
CustomizationOptions class: update according to UI - admin design


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57274 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-10-07 06:58:49 +00:00
k.triantafyllou 7955acd2bc [Library]: Fix some issues on guards. Change session is Logged in to check user's token. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57071 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-09-13 09:38:21 +00:00
k.triantafyllou 95ee0d8984 Check is LoggedIn from Session 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57064 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-09-13 08:26:09 +00:00
k.triantafyllou 98c98e6625 [Library]: Add user management service and change all session methods with new ones. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57058 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-09-13 07:01:19 +00:00
argiro.kokogiannaki e0dddbf71e [Library|Trunk] 
move connect CustomizationOptions.ts in Library


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@57045 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-09-12 09:40:17 +00:00
k.triantafyllou 9f3dafd895 Fix bug on adminLoginGuard wrong redirectedUrl on canLoad. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56976 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-09-05 14:02:18 +00:00
argiro.kokogiannaki db2371fee7 [Library|Trunk] 
Communities service: set behaviorSubject to null



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56805 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-07-30 08:56:35 +00:00
k.triantafyllou d75b540775 [Library]: Add guard to check if there is community or user is Portal Administrator. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56516 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-07-12 13:16:30 +00:00
konstantina.galouni 39b63dca2b [Trunk | Library]: connectHelper.ts: in method 'getCommunityFromDomain()', also return null when domain is 'admin'. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56379 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-07-05 12:11:04 +00:00
konstantina.galouni a0b9e62c00 [Trunk | Library]: 
approved.component & connectSubscriber.guard & mailPrefs.component & isRouteEnabled.guardisRouteEnabled.guard & helper.componenthelper.component: 
	Priority to get communityId from domain (if not exists, check url parameter)


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56330 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-07-03 10:14:24 +00:00
k.triantafyllou 0fe32acf58 [Trunk|Library]: Fix entities map: Data -> data 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56198 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-06-25 12:31:07 +00:00
argiro.kokogiannaki 27a2ad0be5 [Library|Trunk] 
Properties: add new charts tool url + a boolean property useNewStatistisTool
	
	Stats for connect:
		add a class that creates a map for the connect frame urls, and use properties to create urls based on old or new tool
		


git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56147 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-06-21 08:53:48 +00:00
k.triantafyllou b1d2d474f3 [Trunk|Library]: Change map for statistics entities. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56111 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-06-18 15:29:55 +00:00
konstantina.galouni 9b21fdf321 [Trunk | Library]: affiliation.service: Add delete and update http requests. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56041 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-06-11 13:33:32 +00:00
konstantina.galouni d8552c8a08 [Trunk | Library]: Create affiliations.service in connect folder to get affiliations from communities API. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@56028 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-06-07 12:51:26 +00:00
k.triantafyllou 8b8c02eab9 [Trunk|Library]: Remove subject from curators service. 
git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55998 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-06-05 14:21:38 +00:00
argiro.kokogiannaki f5d29ffc76 [Library|Trunk] 
add cache in some services and pass properties as parameter

	initiate a searchResearchResultsService where it gets result type as parameter

	update navbar/bottom to get properties as parameter and remove attributes included in properties

	add spaces in search results & authors components



git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55995 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-06-05 13:33:18 +00:00
argiro.kokogiannaki f8913dfdbd [Library|Trunk] 
Merge into trunk branch angular7 rev 55729




git-svn-id: https://svn.driver.research-infrastructures.eu/driver/dnet40/modules/uoa-services-library/trunk/ng-openaire-library/src/app@55964 d315682c-612b-4755-9ff5-7f18f6832af3
 2019-06-03 13:20:36 +00:00