Resolve merge conflict in smart_date.js, merge with latest commits in 3.3.x branch
No related branches found
No related tags found
Showing
- composer.json 7 additions, 0 deletionscomposer.json
- config/schema/smart_date.schema.yml 52 additions, 3 deletionsconfig/schema/smart_date.schema.yml
- css/smart_date.css 57 additions, 0 deletionscss/smart_date.css
- drush.services.yml 5 additions, 0 deletionsdrush.services.yml
- js/smart_date.js 26 additions, 1 deletionjs/smart_date.js
- modules/smart_date_recur/config/schema/smart_date_recur.schema.yml 73 additions, 0 deletions...mart_date_recur/config/schema/smart_date_recur.schema.yml
- modules/smart_date_recur/css/smart_date_recur.css 1 addition, 1 deletionmodules/smart_date_recur/css/smart_date_recur.css
- modules/smart_date_recur/smart_date_recur.install 3 additions, 1 deletionmodules/smart_date_recur/smart_date_recur.install
- modules/smart_date_recur/smart_date_recur.module 2 additions, 2 deletionsmodules/smart_date_recur/smart_date_recur.module
- modules/smart_date_recur/src/Entity/SmartDateRule.php 33 additions, 6 deletionsmodules/smart_date_recur/src/Entity/SmartDateRule.php
- modules/smart_date_recur/src/Plugin/Field/FieldFormatter/SmartDateDailyRangeFormatter.php 17 additions, 5 deletions...gin/Field/FieldFormatter/SmartDateDailyRangeFormatter.php
- modules/smart_date_recur/src/Plugin/Field/FieldFormatter/SmartDateRecurrenceFormatter.php 17 additions, 2 deletions...gin/Field/FieldFormatter/SmartDateRecurrenceFormatter.php
- modules/smart_date_recur/src/SmartDateRecurTrait.php 1 addition, 1 deletionmodules/smart_date_recur/src/SmartDateRecurTrait.php
- src/Commands/SmartDateDrushCommands.php 158 additions, 0 deletionssrc/Commands/SmartDateDrushCommands.php
- src/Controller/FullCalendarController.php 2 additions, 2 deletionssrc/Controller/FullCalendarController.php
- src/Plugin/Field/FieldFormatter/SmartDateDefaultFormatter.php 12 additions, 1 deletion...Plugin/Field/FieldFormatter/SmartDateDefaultFormatter.php
- src/Plugin/Field/FieldFormatter/SmartDateDurationFormatter.php 61 additions, 2 deletions...lugin/Field/FieldFormatter/SmartDateDurationFormatter.php
- src/Plugin/Field/FieldType/SmartDateItem.php 1 addition, 1 deletionsrc/Plugin/Field/FieldType/SmartDateItem.php
- src/Plugin/Field/FieldWidget/SmartDateInlineWidget.php 70 additions, 0 deletionssrc/Plugin/Field/FieldWidget/SmartDateInlineWidget.php
- src/Plugin/Field/FieldWidget/SmartDateWidgetBase.php 24 additions, 2 deletionssrc/Plugin/Field/FieldWidget/SmartDateWidgetBase.php
Loading
Please register or sign in to comment