openproject

Commit Graph

Author	SHA1	Message	Date
OpenProject Actions CI	27f71ffefa	update locales from crowdin [ci skip]	3 years ago
Aleix Suau	7e2e05c88f	Feature/36390 code structure (#9319 ) * core/shared/features in progress * shared/components in progress * Fix rebase errors * core: added admin + apiv3 * shared: attachments + attirbute-help-text * core: OpenprojectAugmentingModule * shared: OpenprojectAutocompleterModule * shared: Autocompleter * feature: backlog * feature: bim * feature: boards * shared: calendar * core: userModule * feature: dashboards * shared: editor * shared: fields * shared: focus * core: globalsearch * shared: grid * shared: grid fix * core: hal * shared: icon * feature: invite user modal * feature: job status * shared: members autocomplete * shared: modal * feature: my page * feature: overview * shared: principal * feature: projects * feature: repoting * core: routing * shared: time entries * shared: OpenprojectWorkPackageGraphsModule * feature: workpackages * core: active window * shared: autofocus * features: wp: back-button * core: browser * shared: collapseible section * core: config * shared: copy-to-clipboard * shared: date-time * shared: helpers: drag-and-drop * shared: draggable autocompleter * shared: dynamic bootstrapper * shared: dynamic forms * features: wp: edit actions bar * shared: EditableToolbarTitleComponent * core: BannersService * shared: OpFormFieldComponent * shared: hide section * shared: highlight col * core: I18 + Sanitizer * shared: isClickedWithModifier * core: LoadingIndicator * core: Modal Heading * core: Model auth * shared: no results * shared: notifications * shared: datepicker * shared: option-list * core: path helper * shared: persistent toggle * shared: remote field * shared: set click position * shared: slide toggle * shared: tabs * shared: drag-scroll * shared: keyCodes * shared: OPSharedModule * global styles: common * core: * import fixes * shared: Enterprise banner * features: wps: filters * features: home screen * import fixes * core: html * import fixes * core: main-menu * features: home screen * shared: modals * shared: op-context-menu * core + shared: current project * core: schema-cache * shared: table-pagination * features: wps: time-entries * shared: user-link * features: wps * features: wps * features: wps: all wp-* components * core: states * Rename: angular4-modules to app.module * core: expression service * Modules just with plugins * Test fixes * added missing content-tabs.component.sass * Replaced with .op-ckeditor--wrapper * Replaced by .op-ckeditor-source-element * Replaced by the entire wysiwyg_editor.rb with dev version * Replacements by ckeditor-augmented-textarea * Fixes ./spec/support/components/work_packages/table_configuration_modal.rb:106 * Fixes ./modules/reporting/spec/features/update_entries_spec.rb:69 * work_packages renamed to work-packages * TimeEntryChangeset moved to helpers * 'filters' moved to wps/components * 'admin' moved to features * HAL moved to shared * plugins moved to features * plugins moved to features * Test fixes * Unit test fixes * plugin generator into /features/plugins * fix sass rule indentation * Revert "plugins moved to features" This reverts commit `f65ccbfd4b`. * Import fixes * Avoid commiting in linked plugins Co-authored-by: ulferts <jens.ulferts@googlemail.com> Co-authored-by: Oliver Günther <mail@oliverguenther.de>	3 years ago
ulferts	b813e8b93f	Fix/bump gems (#9259 ) * bump aws-partitions * bump database_cleaner-active_record * bump rb-fsevent * bump recaptcha * bump sentry-ruby & sentry-ruby-core * bump terminal-table * bump date_validator * bump factory_bot & factory_bot_rails * avoid eager loading models via factories	4 years ago
Oliver Günther	af4922ebf6	[37124] Add formatter classes for estimated hours and generalize (#9252 ) Only xls exporter had formatter classes which are generic enough to replace all other exporter formating methods. https://community.openproject.org/wp/37124	4 years ago
Benjamin Bädorf	44294ede04	User custom fields in the invite user modal (#9220 ) * Projects form working with formly 50% * Removed console.log * Working with formattable * Working with formattable * Input with id and label * Input with id and label * Useless dependencies removed * Saving forms + required labels with * * First backend validation approach * Removed reload on type change + keep model on route changes * Handlig backend validations with setError * Formatting the form model to submit * Make up refactor * working with op-form-field * Form creation moved to the service * Working with op-form-field wrapper * Working with validation and op-form-field * Working with []CustomFields * Clean up * Clean up * Clean up * Clean up * Form routing working * Notification on form error and success * Refactor + removed useless dynamic form observable * DynamicFieldsService with tests * Refactor: inputs catalog + catch form load error * Filter out non writable fields * Refactor: naming consistency * Cleaning comments * dynamic-fields-service tests + wrapper component * DynamicForm Tests * @ngx-formly/core dependency added * Cleaning up * Provide DynamicFieldsService in root so it can be used independently * DynamicForm working as a FormControl * Getting route params sync * Global FormsService: submit + formatting + error handling * Fix: @Optional() FormGroupDirective in OpFormFieldComponent * Code climate fix * Removed CdkTextareaAutosize because of CDK issue 22469 * DynamicFormComponent tests * Dynamic input test helpers + boolean and text tests * Refactor edit fields to avoid circular dependencies in the dynamic forms * Naming fix * IntegerInputComponent tests * SelectInputComponent tests * Fix: duplicated identifier on inputs * Extract toolbar to be reused for now Still TBD whether we want to move them right now to the frontend? * Create new project route and redirect to rails view after saving * fieldsSettingsPipe + hide 'identifier' on projects * Handling multi-values (also as links) and passwords * Some TODOs removed * FormattableTextareaInputComponent tests * Projects form working with formly 50% * Removed console.log * Working with formattable * Working with formattable * Input with id and label * Input with id and label * Useless dependencies removed * Saving forms + required labels with * * First backend validation approach * Removed reload on type change + keep model on route changes * Handlig backend validations with setError * Formatting the form model to submit * Make up refactor * working with op-form-field * Form creation moved to the service * Working with op-form-field wrapper * Working with validation and op-form-field * Working with []CustomFields * Clean up * Clean up * Clean up * Clean up * Form routing working * Notification on form error and success * Refactor + removed useless dynamic form observable * DynamicFieldsService with tests * Refactor: inputs catalog + catch form load error * Filter out non writable fields * Refactor: naming consistency * Cleaning comments * dynamic-fields-service tests + wrapper component * DynamicForm Tests * @ngx-formly/core dependency added * Cleaning up * DynamicForm working as a FormControl * Getting route params sync * Global FormsService: submit + formatting + error handling * Fix: @Optional() FormGroupDirective in OpFormFieldComponent * Code climate fix * Removed CdkTextareaAutosize because of CDK issue 22469 * DynamicFormComponent tests * Dynamic input test helpers + boolean and text tests * Refactor edit fields to avoid circular dependencies in the dynamic forms * Naming fix * IntegerInputComponent tests * SelectInputComponent tests * Fix: duplicated identifier on inputs * Extract toolbar to be reused for now Still TBD whether we want to move them right now to the frontend? * Create new project route and redirect to rails view after saving * fieldsSettingsPipe + hide 'identifier' on projects * Handling multi-values (also as links) and passwords * Some TODOs removed * FormattableTextareaInputComponent tests * _isResourceSchema based on parent?.location * Scope DynamicFieldsService to DynamicFormComponent * Added backend validation method to FormsService * Removed projects routes and ruby template * Removed projects routes and dynamic forms from Projects * Revert "Provide DynamicFieldsService in root so it can be used independently" This reverts commit `ab56f3c56f`. * Provide DynamicFieldsService in root so it can be used independently * TODO: test ProjectsComponent * Code climate fixes (remove TODOs) * Default OpFormFieldComponent.inlineLabel to false * Dynamic components tests xkipped * Typing improvements * DynamicFormComponent working as a FormControl * Global FormsService: submit + formatting + error handling * Fix: @Optional() FormGroupDirective in OpFormFieldComponent * Code climate fixes * noWrapLabel default to false * Started adding user custom fields to the ium * Import the dynamic-forms module into the common module * Refactor edit fields to avoid circular dependencies in the dynamic forms * Using DynamicFormsModule in OpenprojectInviteUserModalModule * Add formly form * Update principal name filter * Dynamic form field is rendering * Handling multi-values (also as links) and passwords * Added backend validation method to FormsService * Remove form from DynamicForm when not isStandaloneForm * Allow multiple form keys to validate * Remove form from non standalone forms * Remove duplicated button * Moved to FormGroup input for dynamic form * Custom field happy path is done * Add explanatory comment to payload structure transformation * add op-form class to ium steps * Add shrinkwrap back in * Fix test, fix dynamic form resource path * gimme a shirnkwrap * Remove failing tests * Remove another failing test * Remove more failing specs * Fix double loading of principals * Add custom field spec * Fix spec * Reset shrinkwrap * Forbid Factory.build(:user, member_in_project) If you use the trait member_in_project(s), the user is implicitly saved to create the member. This is very confusing if trying to use required custom fields, as this will fail with the Member#user_id foreign key being nil, as the user cannot be saved. Instead, raise an error when trying to use this factory trait * Change additional spec factory Co-authored-by: Aleix Suau <info@macrofonoestudio.es> Co-authored-by: Oliver Günther <mail@oliverguenther.de>	4 years ago
OpenProject Actions CI	6108898fd5	update locales from crowdin [ci skip]	4 years ago
OpenProject Actions CI	8019c635ec	update locales from crowdin [ci skip]	4 years ago
OpenProject Actions CI	57aa62240e	update locales from crowdin [ci skip]	4 years ago
OpenProject Actions CI	3f34817f94	update locales from crowdin [ci skip]	4 years ago
OpenProject Actions CI	a723802985	update locales from crowdin [ci skip]	4 years ago
ulferts	9fa5599392	Feature/member notifications (#8958 ) * spec with correctly scoped links * move db check into own file - fix deprecation * basic spec for member creation service * use constants for all notifications * send an OP notification after member has been created * send an OP notification after member has been updated * mails on group member added Depending on whether the membership existed before or not, an updated or a created notification is send. This is done asynchronously. * move all mail sender background jobs into namespace * wip * wip * correct handling group member notifications * add setting enable/disable mail sending on member alterations * use services in members controller * move Notifiable to OpenProject * remove member after save hooks * cleanup/testing/linting * render member mails in receiver locale * remove add_member! method * use mailer layout for all mailers * Update app/services/groups/cleanup_inherited_roles_service.rb Co-authored-by: Oliver Günther <mail@oliverguenther.de> * use around callback to avoid prepending * handle nil params Co-authored-by: Oliver Günther <mail@oliverguenther.de>	4 years ago
Oliver Günther	26acf03e7a	Add schema location attribute (#9140 ) * Extend schema with a location property * Extend specs to test for location presence * Document location property * Fix typo Co-authored-by: Philipp Tessenow <tessi@bitcrowd.net> Co-authored-by: Philipp Tessenow <tessi@bitcrowd.net>	4 years ago
OpenProject Actions CI	adb3691ab3	update locales from crowdin [ci skip]	4 years ago
OpenProject Actions CI	0a588209cf	update locales from crowdin [ci skip]	4 years ago
Oliver Günther	3b78be087b	Migrate tslint to eslint (#9064 ) * tslint to eslint migration * Autofix issues * Fix codeclimate path to eslintrc * Extend linter config for use with ng lint * Change prefix to op in angular lints	4 years ago
ulferts	7ecf08e005	rework changed_by_system (#9043 ) Before, it was implemented by passing the changed attribut keys over to the contract to whitelist them. This lead to: * The contract interface becoming bloated * Having to rely on the knowledge of the developer not to falsely whitelist an attribute. The developer would also have to make sure to not perform a mass assignment after the attribute has been whitelisted The new approach it to integrate the behaviour into the model which is first altered in the service before it is scrutinized in the contract. The information about the changed attributes is now stored inside the model which removes the necessity to flag the whitelisted attribute separately. Additionally, the exact change is tracked. So if an attribute is set to one value inside a whitelisted block there is no risk in later on performing a mass assignment. This comes at the cost of extending the models which is weird also it is build into the default SetAttributesService so child classes do not have to worry. One might include the module into every AR model but currently we only need it for a very specific use case.	4 years ago
Oliver Günther	ea29493ce7	[36353] Restrict possible select options in cost entries to users (#9053 ) https://community.openproject.com/wp/36353	4 years ago
ulferts	64cf18856b	Revert "update locales from crowdin [ci skip]" This reverts commit `3cb8fef5e6`.	4 years ago
Travis CI User	3cb8fef5e6	update locales from crowdin [ci skip]	4 years ago
Oliver Günther	0a84a0b671	[36296] Add PlaceholderUsers API (#9033 ) * Add PlaceholderUsers API * Fix remarks in apib * Add deduce_element_decorator to collection * Remove unnecessary path	4 years ago
Travis CI User	1135cb0ddf	update locales from crowdin [ci skip]	4 years ago
Travis CI User	553f1382a0	update locales from crowdin [ci skip]	4 years ago
ulferts	049f3cb6f5	avoid static ids in spec	4 years ago
Travis CI User	ec555b0398	update locales from crowdin [ci skip]	4 years ago
Travis CI User	3e239df370	update locales from crowdin [ci skip]	4 years ago
Travis CI User	f028241b61	update locales from crowdin [ci skip]	4 years ago
Oliver Günther	f4dfd6c6c6	[36238] Extract and fix user references in other objects (#9007 ) * Move replacing invalid references into separate job for principals * Write migration to remove existing invalid custom values and responsible * Fix other specs * Fix other specs * rewrite replacing user in records * consolidate principal deletion * include placeholder users in spec Co-authored-by: ulferts <jens.ulferts@googlemail.com>	4 years ago
Travis CI User	79f5e33924	update locales from crowdin [ci skip]	4 years ago
Wieland Lindenthal	a18954b2c9	Placeholder user services and administration (#8944 ) * Adding placeholder user contracts * Adding create, update, and delete services for placeholder users * WIP: Adding Placeholder User contract specs [ci skip] * Extract contract validation into common helper * Add common validation in BaseContract + common example for admin checks * Introduce common ModelContract shared context for validations * WIP: PlaceholderUser controller, i18n, and routes [ci skip] * Placeholder users index page and query - moved all group related scopes from User to Principal to make them also available in PlaceholderUser. * end * Create PlaceholderUser * Feature spec for editing a placeholder user * Manage PlaceholderUser memberships The managment of memberships is pretty similar for User and PlaceholderUser. This commit extacts the similarities and uses them for both. * General partial and show view for PlaceholderUser * Delete obosolete partial * Allow RequireAdminGuard to be used as a module function * Fix I18n for confirmation text * Smaller code improvements * Fix: Syntax for accessing status enums was wrong. * Use UpdateService for updating a placeholder user * Add spec for PlaceholderUsersController * First code improvements after code review. - more improvements to come. * Further code improvements after review ... still more to come * Correct namespace of delete service * Fix: Make placeholder user contract validate * Remove :type attribute from base contract of User and PlaceholerUser ...and add it to the CreateContracts. Also add type validations. Further extract shared examples for placeholder user attribute validation * Refactor: Extract membership hook calls to helper * Fix redirect paths for membership controllers * Specs already present in shared exampels. * Fix duplicates routes for users and placeholder users * Fix user path * Add attribute name and lastname We don't need a writeable check as both are equally writable * Replace more references to tab_edit_user_path * Skip specs for PlaceholderUsers::DeletionService We will tackle that service in a separate PR. * Fix module usage of RequireAdminGuard * Fix group filter for placeholder users * Fix invalid reference to expect_valid * Fix: Fix tabbed edit path for placeholder users * Fix status filtering on users * Linting * Improve generalisation of individual principal filter cell - Check for presence of groups and statuses in order to toggle visibility of their UI element. - Remove groups from placeholder user controller and cell initialization and options * Fix selector on groups assign * Remove using_shared_fixtures Co-authored-by: Oliver Günther <mail@oliverguenther.de>	4 years ago
ulferts	1bdd2ab9ae	safe automatic fixes by rubocop (#8994 )	4 years ago
Oliver Günther	2cde433326	Remove usages of AnyFixture (#8987 ) AnyFixture will create once instance of a factory for reuse in a number of specs. This will work fine until we require a clean slate for a specific example. As we have numerous tests that test like the database is empty, we get a number of disadvantages: - After an example with `with_clean_fixture` metadata, the fixture will only be regenerated after the next example that uses it. This means the order of execution will change the number of objects in the DB. - The more `with_clean_fixture` we have, the smaller the performance advantage of AnyFixture will result in. - You cannot use an AnyFixture in a spec that needs a clean slate. This should be obvious but was overlooked by myself.	4 years ago
Oliver Günther	a65992c354	Allow placeholder and group assignment to custom field (#8972 ) * Allow placeholder and group assignment to custom field * Review feedback	4 years ago
ulferts	cc4ed56e2a	use AR`s scope method instead of singleton class method (#8976 ) * use AR`s scope method instead of singleton class method By using the scope method, all of Rails` checks and method definition usually done on a method are now also performed on the extracted scope methods `5f3ff60084/activerecord/lib/active_record/scoping/named.rb (L154-L190)` * turn scope classes into modules	4 years ago
ulferts	5ea185ef66	Placeholder user project members (#8961 ) * remove intermediate placeholder scope Doing so, placeholder users will begin to show up in the system * remove scope without value * extract scope * use enum for status * allow placeholder users to become project members * display placeholder user member on members widget * remove now superfluous method The status name can simply be queried via #status now * replace possible_assignees/responsibles on project This also leads to placeholder users becoming eligible as assignees and responsibles. * fix aggregated scope on bulk edit * linting * remove IssueHelper	4 years ago
Cyril Rohr	b4086b2968	Standalone CI docker container (#8943 )	4 years ago
Oliver Günther	3c9be3bdbe	[35507] Allow global permission to add and edit users (#8937 ) * Add global permission for add_user * Rename fieldset for global roles to "Global" * Add permission to admin actions * Add index action to add_user permission * Redirect to first admin item if only one * Hide status action for non admins * Break down user form into partials for easier rendering * Disable some user form tabs for non-admins * Make users API and services conformant with endpoints * Fix references to DeleteService#deletion_allowed? * Authorize add_user on show as well * Only show invite user toolbar item with permission * Fix Delete Service spec * Fix the way user prefs are handled in service * Ensure session_id is treated as string This causes a cast error otherwise as it passes rack session locally * Fix service call on onboarding controller * Fix service call on users controller * Add delete spec for global user * Hide login attribute again when adding a new user * Render auth source correctly in simple form * Fix creating invited users through service The invitation requires the mail attribute to be present. Previously, there was a manual error added to the mail. As the errors are now determined by the contract + model, we now end up with all missing properties as errors. * Properly constraint attributes for non-admins * Add specs for global user * Start working on how to update password from UsersController that code is a mess... * Change permitted_params spec to include non-admin params * Fix create user service spec * Remove mail_notification param from users controller It's not part of the contract/params passed to user * Remove todos * Extend docs * Correct the way backlogs patches into the user settings * Remove superfluous UpdateUserService * Rewrite duplicated update service examples into common shared example * Remove duplicate password writable check * Base Users::DeleteContract on base delete contract * Move checks for active users into the UserAllowedService * Restore password writable check as it is not an attribute * Fix menus for global user * Allow global users to add custom fields * Allow global user add permission to reinvite user * Fix changed var name in update service spec * Ensure also invited or registered users can be authroized This ensure that e.g., invited users can also be set as watchers * fix typo Co-authored-by: ulferts <jens.ulferts@googlemail.com>	4 years ago
luz paz	e8c2928a12	Fix typo beeing->being in spec/ and modules/	4 years ago
Markus Kahl	51a40c97eb	set content type of attachments in S3 (#8938 ) * set content type of attachments in S3 * refactoring to allow amending and reading given metadata more easily * confirm attachment content type is sent to S3	4 years ago
Travis CI User	b2da607524	update locales from crowdin [ci skip]	4 years ago
ulferts	6140f4c7e9	update copyright to 2021 (#8925 ) Updates the copyright to 2021 for all files that have a copyright. Files in our source code without the copyright header still do not receive one automatically. Additionally, backlisted files are also excluded. Previously the copyright of chiliproject which references redmine stated a copyright of redmine up to and including 2017 which is not true for the code we have in here. Because of that I changed that to 2013	4 years ago
Travis CI User	dccc74971f	update locales from crowdin [ci skip]	4 years ago
ulferts	376620179f	alter method to check for fetched columns	4 years ago
Travis CI User	1093bb1181	update locales from crowdin [ci skip]	4 years ago
Travis CI User	1b5f100fe1	update locales from crowdin [ci skip]	4 years ago
Travis CI User	a013096cd0	update locales from crowdin [ci skip]	4 years ago
Travis CI User	53cf33603c	update locales from crowdin [ci skip]	4 years ago
ulferts	26295af6bd	Chore/replace activemodel mocks (#8892 ) * replace stub_model calls * replace mock_model * remove rspec-activemodel-mocks dependency	4 years ago
ulferts	a112999dcc	fix ruby 2.7 deprecations (#8867 )	4 years ago
Benjamin Bädorf	e848d44dea	Fix/update wysiwyg styles (#8844 ) This is a refactoring of the CSS classes in the WYSIWYG editor. The classes now use proper BEM and are almost completely independent of other CSS. It also includes small style refactorings, like a reduction of heading size in attribute fields, and an increase in heading size in all other instances. * Initial class definitions * Added more classes * Added Table of Contents basics * CkEditor applying custom CSS classes to p, h1, h2, h3, h4, h5, h6, li and blockquote * CKEditorInspector removed * op css class for headings * op css class for paragraphs * op css class for code/code block * adapt specs to altered markdown/html generation * adapt grid/budget representers to altered signature * op css class for lists * op css class for toc * op css class for links * Start working on typography css * op css class for tables * Fixing more typography, trying out larger headers * Applying custom classes to li, a, blockquote, figure, table, tr, td, th, image, codeblock, figcaption and macros * adapt specs to altered link classes * op css class for images * apply user content container class throughout application * CSS alignment custom classes applied to table * op css class for task list checkbox * Added task checkbox class * amend list checkbox class in backend * op css class for table thead element * adapt specs on image html generation * Updated table and typography styles * Update typography and figure styles * Figure overflow handling * Table alignment styles + ckEditor styles removed * rename wiki-anchor to op-uc-link_permalink * wrap table in div as well as figure * Updated code-block * Update permalinks * Fixed a lot about tables * Removed Description header from work-packages page * Fix frontend styles * Add placeholder styling, fix toc * Fixed figure print * working with table aligns * Custom class add to task lists * Custom classes applied to theads * op-uc-container custom class added to container * Codeblocks inside pre elements * Fix: single <code> and <a> tags * explicitly require overwritten gem class Apparently, the gem is not loaded yet when it is registered as a filter when in eager loading mode * adapt spec expectation to altered toc rendering * CkInspector removed * Latest ckeditor changes * remove highlight css class from wiki content * allow html pipleline to handle macros with additional classes * Fixed a lot of print css for tables * Add general print css back in * Update Table of Contents styling * Custom classes on ul, ol, li and task-lists * Revert "Custom classes on ul, ol, li and task-lists" This reverts commit `0d27d28137`. * Custom classes on ul, ol, li and task-lists * Custom classes on column's th * remove placeholder class when rendering * WOrking on task lists * Changing task-list classes, changed tests * Updated list styles * Remove unused todo list styles * remove checked in binstubs * Fix table of contents * adapt todo list handing in backend pipeline * adapt specs to altered css classes * Add numbers to table of contents * Better comments in table of contents * Fix: wrap single <table> with a <figure> * Fixes to todo list design * Updated todo list scss to fix nested lists * adapt selectors in table spec * Update table styles * Improve table borders more * Custom classes specs * Fix: no need to remove regular list classes when its type changes * Add modifier for inline headings * Update table editing styles * Remove break-word tests * wrap images just like tables * Update figure content styles * Fix: All tests passing (ul.op-uc-list_task-list) * div.op-uc-figure--content wrapping tables * Specs for figures wrappers div.op-uc-figure--content * Fix: add custom classes to links and codes again * Table wrapper div reverted + specs * Fix inline palceholders * Custom macro type classes * Add basic macro placeholder changes * Move heading permalink after text * Fix word-break spec * Sending figure styles to the backend (width) * extend test to take ckeditor placeholder into account * avoid adding bem classes multiple times * attempt to fix flickering spec * Removing image spinner when uploading finishes * adapt spec expectations Co-authored-by: Aleix Suau <info@macrofonoestudio.es> Co-authored-by: ulferts <jens.ulferts@googlemail.com>	4 years ago
ulferts	7b31311713	Chore/rename timestamp on time entry (#8754 ) * rename timestamps on time entry * add updated_at filter/order for time entries * rename on cost entries as well This will make handling in the cost query easier * adapt specs * linting * adapt project activity * update references to updated_on	4 years ago

1 2 3 4 5 ...

270 Commits (0981c65582d734cc8cf2c37f192b42341a11cb0e)